Skip to content
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.

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

Remove sync point from Block destructor #4370

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion db/db_test2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2649,7 +2649,7 @@ TEST_F(DBTest2, PinnableSliceAndMmapReads) {
#endif
}

TEST_F(DBTest2, IteratorPinnedMemory) {
TEST_F(DBTest2, DISABLED_IteratorPinnedMemory) {
Options options = CurrentOptions();
options.create_if_missing = true;
options.statistics = rocksdb::CreateDBStatistics();
Expand Down
6 changes: 5 additions & 1 deletion table/block.cc
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,11 @@ BlockBasedTableOptions::DataBlockIndexType Block::IndexType() const {
return index_type;
}

Block::~Block() { TEST_SYNC_POINT("Block::~Block"); }
Block::~Block() {
// This sync point can be re-enabled once the right order for global static
// initialization/destruction across compilation units is determined.
// TEST_SYNC_POINT("Block::~Block");
}

Block::Block(BlockContents&& contents, SequenceNumber _global_seqno,
size_t read_amp_bytes_per_bit, Statistics* statistics)
Expand Down