Skip to content

Commit 3c4729a

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#23223: Disable lock contention logging in checkqueue_tests
6ae9f1c Disable lock contention logging in checkqueue_tests (Jon Atack) Pull request description: This patch disables lock contention logging in the checkqueue_tests as some of these tests are designed to be heavily contested to trigger race conditions or other issues. This created very large log files when run with DEBUG_LOCKCONTENTION defined (up to v22) or with lock logging enabled by default in current master. Examples running the following command: ``` $ ./src/test/test_bitcoin -t checkqueue_tests/test_CheckQueue_Correct_Random -- DEBUG_LOG_OUT > testlog.txt -rw-r--r-- 87042178 Oct 8 12:41 testlog-with-DEBUG_LOCKCONTENTION-at-v22-run1.txt -rw-r--r-- 73879896 Oct 8 12:42 testlog-with-DEBUG_LOCKCONTENTION-at-v22-run2.txt -rw-r--r-- 65150518 Oct 8 12:51 testlog-with-DEBUG_LOCKCONTENTION-at-bb9f76a-run1.txt -rw-r--r-- 65774554 Oct 8 12:52 testlog-with-DEBUG_LOCKCONTENTION-at-bb9f76a-run2.txt -rw-r--r-- 73493309 Oct 8 13:00 testlog-current-master-at-991753e-run1.txt -rw-r--r-- 65616977 Oct 8 13:01 testlog-current-master-at-991753e-run2.txt -rw-r--r-- 5093 Oct 8 13:04 testlog-with-this-commit-run1.txt -rw-r--r-- 5093 Oct 8 13:05 testlog-with-this-commit-run2.txt ``` Resolves #23167. ACKs for top commit: vasild: ACK 6ae9f1c Tree-SHA512: b16812ed60c58a1cf40c04ebeca9197ac076b2415f71673ac7bb5b7960a1ff80ba2c909345ad221c7689b0562d17f63a32a629f5d6dbcf0e57130bf5760388c1
2 parents 9e3f7dc + 6ae9f1c commit 3c4729a

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

src/test/checkqueue_tests.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,17 @@
1818
#include <utility>
1919
#include <vector>
2020

21-
BOOST_FIXTURE_TEST_SUITE(checkqueue_tests, TestingSetup)
21+
/**
22+
* Identical to TestingSetup but excludes lock contention logging, as some of
23+
* these tests are designed to be heavily contested to trigger race conditions
24+
* or other issues.
25+
*/
26+
struct NoLockLoggingTestingSetup : public TestingSetup {
27+
NoLockLoggingTestingSetup()
28+
: TestingSetup{CBaseChainParams::MAIN, /*extra_args=*/{"-debugexclude=lock"}} {}
29+
};
30+
31+
BOOST_FIXTURE_TEST_SUITE(checkqueue_tests, NoLockLoggingTestingSetup)
2232

2333
static const unsigned int QUEUE_BATCH_SIZE = 128;
2434
static const int SCRIPT_CHECK_THREADS = 3;

0 commit comments

Comments
 (0)