NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix flaky db_basic_bench caused by unreleased iterator (#10058)

Browse Source 
Summary:
Iterator is not freed after test is done (after the main for
loop), which could cause db close failed.

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

Test Plan:
Able to reproduce consistently with higher thread number,
like 100, make sure it passes after the fix

Reviewed By: ajkr

Differential Revision: D36685823

Pulled By: jay-zhuang

fbshipit-source-id: 4c98b8758d106bfe40cae670e689c3d284765bcf
main
Jay Zhuang 2 years ago committed by Facebook GitHub Bot
parent bd170dda03
commit 5490da20a5
1 changed files with 61 additions and 73 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 134
      microbench/db_basic_bench.cc

134
microbench/db_basic_bench.cc
Unescape View File

@ -1109,21 +1109,19 @@ static void IteratorSeek(benchmark::State& state) {
} }
} }
{ for (auto _ : state) {
std::unique_ptr<Iterator> iter{nullptr}; std::unique_ptr<Iterator> iter{nullptr};
for (auto _ : state) { state.PauseTiming();
state.PauseTiming(); if (!iter) {
if (!iter) { iter.reset(db->NewIterator(ReadOptions()));
iter.reset(db->NewIterator(ReadOptions())); }
} Slice key = negative_query ? kg.NextNonExist() : kg.Next();
Slice key = negative_query ? kg.NextNonExist() : kg.Next(); if (!iter->status().ok()) {
if (!iter->status().ok()) { state.SkipWithError(iter->status().ToString().c_str());
state.SkipWithError(iter->status().ToString().c_str()); return;
return;
}
state.ResumeTiming();
iter->Seek(key);
} }
state.ResumeTiming();
iter->Seek(key);
} }
if (state.thread_index() == 0) { if (state.thread_index() == 0) {
@ -1202,22 +1200,20 @@ static void IteratorNext(benchmark::State& state) {
} }
} }
{ for (auto _ : state) {
std::unique_ptr<Iterator> iter{nullptr}; std::unique_ptr<Iterator> iter{nullptr};
for (auto _ : state) { state.PauseTiming();
state.PauseTiming(); if (!iter) {
if (!iter) { iter.reset(db->NewIterator(ReadOptions()));
iter.reset(db->NewIterator(ReadOptions())); }
} while (!iter->Valid()) {
while (!iter->Valid()) { iter->Seek(kg.Next());
iter->Seek(kg.Next()); if (!iter->status().ok()) {
if (!iter->status().ok()) { state.SkipWithError(iter->status().ToString().c_str());
state.SkipWithError(iter->status().ToString().c_str());
}
} }
state.ResumeTiming();
iter->Next();
} }
state.ResumeTiming();
iter->Next();
} }
if (state.thread_index() == 0) { if (state.thread_index() == 0) {
@ -1281,31 +1277,27 @@ static void IteratorNextWithPerfContext(benchmark::State& state) {
SetPerfLevel(kEnableTime); SetPerfLevel(kEnableTime);
get_perf_context()->EnablePerLevelPerfContext(); get_perf_context()->EnablePerLevelPerfContext();
{ for (auto _ : state) {
std::unique_ptr<Iterator> iter{nullptr}; std::unique_ptr<Iterator> iter{nullptr};
for (auto _ : state) { state.PauseTiming();
state.PauseTiming(); if (!iter) {
if (!iter) { iter.reset(db->NewIterator(ReadOptions()));
iter.reset(db->NewIterator(ReadOptions())); }
} while (!iter->Valid()) {
while (!iter->Valid()) { iter->Seek(kg.Next());
iter->Seek(kg.Next()); if (!iter->status().ok()) {
if (!iter->status().ok()) { state.SkipWithError(iter->status().ToString().c_str());
state.SkipWithError(iter->status().ToString().c_str());
}
} }
get_perf_context()->Reset();
state.ResumeTiming();
iter->Next();
user_key_comparison_count +=
get_perf_context()->user_key_comparison_count;
internal_key_skipped_count +=
get_perf_context()->internal_key_skipped_count;
find_next_user_entry_time +=
get_perf_context()->find_next_user_entry_time;
iter_next_cpu_nanos += get_perf_context()->iter_next_cpu_nanos;
} }
get_perf_context()->Reset();
state.ResumeTiming();
iter->Next();
user_key_comparison_count += get_perf_context()->user_key_comparison_count;
internal_key_skipped_count +=
get_perf_context()->internal_key_skipped_count;
find_next_user_entry_time += get_perf_context()->find_next_user_entry_time;
iter_next_cpu_nanos += get_perf_context()->iter_next_cpu_nanos;
} }
state.counters["user_key_comparison_count"] = state.counters["user_key_comparison_count"] =
@ -1370,22 +1362,20 @@ static void IteratorPrev(benchmark::State& state) {
} }
} }
{ for (auto _ : state) {
std::unique_ptr<Iterator> iter{nullptr}; std::unique_ptr<Iterator> iter{nullptr};
for (auto _ : state) { state.PauseTiming();
state.PauseTiming(); if (!iter) {
if (!iter) { iter.reset(db->NewIterator(ReadOptions()));
iter.reset(db->NewIterator(ReadOptions())); }
} while (!iter->Valid()) {
while (!iter->Valid()) { iter->Seek(kg.Next());
iter->Seek(kg.Next()); if (!iter->status().ok()) {
if (!iter->status().ok()) { state.SkipWithError(iter->status().ToString().c_str());
state.SkipWithError(iter->status().ToString().c_str());
}
} }
state.ResumeTiming();
iter->Prev();
} }
state.ResumeTiming();
iter->Prev();
} }
if (state.thread_index() == 0) { if (state.thread_index() == 0) {
@ -1464,19 +1454,17 @@ static void PrefixSeek(benchmark::State& state) {
} }
} }
{ for (auto _ : state) {
std::unique_ptr<Iterator> iter{nullptr}; std::unique_ptr<Iterator> iter{nullptr};
for (auto _ : state) { state.PauseTiming();
state.PauseTiming(); if (!iter) {
if (!iter) { iter.reset(db->NewIterator(ReadOptions()));
iter.reset(db->NewIterator(ReadOptions())); }
} state.ResumeTiming();
state.ResumeTiming(); iter->Seek(kg.NextPrefix());
iter->Seek(kg.NextPrefix()); if (!iter->status().ok()) {
if (!iter->status().ok()) { state.SkipWithError(iter->status().ToString().c_str());
state.SkipWithError(iter->status().ToString().c_str()); return;
return;
}
} }
} }

Write Preview
Loading…
Cancel
Save