Skip to content

test: Fix shutdown vptr race in BlockFilterIndexSync bench #34734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fanquake merged 1 commit into from
Mar 6, 2026
Merged

test: Fix shutdown vptr race in BlockFilterIndexSync bench #34734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/bench/index_blockfilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ static void BlockFilterIndexSync(benchmark::Bench& bench)
IndexSummary summary = filter_index.GetSummary();
assert(summary.synced);
assert(summary.best_block_hash == WITH_LOCK(::cs_main, return test_setup->m_node.chainman->ActiveTip()->GetBlockHash()));

// Shutdown sequence (c.f. Shutdown() in init.cpp)
filter_index.Stop();
});
}

Expand Down
8 changes: 0 additions & 8 deletions src/test/coinstatsindex_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,6 @@ BOOST_FIXTURE_TEST_CASE(coinstatsindex_initial_sync, TestChain100Setup)

BOOST_CHECK(block_index != new_block_index);

// It is not safe to stop and destroy the index until it finishes handling
// the last BlockConnected notification. The BlockUntilSyncedToCurrentChain()
// call above is sufficient to ensure this, but the
// SyncWithValidationInterfaceQueue() call below is also needed to ensure
// TSAN always sees the test thread waiting for the notification thread, and
// avoid potential false positive reports.
m_node.validation_signals->SyncWithValidationInterfaceQueue();

// Shutdown sequence (c.f. Shutdown() in init.cpp)
coin_stats_index.Stop();
}
Expand Down
8 changes: 0 additions & 8 deletions src/test/txindex_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,6 @@ BOOST_FIXTURE_TEST_CASE(txindex_initial_sync, TestChain100Setup)
}
}

// It is not safe to stop and destroy the index until it finishes handling
// the last BlockConnected notification. The BlockUntilSyncedToCurrentChain()
// call above is sufficient to ensure this, but the
// SyncWithValidationInterfaceQueue() call below is also needed to ensure
// TSAN always sees the test thread waiting for the notification thread, and
// avoid potential false positive reports.
m_node.validation_signals->SyncWithValidationInterfaceQueue();

// shutdown sequence (c.f. Shutdown() in init.cpp)
txindex.Stop();
}
Expand Down
1 change: 1 addition & 0 deletions src/test/txospenderindex_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ BOOST_FIXTURE_TEST_CASE(txospenderindex_initial_sync, TestChain100Setup)
BOOST_CHECK_EQUAL((*tx_spender)->block_hash, tip_hash);
}

// Shutdown sequence (c.f. Shutdown() in init.cpp)
txospenderindex.Stop();
}

Expand Down
Loading