Skip to content

Commit c340a0e

Browse files
gapisbackgapisback
committed
Rename large_inserts_bugs_stress_test.c -> large_inserts_stress_test.c
Upcoming PR #569 is overhauling large-inserts stress test. To simplify examining the diffs of this test case as part of that review, this commit is renaming the test file to large_inserts_stress_test.c . Make appropriate changes to the build Makefile and test files, to pickup new file.
1 parent ae4636f commit c340a0e

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ TESTSRC := $(COMMON_TESTSRC) $(FUNCTIONAL_TESTSRC) $(UNIT_TESTSRC)
5555
# Construct a list of fast unit-tests that will be linked into unit_test binary,
5656
# eliminating a sequence of slow-running unit-test programs.
5757
ALL_UNIT_TESTSRC := $(call rwildcard, $(UNIT_TESTSDIR), *.c)
58-
SLOW_UNIT_TESTSRC = splinter_test.c config_parse_test.c large_inserts_bugs_stress_test.c splinterdb_forked_child_test.c
58+
SLOW_UNIT_TESTSRC = splinter_test.c config_parse_test.c large_inserts_stress_test.c splinterdb_forked_child_test.c
5959
SLOW_UNIT_TESTSRC_FILTER := $(foreach slowf,$(SLOW_UNIT_TESTSRC), $(UNIT_TESTSDIR)/$(slowf))
6060
FAST_UNIT_TESTSRC := $(sort $(filter-out $(SLOW_UNIT_TESTSRC_FILTER), $(ALL_UNIT_TESTSRC)))
6161

@@ -485,10 +485,10 @@ $(BINDIR)/$(UNITDIR)/splinterdb_forked_child_test: $(OBJDIR)/$(TESTS_DIR)/config
485485
$(OBJDIR)/$(FUNCTIONAL_TESTSDIR)/test_async.o \
486486
$(LIBDIR)/libsplinterdb.so
487487

488-
$(BINDIR)/$(UNITDIR)/large_inserts_bugs_stress_test: $(UTIL_SYS) \
489-
$(OBJDIR)/$(TESTS_DIR)/config.o \
490-
$(COMMON_UNIT_TESTOBJ) \
491-
$(LIBDIR)/libsplinterdb.so
488+
$(BINDIR)/$(UNITDIR)/large_inserts_stress_test: $(UTIL_SYS) \
489+
$(OBJDIR)/$(TESTS_DIR)/config.o \
490+
$(COMMON_UNIT_TESTOBJ) \
491+
$(LIBDIR)/libsplinterdb.so
492492

493493
$(BINDIR)/$(UNITDIR)/splinterdb_heap_id_mgmt_test: $(COMMON_TESTOBJ) \
494494
$(COMMON_UNIT_TESTOBJ) \

‎test.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ function nightly_unit_stress_tests() {
241241
# ----
242242
local n_threads=32
243243
local test_descr="${nrows_h} rows, ${n_threads} threads"
244-
local test_name=large_inserts_bugs_stress_test
244+
local test_name=large_inserts_stress_test
245245

246246
# FIXME: This stress test is currently unstable. We run into shmem-OOMs
247247
# Also, we need a big machine with large # of cores to be able to run
@@ -674,7 +674,7 @@ function run_slower_unit_tests() {
674674

675675
# shellcheck disable=SC2086
676676
run_with_timing "${msg}" \
677-
"$BINDIR"/unit/large_inserts_bugs_stress_test ${use_shmem} --num-inserts ${num_rows}
677+
"$BINDIR"/unit/large_inserts_stress_test ${use_shmem} --num-inserts ${num_rows}
678678

679679
# Test runs w/ more inserts and enable bg-threads
680680
n_mills=2
@@ -683,7 +683,7 @@ function run_slower_unit_tests() {
683683
#
684684
# shellcheck disable=SC2086
685685
run_with_timing "${msg}" \
686-
"$BINDIR"/unit/large_inserts_bugs_stress_test ${use_shmem} \
686+
"$BINDIR"/unit/large_inserts_stress_test ${use_shmem} \
687687
--num-inserts ${num_rows} \
688688
--num-normal-bg-threads 4 \
689689
--num-memtable-bg-threads 3
@@ -718,12 +718,12 @@ function run_slower_forked_process_tests() {
718718
# run_with_timing "${msg}" "$BINDIR"/unit/splinterdb_forked_child_test \
719719
# --num-processes ${num_forked_procs}
720720

721-
# ---- Run large_inserts_bugs_stress_test with small configuration as a quick check
721+
# ---- Run large_inserts_stress_test with small configuration as a quick check
722722
# using forked child process execution.
723723
msg="Splinter large inserts test using shared memory, 1 forked child"
724724
local num_rows=$((2 * 1000 * 1000))
725725
# shellcheck disable=SC2086
726-
run_with_timing "${msg}" "$BINDIR"/unit/large_inserts_bugs_stress_test \
726+
run_with_timing "${msg}" "$BINDIR"/unit/large_inserts_stress_test \
727727
--use-shmem \
728728
--fork-child \
729729
--num-inserts ${num_rows} \

tests/unit/large_inserts_bugs_stress_test.c renamed to tests/unit/large_inserts_stress_test.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
* -----------------------------------------------------------------------------
6-
* large_inserts_bugs_stress_test.c --
6+
* large_inserts_stress_test.c --
77
*
88
* This test exercises simple very large #s of inserts which have found to
99
* trigger some bugs in some code paths. This is just a miscellaneous collection
@@ -81,7 +81,7 @@ do_inserts_n_threads(splinterdb *kvsb,
8181
/*
8282
* Global data declaration macro:
8383
*/
84-
CTEST_DATA(large_inserts_bugs_stress)
84+
CTEST_DATA(large_inserts_stress)
8585
{
8686
// Declare heap handles for on-stack buffer allocations
8787
platform_heap_id hid;
@@ -97,7 +97,7 @@ CTEST_DATA(large_inserts_bugs_stress)
9797
};
9898

9999
// Optional setup function for suite, called before every test in suite
100-
CTEST_SETUP(large_inserts_bugs_stress)
100+
CTEST_SETUP(large_inserts_stress)
101101
{
102102
// First, register that main() is being run as a parent process
103103
data->am_parent = TRUE;
@@ -155,7 +155,7 @@ CTEST_SETUP(large_inserts_bugs_stress)
155155
}
156156

157157
// Optional teardown function for suite, called after every test in suite
158-
CTEST_TEARDOWN(large_inserts_bugs_stress)
158+
CTEST_TEARDOWN(large_inserts_stress)
159159
{
160160
// Only parent process should tear down Splinter.
161161
if (data->am_parent) {
@@ -168,7 +168,7 @@ CTEST_TEARDOWN(large_inserts_bugs_stress)
168168
* Test case that inserts large # of KV-pairs, and goes into a code path
169169
* reported by issue# 458, tripping a debug assert.
170170
*/
171-
CTEST2_SKIP(large_inserts_bugs_stress,
171+
CTEST2_SKIP(large_inserts_stress,
172172
test_issue_458_mini_destroy_unused_debug_assert)
173173
{
174174
char key_data[TEST_KEY_SIZE];
@@ -217,7 +217,7 @@ CTEST2_SKIP(large_inserts_bugs_stress,
217217
* - sequential keys, random values
218218
* - random keys, random values
219219
*/
220-
CTEST2(large_inserts_bugs_stress, test_seq_key_seq_values_inserts)
220+
CTEST2(large_inserts_stress, test_seq_key_seq_values_inserts)
221221
{
222222
worker_config wcfg;
223223
ZERO_STRUCT(wcfg);
@@ -230,7 +230,7 @@ CTEST2(large_inserts_bugs_stress, test_seq_key_seq_values_inserts)
230230
exec_worker_thread(&wcfg);
231231
}
232232

233-
CTEST2(large_inserts_bugs_stress, test_random_key_seq_values_inserts)
233+
CTEST2(large_inserts_stress, test_random_key_seq_values_inserts)
234234
{
235235
worker_config wcfg;
236236
ZERO_STRUCT(wcfg);
@@ -246,7 +246,7 @@ CTEST2(large_inserts_bugs_stress, test_random_key_seq_values_inserts)
246246
close(wcfg.random_key_fd);
247247
}
248248

249-
CTEST2(large_inserts_bugs_stress, test_seq_key_random_values_inserts)
249+
CTEST2(large_inserts_stress, test_seq_key_random_values_inserts)
250250
{
251251
worker_config wcfg;
252252
ZERO_STRUCT(wcfg);
@@ -262,7 +262,7 @@ CTEST2(large_inserts_bugs_stress, test_seq_key_random_values_inserts)
262262
close(wcfg.random_val_fd);
263263
}
264264

265-
CTEST2(large_inserts_bugs_stress, test_random_key_random_values_inserts)
265+
CTEST2(large_inserts_stress, test_random_key_random_values_inserts)
266266
{
267267
worker_config wcfg;
268268
ZERO_STRUCT(wcfg);
@@ -304,7 +304,7 @@ safe_wait()
304304
* shutdown the instance.
305305
* ----------------------------------------------------------------------------
306306
*/
307-
CTEST2(large_inserts_bugs_stress, test_seq_key_seq_values_inserts_forked)
307+
CTEST2(large_inserts_stress, test_seq_key_seq_values_inserts_forked)
308308
{
309309
worker_config wcfg;
310310
ZERO_STRUCT(wcfg);
@@ -375,7 +375,7 @@ CTEST2(large_inserts_bugs_stress, test_seq_key_seq_values_inserts_forked)
375375
* clockcache_try_get_read() -> memtable_maybe_rotate_and_get_insert_lock()
376376
* This problem will probably occur in /main as well.
377377
*/
378-
CTEST2_SKIP(large_inserts_bugs_stress, test_seq_key_seq_values_inserts_threaded)
378+
CTEST2_SKIP(large_inserts_stress, test_seq_key_seq_values_inserts_threaded)
379379
{
380380
// Run n-threads with sequential key and sequential values inserted
381381
do_inserts_n_threads(data->kvsb,
@@ -394,7 +394,7 @@ CTEST2_SKIP(large_inserts_bugs_stress, test_seq_key_seq_values_inserts_threaded)
394394
* With --num-threads 63, hangs in
395395
* clockcache_get_read() -> memtable_maybe_rotate_and_get_insert_lock()
396396
*/
397-
CTEST2(large_inserts_bugs_stress,
397+
CTEST2(large_inserts_stress,
398398
test_seq_key_seq_values_inserts_threaded_same_start_keyid)
399399
{
400400
// Run n-threads with sequential key and sequential values inserted
@@ -412,7 +412,7 @@ CTEST2(large_inserts_bugs_stress,
412412
* KV-pairs, with all threads inserting from same start-value, using a fixed
413413
* fully-packed value.
414414
*/
415-
CTEST2(large_inserts_bugs_stress,
415+
CTEST2(large_inserts_stress,
416416
test_seq_key_fully_packed_value_inserts_threaded_same_start_keyid)
417417
{
418418
// Run n-threads with sequential key and sequential values inserted
@@ -425,7 +425,7 @@ CTEST2(large_inserts_bugs_stress,
425425
data->num_insert_threads);
426426
}
427427

428-
CTEST2(large_inserts_bugs_stress, test_random_keys_seq_values_threaded)
428+
CTEST2(large_inserts_stress, test_random_keys_seq_values_threaded)
429429
{
430430
int random_key_fd = open("/dev/urandom", O_RDONLY);
431431
ASSERT_TRUE(random_key_fd > 0);
@@ -442,7 +442,7 @@ CTEST2(large_inserts_bugs_stress, test_random_keys_seq_values_threaded)
442442
close(random_key_fd);
443443
}
444444

445-
CTEST2(large_inserts_bugs_stress, test_seq_keys_random_values_threaded)
445+
CTEST2(large_inserts_stress, test_seq_keys_random_values_threaded)
446446
{
447447
int random_val_fd = open("/dev/urandom", O_RDONLY);
448448
ASSERT_TRUE(random_val_fd > 0);
@@ -459,7 +459,7 @@ CTEST2(large_inserts_bugs_stress, test_seq_keys_random_values_threaded)
459459
close(random_val_fd);
460460
}
461461

462-
CTEST2(large_inserts_bugs_stress,
462+
CTEST2(large_inserts_stress,
463463
test_seq_keys_random_values_threaded_same_start_keyid)
464464
{
465465
int random_val_fd = open("/dev/urandom", O_RDONLY);
@@ -477,7 +477,7 @@ CTEST2(large_inserts_bugs_stress,
477477
close(random_val_fd);
478478
}
479479

480-
CTEST2(large_inserts_bugs_stress, test_random_keys_random_values_threaded)
480+
CTEST2(large_inserts_stress, test_random_keys_random_values_threaded)
481481
{
482482
int random_key_fd = open("/dev/urandom", O_RDONLY);
483483
ASSERT_TRUE(random_key_fd > 0);

0 commit comments

Comments
 (0)