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

Unlock mutex in ReFitLevel

Browse Source 
Summary: I encountered an issue where the database hang, it looks like the mutex is not unlocked on return in ReFitLevel function

Test Plan: make -j64 check

Reviewers: yhchiang, sdong

Reviewed By: sdong

Subscribers: dhruba

Differential Revision: https://reviews.facebook.net/D39609
This commit is contained in:
Islam AbdelRahman 2015-06-05 11:06:14 -07:00
parent 7647df8f9e
commit 31e60e2a77
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/db_impl.cc
View File

@ -1707,11 +1707,10 @@ Status DBImpl::ReFitLevel(ColumnFamilyData* cfd, int level, int target_level) {
SuperVersion* superversion_to_free = nullptr; SuperVersion* superversion_to_free = nullptr;
SuperVersion* new_superversion = new SuperVersion(); SuperVersion* new_superversion = new SuperVersion();
mutex_.Lock(); InstrumentedMutexLock guard_lock(&mutex_);
// only allow one thread refitting // only allow one thread refitting
if (refitting_level_) { if (refitting_level_) {
mutex_.Unlock();
Log(InfoLogLevel::INFO_LEVEL, db_options_.info_log, Log(InfoLogLevel::INFO_LEVEL, db_options_.info_log,
"[ReFitLevel] another thread is refitting"); "[ReFitLevel] another thread is refitting");
delete new_superversion; delete new_superversion;
@ -1743,12 +1742,14 @@ Status DBImpl::ReFitLevel(ColumnFamilyData* cfd, int level, int target_level) {
auto* vstorage = cfd->current()->storage_info(); auto* vstorage = cfd->current()->storage_info();
if (to_level > level) { if (to_level > level) {
if (level == 0) { if (level == 0) {
delete new_superversion;
return Status::NotSupported( return Status::NotSupported(
"Cannot change from level 0 to other levels."); "Cannot change from level 0 to other levels.");
} }
// Check levels are empty for a trivial move // Check levels are empty for a trivial move
for (int l = level + 1; l <= to_level; l++) { for (int l = level + 1; l <= to_level; l++) {
if (vstorage->NumLevelFiles(l) > 0) { if (vstorage->NumLevelFiles(l) > 0) {
delete new_superversion;
return Status::NotSupported( return Status::NotSupported(
"Levels between source and target are not empty for a move."); "Levels between source and target are not empty for a move.");
} }
@ -1791,7 +1792,6 @@ Status DBImpl::ReFitLevel(ColumnFamilyData* cfd, int level, int target_level) {
refitting_level_ = false; refitting_level_ = false;
bg_work_gate_closed_ = false; bg_work_gate_closed_ = false;
mutex_.Unlock();
delete superversion_to_free; delete superversion_to_free;
delete new_superversion; delete new_superversion;
return status; return status;