Skip to content

Commit 0e9f00d

Browse files
committed
Do not run continuous verification interval unless we explicitly set FLAGS_continuous_verification_interval
1 parent eb08ed2 commit 0e9f00d

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

db_stress_tool/no_batched_ops_stress.cc

+9-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,15 @@ class NonBatchedOpsStressTest : public StressTest {
373373
}
374374

375375
void ContinuouslyVerifyDb(ThreadState* thread) const override {
376-
if (!secondary_db_) {
376+
// Currently this method gets calleds even when
377+
// FLAGS_continuous_verification_interval == 0 as long as
378+
// FLAGS_verify_db_one_in > 0. Previously, this was not causing a problem in
379+
// the crash tests since test_secondary was always equal to 0, and thus we
380+
// returned early from this method. When test_secondary is set and we have a
381+
// secondary_db_, the crash test fails during this iterator scan. The stack
382+
// trace mentions BlobReader/BlobSource but it may not necessarily be
383+
// related to BlobDB
384+
if (!secondary_db_ || !FLAGS_continuous_verification_interval) {
377385
return;
378386
}
379387
assert(secondary_db_);

tools/db_crashtest.py

+3
Original file line numberDiff line numberDiff line change
@@ -1023,6 +1023,9 @@ def finalize_and_sanitize(src_params):
10231023
if dest_params.get("track_and_verify_wals", 0) == 1:
10241024
dest_params["metadata_write_fault_one_in"] = 0
10251025
dest_params["write_fault_one_in"] = 0
1026+
# Continuous verification fails with secondaries inside NonBatchedOpsStressTest
1027+
if dest_params.get("test_secondary") == 1:
1028+
dest_params["continuous_verification_interval"] = 0
10261029
return dest_params
10271030

10281031

0 commit comments

Comments
 (0)