提交 cf16ff22 编写于 作者: C chenchanglong

fix db_compaction_test

上级 ee1b9f8b
......@@ -680,6 +680,7 @@ static std::shared_ptr<CompactionDispatcher> GetCmdLineDispatcher() {
}
Status CompactionJob::Run() {
TEST_SYNC_POINT("CompactionJob::Run():OuterStart");
assert(!IsCompactionWorkerNode());
ColumnFamilyData* cfd = compact_->compaction->column_family_data();
CompactionDispatcher* dispatcher = cfd->ioptions()->compaction_dispatcher;
......
......@@ -2863,17 +2863,17 @@ TEST_P(DBCompactionTestWithParam, DeleteMovedFileAfterCompaction) {
ASSERT_EQ("0,1", FilesPerLevel(0));
// block compactions
test::SleepingBackgroundTask sleeping_task;
env_->Schedule(&test::SleepingBackgroundTask::DoSleepTask, &sleeping_task,
Env::Priority::LOW);
rocksdb::SyncPoint::GetInstance()->LoadDependency({
{"DbCompactiontest::DeleteMovedFileAfterCompaction:1",
"CompactionJob::Run():OuterStart"},
});
options.max_bytes_for_level_base = 1024 * 1024; // 1 MB
Reopen(options);
std::unique_ptr<Iterator> iterator(db_->NewIterator(ReadOptions()));
ASSERT_EQ("0,1", FilesPerLevel(0));
// let compactions go
sleeping_task.WakeUp();
sleeping_task.WaitUntilDone();
TEST_SYNC_POINT("DbCompactiontest::DeleteMovedFileAfterCompaction:1");
// this should execute L1->L2 (move)
dbfull()->TEST_WaitForCompact();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册