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

Fix reopen voting logic in db_stress to prevent hangs (#5876)

Browse Source 
Summary:
When multiple operations are performed in a db_stress thread in one loop
iteration, the reopen voting logic needs to take that into account. It
was doing that for MultiGet, but a new option was introduced recently to
do multiple iterator seeks per iteration, which broke it again. Fix the
logic to be more robust and agnostic of the type of operation performed.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/5876

Test Plan: Run db_stress

Differential Revision: D17733590

Pulled By: anand1976

fbshipit-source-id: 787f01abefa1e83bba43e0b4f4abb26699b2089e
This commit is contained in:
anand76 2019-10-03 10:20:17 -07:00 committed by Facebook Github Bot
parent 9e4913ce9d
commit cca87d7722
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/db_stress.cc
View File

@ -2086,18 +2086,19 @@ class StressTest {
const int delBound = writeBound + (int)FLAGS_delpercent; const int delBound = writeBound + (int)FLAGS_delpercent;
const int delRangeBound = delBound + (int)FLAGS_delrangepercent; const int delRangeBound = delBound + (int)FLAGS_delrangepercent;
const uint64_t ops_per_open = FLAGS_ops_per_thread / (FLAGS_reopen + 1); const uint64_t ops_per_open = FLAGS_ops_per_thread / (FLAGS_reopen + 1);
int multiget_batch_size = 0;
thread->stats.Start(); thread->stats.Start();
for (uint64_t i = 0; i < FLAGS_ops_per_thread; i++) { for (uint64_t i = 0, prev_i = 0; i < FLAGS_ops_per_thread; i++) {
if (thread->shared->HasVerificationFailedYet()) { if (thread->shared->HasVerificationFailedYet()) {
break; break;
} }
// Check if the multiget batch crossed the ops_per_open boundary. If it // In case i is incremented more than once due to multiple operations,
// did, then we should vote to reopen // such as MultiGet or iterator seeks, check whether we have crossed
// the ops_per_open boundary in the previous iteration. If it did,
// then vote to reopen
if (i != 0 && if (i != 0 &&
(i % ops_per_open == 0 || (i % ops_per_open == 0 ||
i % ops_per_open < (i - multiget_batch_size) % ops_per_open)) { i % ops_per_open < prev_i % ops_per_open)) {
{ {
thread->stats.FinishedSingleOp(); thread->stats.FinishedSingleOp();
MutexLock l(thread->shared->GetMutex()); MutexLock l(thread->shared->GetMutex());
@ -2118,6 +2119,7 @@ class StressTest {
// thread->stats.Start(); // thread->stats.Start();
} }
} }
prev_i = i;
// Change Options // Change Options
if (FLAGS_set_options_one_in > 0 && if (FLAGS_set_options_one_in > 0 &&
@ -2312,14 +2314,13 @@ class StressTest {
// Reset this in case we pick something other than a read op. We don't // Reset this in case we pick something other than a read op. We don't
// want to use a stale value when deciding at the beginning of the loop // want to use a stale value when deciding at the beginning of the loop
// whether to vote to reopen // whether to vote to reopen
multiget_batch_size = 0;
if (prob_op >= 0 && prob_op < (int)FLAGS_readpercent) { if (prob_op >= 0 && prob_op < (int)FLAGS_readpercent) {
// OPERATION read // OPERATION read
if (FLAGS_use_multiget) { if (FLAGS_use_multiget) {
// Leave room for one more iteration of the loop with a single key // Leave room for one more iteration of the loop with a single key
// batch. This is to ensure that each thread does exactly the same // batch. This is to ensure that each thread does exactly the same
// number of ops // number of ops
multiget_batch_size = static_cast<int>( int multiget_batch_size = static_cast<int>(
std::min(static_cast<uint64_t>(thread->rand.Uniform(64)), std::min(static_cast<uint64_t>(thread->rand.Uniform(64)),
FLAGS_ops_per_thread - i - 1)); FLAGS_ops_per_thread - i - 1));
// If its the last iteration, ensure that multiget_batch_size is 1 // If its the last iteration, ensure that multiget_batch_size is 1