From d95ffbaf4f8a6790686f04c7a01a8a2f60f315b7 Mon Sep 17 00:00:00 2001 From: Peter Dillinger Date: Tue, 16 Nov 2021 16:43:56 -0800 Subject: [PATCH] Parallelize sandcastle tests (#9178) Summary: Some tests are timing out, so increase parallelism but also keep test output on console Large credit to jay-zhuang who is currently unavailable to revise & land https://github.com/facebook/rocksdb/issues/9135 Pull Request resolved: https://github.com/facebook/rocksdb/pull/9178 Test Plan: make check and valgrind_test, with and without PRINT_PARALLEL_OUTPUTS=1 https://www.internalfb.com/intern/sandcastle/group/nonce/6211105410048528/ Reviewed By: riversand963 Differential Revision: D32476680 Pulled By: pdillinger fbshipit-source-id: 8844947416e5baf4435e1ef6e33aeecc45621a89 --- Makefile | 11 +++-- build_tools/rocksdb-lego-determinator | 71 ++++++++++++++------------- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/Makefile b/Makefile index 26cc02dd4..913d4aee7 100644 --- a/Makefile +++ b/Makefile @@ -879,9 +879,9 @@ tests-regexp = . EXCLUDE_TESTS_REGEX ?= "^$" ifeq ($(PRINT_PARALLEL_OUTPUTS), 1) - parallel_com = '{}' + parallel_redir = else - parallel_com = '{} >& t/log-{/}' + parallel_redir = >& t/$(test_log_prefix)log-{/} endif .PHONY: check_0 @@ -898,7 +898,7 @@ check_0: | $(prioritize_long_running_tests) \ | grep -E '$(tests-regexp)' \ | grep -E -v '$(EXCLUDE_TESTS_REGEX)' \ - | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG $$eta --gnu $(parallel_com) ; \ + | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG $$eta --gnu '{} $(parallel_redir)' ; \ parallel_retcode=$$? ; \ awk '{ if ($$7 != 0 || $$8 != 0) { if ($$7 == "Exitval") { h = $$0; } else { if (!f) print h; print; f = 1 } } } END { if(f) exit 1; }' < LOG ; \ awk_retcode=$$?; \ @@ -907,6 +907,7 @@ check_0: valgrind-exclude-regexp = InlineSkipTest.ConcurrentInsert|TransactionStressTest.DeadlockStress|DBCompactionTest.SuggestCompactRangeNoTwoLevel0Compactions|BackupableDBTest.RateLimiting|DBTest.CloseSpeedup|DBTest.ThreadStatusFlush|DBTest.RateLimitingTest|DBTest.EncodeDecompressedBlockSizeTest|FaultInjectionTest.UninstalledCompaction|HarnessTest.Randomized|ExternalSSTFileTest.CompactDuringAddFileRandom|ExternalSSTFileTest.IngestFileWithGlobalSeqnoRandomized|MySQLStyleTransactionTest.TransactionStressTest .PHONY: valgrind_check_0 +valgrind_check_0: test_log_prefix := valgrind_ valgrind_check_0: $(AM_V_GEN)export TEST_TMPDIR=$(TMPD); \ printf '%s\n' '' \ @@ -921,8 +922,8 @@ valgrind_check_0: | grep -E '$(tests-regexp)' \ | grep -E -v '$(valgrind-exclude-regexp)' \ | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG $$eta --gnu \ - '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) ' \ - '>& t/valgrind_log-{/}' + '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) \ + $(parallel_redir)' \ CLEAN_FILES += t LOG $(TMPD) diff --git a/build_tools/rocksdb-lego-determinator b/build_tools/rocksdb-lego-determinator index b065d71ef..7131aa2f9 100755 --- a/build_tools/rocksdb-lego-determinator +++ b/build_tools/rocksdb-lego-determinator @@ -84,16 +84,17 @@ UPLOAD_DB_DIR=" ] }" -# We will eventually set the RATIO to 1, but we want do this -# in steps. RATIO=$(nproc) will make it work as J=1 +# set default RATIO to 1, which sets J=$(nproc) and j=$(nproc) if [ -z $RATIO ]; then - RATIO=$(nproc) + RATIO=1 fi +# Should probably be called PARALLEL_TEST if [ -z $PARALLEL_J ]; then - PARALLEL_J="J=$(expr $(nproc) / ${RATIO})" + PARALLEL_J="PRINT_PARALLEL_OUTPUTS=1 J=$(expr $(nproc) / ${RATIO})" fi +# Should probably be called PARALLEL_MAKE if [ -z $PARALLEL_j ]; then PARALLEL_j="-j$(expr $(nproc) / ${RATIO})" fi @@ -349,7 +350,7 @@ UNITY_COMMANDS="[ $CLEANUP_ENV, { \"name\":\"Build, test unity test\", - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG V=1 make J=1 unity_test || $CONTRUN_NAME=unity_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG V=1 make $PARALLELISM unity_test || $CONTRUN_NAME=unity_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER } @@ -370,7 +371,7 @@ LITE_BUILD_COMMANDS="[ $CLEANUP_ENV, { \"name\":\"Build RocksDB debug version\", - \"shell\":\"cd $WORKING_DIR; $SKIP_FORMAT_CHECKS make J=1 LITE=1 all check || $CONTRUN_NAME=lite $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SKIP_FORMAT_CHECKS make $PARALLELISM LITE=1 all check || $CONTRUN_NAME=lite $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER } @@ -392,14 +393,14 @@ STRESS_CRASH_TEST_COMMANDS="[ $CLEANUP_ENV, { \"name\":\"Build and run RocksDB debug stress tests\", - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, { \"name\":\"Build and run RocksDB debug crash tests\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 crash_test || $CONTRUN_NAME=crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM crash_test || $CONTRUN_NAME=crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -422,14 +423,14 @@ BLACKBOX_STRESS_CRASH_TEST_COMMANDS="[ $CLEANUP_ENV, { \"name\":\"Build and run RocksDB debug stress tests\", - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, { \"name\":\"Build and run RocksDB debug blackbox crash tests\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 blackbox_crash_test || $CONTRUN_NAME=blackbox_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM blackbox_crash_test || $CONTRUN_NAME=blackbox_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -452,14 +453,14 @@ WHITEBOX_STRESS_CRASH_TEST_COMMANDS="[ $CLEANUP_ENV, { \"name\":\"Build and run RocksDB debug stress tests\", - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, { \"name\":\"Build and run RocksDB debug whitebox crash tests\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 whitebox_crash_test || $CONTRUN_NAME=whitebox_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM whitebox_crash_test || $CONTRUN_NAME=whitebox_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -482,14 +483,14 @@ STRESS_CRASH_TEST_WITH_ATOMIC_FLUSH_COMMANDS="[ $CLEANUP_ENV, { \"name\":\"Build and run RocksDB debug stress tests\", - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, { \"name\":\"Build and run RocksDB debug crash tests with atomic flush\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 crash_test_with_atomic_flush || $CONTRUN_NAME=crash_test_with_atomic_flush $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM crash_test_with_atomic_flush || $CONTRUN_NAME=crash_test_with_atomic_flush $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -512,14 +513,14 @@ STRESS_CRASH_TEST_WITH_TXN_COMMANDS="[ $CLEANUP_ENV, { \"name\":\"Build and run RocksDB debug stress tests\", - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, { \"name\":\"Build and run RocksDB debug crash tests with txn\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 crash_test_with_txn || $CONTRUN_NAME=crash_test_with_txn $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM crash_test_with_txn || $CONTRUN_NAME=crash_test_with_txn $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -542,14 +543,14 @@ STRESS_CRASH_TEST_WITH_TS_COMMANDS="[ $CLEANUP_ENV, { \"name\":\"Build and run RocksDB debug stress tests\", - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM db_stress || $CONTRUN_NAME=db_stress $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, { \"name\":\"Build and run RocksDB debug crash tests with ts\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make J=1 crash_test_with_ts || $CONTRUN_NAME=crash_test_with_ts $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH make $PARALLELISM crash_test_with_ts || $CONTRUN_NAME=crash_test_with_ts $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -617,7 +618,7 @@ ASAN_CRASH_TEST_COMMANDS="[ { \"name\":\"Build and run RocksDB debug asan_crash_test\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $SKIP_FORMAT_CHECKS make J=1 asan_crash_test || $CONTRUN_NAME=asan_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $SKIP_FORMAT_CHECKS make $PARALLELISM asan_crash_test || $CONTRUN_NAME=asan_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -641,7 +642,7 @@ ASAN_BLACKBOX_CRASH_TEST_COMMANDS="[ { \"name\":\"Build and run RocksDB debug blackbox asan_crash_test\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $SKIP_FORMAT_CHECKS make J=1 blackbox_asan_crash_test || $CONTRUN_NAME=blackbox_asan_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $SKIP_FORMAT_CHECKS make $PARALLELISM blackbox_asan_crash_test || $CONTRUN_NAME=blackbox_asan_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -665,7 +666,7 @@ ASAN_WHITEBOX_CRASH_TEST_COMMANDS="[ { \"name\":\"Build and run RocksDB debug whitebox asan_crash_test\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $SKIP_FORMAT_CHECKS make J=1 whitebox_asan_crash_test || $CONTRUN_NAME=whitebox_asan_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $SKIP_FORMAT_CHECKS make $PARALLELISM whitebox_asan_crash_test || $CONTRUN_NAME=whitebox_asan_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -689,7 +690,7 @@ ASAN_CRASH_TEST_WITH_ATOMIC_FLUSH_COMMANDS="[ { \"name\":\"Build and run RocksDB debug asan_crash_test_with_atomic_flush\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $SKIP_FORMAT_CHECKS make J=1 asan_crash_test_with_atomic_flush || $CONTRUN_NAME=asan_crash_test_with_atomic_flush $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $SKIP_FORMAT_CHECKS make $PARALLELISM asan_crash_test_with_atomic_flush || $CONTRUN_NAME=asan_crash_test_with_atomic_flush $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -713,7 +714,7 @@ ASAN_CRASH_TEST_WITH_TXN_COMMANDS="[ { \"name\":\"Build and run RocksDB debug asan_crash_test_with_txn\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $SKIP_FORMAT_CHECKS make J=1 asan_crash_test_with_txn || $CONTRUN_NAME=asan_crash_test_with_txn $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $SKIP_FORMAT_CHECKS make $PARALLELISM asan_crash_test_with_txn || $CONTRUN_NAME=asan_crash_test_with_txn $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -758,7 +759,7 @@ UBSAN_CRASH_TEST_COMMANDS="[ { \"name\":\"Build and run RocksDB debug ubsan_crash_test\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make J=1 ubsan_crash_test || $CONTRUN_NAME=ubsan_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM ubsan_crash_test || $CONTRUN_NAME=ubsan_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -782,7 +783,7 @@ UBSAN_BLACKBOX_CRASH_TEST_COMMANDS="[ { \"name\":\"Build and run RocksDB debug blackbox ubsan_crash_test\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make J=1 blackbox_ubsan_crash_test || $CONTRUN_NAME=blackbox_ubsan_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM blackbox_ubsan_crash_test || $CONTRUN_NAME=blackbox_ubsan_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -806,7 +807,7 @@ UBSAN_WHITEBOX_CRASH_TEST_COMMANDS="[ { \"name\":\"Build and run RocksDB debug whitebox ubsan_crash_test\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make J=1 whitebox_ubsan_crash_test || $CONTRUN_NAME=whitebox_ubsan_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM whitebox_ubsan_crash_test || $CONTRUN_NAME=whitebox_ubsan_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -830,7 +831,7 @@ UBSAN_CRASH_TEST_WITH_ATOMIC_FLUSH_COMMANDS="[ { \"name\":\"Build and run RocksDB debug ubsan_crash_test_with_atomic_flush\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make J=1 ubsan_crash_test_with_atomic_flush || $CONTRUN_NAME=ubsan_crash_test_with_atomic_flush $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM ubsan_crash_test_with_atomic_flush || $CONTRUN_NAME=ubsan_crash_test_with_atomic_flush $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -854,7 +855,7 @@ UBSAN_CRASH_TEST_WITH_TXN_COMMANDS="[ { \"name\":\"Build and run RocksDB debug ubsan_crash_test_with_txn\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make J=1 ubsan_crash_test_with_txn || $CONTRUN_NAME=ubsan_crash_test_with_txn $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM ubsan_crash_test_with_txn || $CONTRUN_NAME=ubsan_crash_test_with_txn $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -924,7 +925,7 @@ TSAN_CRASH_TEST_COMMANDS="[ { \"name\":\"Compile and run\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $DEBUG $TSAN $TSAN_CRASH CRASH_TEST_KILL_ODD=1887 make J=1 crash_test || $CONTRUN_NAME=tsan_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $DEBUG $TSAN $TSAN_CRASH CRASH_TEST_KILL_ODD=1887 make $PARALLELISM crash_test || $CONTRUN_NAME=tsan_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -948,7 +949,7 @@ TSAN_BLACKBOX_CRASH_TEST_COMMANDS="[ { \"name\":\"Compile and run\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $DEBUG $TSAN $TSAN_CRASH CRASH_TEST_KILL_ODD=1887 make J=1 blackbox_crash_test || $CONTRUN_NAME=tsan_blackbox_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $DEBUG $TSAN $TSAN_CRASH CRASH_TEST_KILL_ODD=1887 make $PARALLELISM blackbox_crash_test || $CONTRUN_NAME=tsan_blackbox_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -972,7 +973,7 @@ TSAN_WHITEBOX_CRASH_TEST_COMMANDS="[ { \"name\":\"Compile and run\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $DEBUG $TSAN $TSAN_CRASH CRASH_TEST_KILL_ODD=1887 make J=1 whitebox_crash_test || $CONTRUN_NAME=tsan_whitebox_crash_test $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $DEBUG $TSAN $TSAN_CRASH CRASH_TEST_KILL_ODD=1887 make $PARALLELISM whitebox_crash_test || $CONTRUN_NAME=tsan_whitebox_crash_test $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -996,7 +997,7 @@ TSAN_CRASH_TEST_WITH_ATOMIC_FLUSH_COMMANDS="[ { \"name\":\"Compile and run\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $DEBUG $TSAN $TSAN_CRASH CRASH_TEST_KILL_ODD=1887 make J=1 crash_test_with_atomic_flush || $CONTRUN_NAME=tsan_crash_test_with_atomic_flush $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $DEBUG $TSAN $TSAN_CRASH CRASH_TEST_KILL_ODD=1887 make $PARALLELISM crash_test_with_atomic_flush || $CONTRUN_NAME=tsan_crash_test_with_atomic_flush $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -1020,7 +1021,7 @@ TSAN_CRASH_TEST_WITH_TXN_COMMANDS="[ { \"name\":\"Compile and run\", \"timeout\": 86400, - \"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $DEBUG $TSAN $TSAN_CRASH CRASH_TEST_KILL_ODD=1887 make J=1 crash_test_with_txn || $CONTRUN_NAME=tsan_crash_test_with_txn $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $DEBUG $TSAN $TSAN_CRASH CRASH_TEST_KILL_ODD=1887 make $PARALLELISM crash_test_with_txn || $CONTRUN_NAME=tsan_crash_test_with_txn $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }, @@ -1077,7 +1078,7 @@ run_no_compression() cat Makefile | grep -v tools/ldb_test.py > .tmp.Makefile mv .tmp.Makefile Makefile export $SKIP_FORMAT_CHECKS - make $DEBUG J=1 check + make $DEBUG $PARALLELISM check } NO_COMPRESSION_COMMANDS="[ @@ -1170,7 +1171,7 @@ JAVA_BUILD_TEST_COMMANDS="[ $CLEANUP_ENV, { \"name\":\"Build RocksDB for Java\", - \"shell\":\"cd $WORKING_DIR; $SETUP_JAVA_ENV; $SHM make rocksdbjava || $CONTRUN_NAME=rocksdbjava $TASK_CREATION_TOOL\", + \"shell\":\"cd $WORKING_DIR; $SETUP_JAVA_ENV; $SHM make $PARALLELISM rocksdbjava || $CONTRUN_NAME=rocksdbjava $TASK_CREATION_TOOL\", \"user\":\"root\", $PARSER }