diff --git a/db/db_test2.cc b/db/db_test2.cc index 7800144ba..cc30ef85b 100644 --- a/db/db_test2.cc +++ b/db/db_test2.cc @@ -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(); diff --git a/table/block.cc b/table/block.cc index d11771c03..2d662bb2d 100644 --- a/table/block.cc +++ b/table/block.cc @@ -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)