Skip to content

prefetch_test.cc: Fix address sanitizer warning #14233

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.

Sign up for GitHub

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

Open
evanj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

prefetch_test.cc: Fix address sanitizer warning #14233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion file/prefetch_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,9 @@ TEST_P(PrefetchTest, Basic) {
buff_prefetch_count = 0;
}
}

SyncPoint::GetInstance()->DisableProcessing();
SyncPoint::GetInstance()->ClearAllCallBacks();
Close();
}

Expand Down Expand Up @@ -3454,7 +3457,12 @@ class FSBufferPrefetchTest
stats_ = CreateDBStatistics();
}

void TearDown() override { EXPECT_OK(DestroyDir(env_, test_dir_)); }
void TearDown() override {
// needed for FSBufferPrefetchUnalignedReads which has early returns
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearAllCallBacks();
EXPECT_OK(DestroyDir(env_, test_dir_));
}

void Write(const std::string& fname, const std::string& content) {
std::unique_ptr<FSWritableFile> f;
Expand Down Expand Up @@ -3723,6 +3731,7 @@ TEST_P(FSBufferPrefetchTest, FSBufferPrefetchUnalignedReads) {
stats.get());

int overlap_buffer_write_ct = 0;
// cleared by FSBufferPrefetchTest::TearDown so it happens for early returns
ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
"FilePrefetchBuffer::CopyDataToOverlapBuffer:Complete",
[&](void* /*arg*/) { overlap_buffer_write_ct++; });
Expand Down
Loading