diff --git a/db/db_impl/db_impl_files.cc b/db/db_impl/db_impl_files.cc index 1792cefd530f21466ef7934bb8cdc835c267bb67..5b2c429cd80e6f74794c46365ccea08a7d4549be 100644 --- a/db/db_impl/db_impl_files.cc +++ b/db/db_impl/db_impl_files.cc @@ -524,12 +524,6 @@ void DBImpl::PurgeObsoleteFiles(JobContext& state, bool schedule_only) { break; case kOptionsFile: keep = (number >= optsfile_num2); - TEST_SYNC_POINT_CALLBACK( - "DBImpl::PurgeObsoleteFiles:CheckOptionsFiles:1", - reinterpret_cast(&number)); - TEST_SYNC_POINT_CALLBACK( - "DBImpl::PurgeObsoleteFiles:CheckOptionsFiles:2", - reinterpret_cast(&keep)); break; case kCurrentFile: case kDBLockFile: diff --git a/db/obsolete_files_test.cc b/db/obsolete_files_test.cc index 3d18196e6c7b0e3302d77189f6486c286f92ffaf..d4348283cbe7220290a8246de88ddc718d39e27c 100644 --- a/db/obsolete_files_test.cc +++ b/db/obsolete_files_test.cc @@ -149,18 +149,6 @@ TEST_F(ObsoleteFilesTest, RaceForObsoleteFileDeletion) { TEST_F(ObsoleteFilesTest, DeleteObsoleteOptionsFile) { ReopenDB(); - SyncPoint::GetInstance()->DisableProcessing(); - std::vector optsfiles_nums; - std::vector optsfiles_keep; - SyncPoint::GetInstance()->SetCallBack( - "DBImpl::PurgeObsoleteFiles:CheckOptionsFiles:1", [&](void* arg) { - optsfiles_nums.push_back(*reinterpret_cast(arg)); - }); - SyncPoint::GetInstance()->SetCallBack( - "DBImpl::PurgeObsoleteFiles:CheckOptionsFiles:2", [&](void* arg) { - optsfiles_keep.push_back(*reinterpret_cast(arg)); - }); - SyncPoint::GetInstance()->EnableProcessing(); createLevel0Files(2, 50000); CheckFileTypeCounts(wal_dir_, 1, 0, 0); @@ -176,7 +164,6 @@ TEST_F(ObsoleteFilesTest, DeleteObsoleteOptionsFile) { } } ASSERT_OK(dbfull()->EnableFileDeletions(true /* force */)); - ASSERT_EQ(optsfiles_nums.size(), optsfiles_keep.size()); Close();