From 4f678b52e70140aa14454e37d77b8d33c5e4f847 Mon Sep 17 00:00:00 2001 From: Peter Dillinger Date: Wed, 17 Nov 2021 11:18:05 -0800 Subject: [PATCH] Don't allow parallel crash_test in Makefile (#9180) Summary: Using deps for running blackbox and whitebox allows them to be parallelized, which doesn't seem to be working well. Pull Request resolved: https://github.com/facebook/rocksdb/pull/9180 Test Plan: make -j24 crash_test Reviewed By: siying Differential Revision: D32500851 Pulled By: pdillinger fbshipit-source-id: 364288c8d023b93e7ca2724ea40edae2f4eb0407 --- Makefile | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 913d4aee7..67e312eb9 100644 --- a/Makefile +++ b/Makefile @@ -977,15 +977,27 @@ check_some: $(ROCKSDBTESTS_SUBSET) ldb_tests: ldb $(PYTHON) tools/ldb_test.py -crash_test: whitebox_crash_test blackbox_crash_test +crash_test: +# Do not parallelize + $(MAKE) whitebox_crash_test + $(MAKE) blackbox_crash_test -crash_test_with_atomic_flush: whitebox_crash_test_with_atomic_flush blackbox_crash_test_with_atomic_flush +crash_test_with_atomic_flush: +# Do not parallelize + $(MAKE) whitebox_crash_test_with_atomic_flush + $(MAKE) blackbox_crash_test_with_atomic_flush -crash_test_with_txn: whitebox_crash_test_with_txn blackbox_crash_test_with_txn +crash_test_with_txn: +# Do not parallelize + $(MAKE) whitebox_crash_test_with_txn + $(MAKE) blackbox_crash_test_with_txn crash_test_with_best_efforts_recovery: blackbox_crash_test_with_best_efforts_recovery -crash_test_with_ts: whitebox_crash_test_with_ts blackbox_crash_test_with_ts +crash_test_with_ts: +# Do not parallelize + $(MAKE) whitebox_crash_test_with_ts + $(MAKE) blackbox_crash_test_with_ts blackbox_crash_test: db_stress $(PYTHON) -u tools/db_crashtest.py --simple blackbox $(CRASH_TEST_EXT_ARGS)