andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix flaky EventListenerTest.DisableBGCompaction (#9400)

Browse Source 
Summary:
Wasn't able to easily reproduce error, but easy to see a race
condition between TestFlushListener::OnFlushCompleted and
DBTestBase::Close(), which frees CF handles before closing DB.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/9400

Test Plan: CI etc.

Reviewed By: riversand963

Differential Revision: D33645134

Pulled By: pdillinger

fbshipit-source-id: d0ec914cc43c9e14f53da633876b95b61995138d
This commit is contained in:
Peter Dillinger 2022-01-21 08:24:06 -08:00 committed by Facebook GitHub Bot
parent cd50078ae0
commit 8064a3ac31
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db_impl/db_impl_debug.cc
View File

@ -159,7 +159,7 @@ Status DBImpl::TEST_AtomicFlushMemTables(
Status DBImpl::TEST_WaitForBackgroundWork() { Status DBImpl::TEST_WaitForBackgroundWork() {
InstrumentedMutexLock l(&mutex_); InstrumentedMutexLock l(&mutex_);
WaitForBackgroundWork(); WaitForBackgroundWork();
return Status::OK(); return error_handler_.GetBGError();
} }
Status DBImpl::TEST_WaitForFlushMemTable(ColumnFamilyHandle* column_family) { Status DBImpl::TEST_WaitForFlushMemTable(ColumnFamilyHandle* column_family) {

3
db/listener_test.cc
View File

@ -515,6 +515,9 @@ TEST_F(EventListenerTest, DisableBGCompaction) {
db_->GetColumnFamilyMetaData(handles_[1], &cf_meta); db_->GetColumnFamilyMetaData(handles_[1], &cf_meta);
} }
ASSERT_GE(listener->slowdown_count, kSlowdownTrigger * 9); ASSERT_GE(listener->slowdown_count, kSlowdownTrigger * 9);
// We don't want the listener executing during DBTestBase::Close() due to
// race on handles_.
ASSERT_OK(dbfull()->TEST_WaitForBackgroundWork());
} }
class TestCompactionReasonListener : public EventListener { class TestCompactionReasonListener : public EventListener {