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

Stop stopping writes on bg_error_

Browse Source 
Summary: This might have caused https://github.com/facebook/rocksdb/issues/345. If we're stopping writes and bg_error comes along, we will never unblock the write.

Test Plan: compiles

Reviewers: ljin

Reviewed By: ljin

Subscribers: leveldb

Differential Revision: https://reviews.facebook.net/D24807
This commit is contained in:
Igor Canadi 2014-10-13 14:25:55 -07:00
parent 4942f6efb6
commit cc6c883f59
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
db/db_impl.cc
View File

@ -4036,7 +4036,7 @@ Status DBImpl::Write(const WriteOptions& options, WriteBatch* my_batch) {
if (UNLIKELY(status.ok()) && if (UNLIKELY(status.ok()) &&
(write_controller_.IsStopped() || write_controller_.GetDelay() > 0)) { (write_controller_.IsStopped() || write_controller_.GetDelay() > 0)) {
DelayWrite(expiration_time); status = DelayWrite(expiration_time);
} }
if (UNLIKELY(status.ok() && has_timeout && if (UNLIKELY(status.ok() && has_timeout &&
@ -4151,7 +4151,7 @@ Status DBImpl::Write(const WriteOptions& options, WriteBatch* my_batch) {
// REQUIRES: mutex_ is held // REQUIRES: mutex_ is held
// REQUIRES: this thread is currently at the front of the writer queue // REQUIRES: this thread is currently at the front of the writer queue
void DBImpl::DelayWrite(uint64_t expiration_time) { Status DBImpl::DelayWrite(uint64_t expiration_time) {
StopWatch sw(env_, stats_, WRITE_STALL); StopWatch sw(env_, stats_, WRITE_STALL);
bool has_timeout = (expiration_time > 0); bool has_timeout = (expiration_time > 0);
auto delay = write_controller_.GetDelay(); auto delay = write_controller_.GetDelay();
@ -4161,16 +4161,18 @@ void DBImpl::DelayWrite(uint64_t expiration_time) {
mutex_.Lock(); mutex_.Lock();
} }
while (write_controller_.IsStopped()) { while (bg_error_.ok() && write_controller_.IsStopped()) {
if (has_timeout) { if (has_timeout) {
bg_cv_.TimedWait(expiration_time); bg_cv_.TimedWait(expiration_time);
if (env_->NowMicros() > expiration_time) { if (env_->NowMicros() > expiration_time) {
break; return Status::TimedOut();
} }
} else { } else {
bg_cv_.Wait(); bg_cv_.Wait();
} }
} }
return bg_error_;
} }
Status DBImpl::ScheduleFlushes(WriteContext* context) { Status DBImpl::ScheduleFlushes(WriteContext* context) {

2
db/db_impl.h
View File

@ -367,7 +367,7 @@ class DBImpl : public DB {
const autovector<MemTable*>& mems, const autovector<MemTable*>& mems,
VersionEdit* edit, uint64_t* filenumber, LogBuffer* log_buffer); VersionEdit* edit, uint64_t* filenumber, LogBuffer* log_buffer);
void DelayWrite(uint64_t expiration_time); Status DelayWrite(uint64_t expiration_time);
Status ScheduleFlushes(WriteContext* context); Status ScheduleFlushes(WriteContext* context);