Prevent deadlock in db_stress with DbStressCompactionFilter (#8956)

Summary:
The cyclic dependency was:

- `StressTest::OperateDb()` locks the mutex for key 'k'
- `StressTest::OperateDb()` calls a function like `PauseBackgroundWork()`, which waits for pending compaction to complete.
- The pending compaction reaches key `k` and `DbStressCompactionFilter::FilterV2()` calls `Lock()` on that key's mutex, which hangs forever.

The cycle can be broken by using a new function, `port::Mutex::TryLock()`, which returns immediately upon failure to acquire a lock. In that case `DbStressCompactionFilter::FilterV2()` can just decide to keep the key.

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

Reviewed By: riversand963

Differential Revision: D31183718

Pulled By: ajkr

fbshipit-source-id: 329e4a31ce43085af174cf367ef560b5a04399c5
main
Andrew Kryczka 3 years ago committed by Facebook GitHub Bot
parent 0595101c4f
commit 791bff5b4e
  1. 13
      db_stress_tool/db_stress_compaction_filter.h
  2. 12
      port/port_posix.cc
  3. 3
      port/port_posix.h
  4. 10
      port/win/port_win.h

@ -39,8 +39,17 @@ class DbStressCompactionFilter : public CompactionFilter {
bool ok = GetIntVal(key.ToString(), &key_num);
assert(ok);
(void)ok;
MutexLock key_lock(state_->GetMutexForKey(cf_id_, key_num));
if (!state_->Exists(cf_id_, key_num)) {
port::Mutex* key_mutex = state_->GetMutexForKey(cf_id_, key_num);
if (!key_mutex->TryLock()) {
return Decision::kKeep;
}
// Reaching here means we acquired the lock.
bool key_exists = state_->Exists(cf_id_, key_num);
key_mutex->Unlock();
if (!key_exists) {
return Decision::kRemove;
}
return Decision::kKeep;

@ -49,7 +49,7 @@ extern const bool kDefaultToAdaptiveMutex = false;
namespace port {
static int PthreadCall(const char* label, int result) {
if (result != 0 && result != ETIMEDOUT) {
if (result != 0 && result != ETIMEDOUT && result != EBUSY) {
fprintf(stderr, "pthread %s: %s\n", label, errnoStr(result).c_str());
abort();
}
@ -92,6 +92,16 @@ void Mutex::Unlock() {
PthreadCall("unlock", pthread_mutex_unlock(&mu_));
}
bool Mutex::TryLock() {
bool ret = PthreadCall("trylock", pthread_mutex_trylock(&mu_)) == 0;
#ifndef NDEBUG
if (ret) {
locked_ = true;
}
#endif
return ret;
}
void Mutex::AssertHeld() {
#ifndef NDEBUG
assert(locked_);

@ -116,6 +116,9 @@ class Mutex {
void Lock();
void Unlock();
bool TryLock();
// this will assert if the mutex is not locked
// it does NOT verify that mutex is held by a calling thread
void AssertHeld();

@ -148,6 +148,16 @@ class Mutex {
mutex_.unlock();
}
bool TryLock() {
bool ret = mutex_.try_lock();
#ifndef NDEBUG
if (ret) {
locked_ = true;
}
#endif
return ret;
}
// this will assert if the mutex is not locked
// it does NOT verify that mutex is held by a calling thread
void AssertHeld() {

Loading…
Cancel
Save