Correct version of D16821

This commit is contained in:
Igor Canadi 2014-03-12 09:38:59 -07:00
parent 2b95dc1542
commit 45ad75db80

View file

@ -1941,7 +1941,6 @@ void DBImpl::BackgroundCallFlush() {
if (madeProgress || bg_schedule_needed_) { if (madeProgress || bg_schedule_needed_) {
MaybeScheduleFlushOrCompaction(); MaybeScheduleFlushOrCompaction();
} }
log_buffer.FlushBufferToLog();
bg_cv_.SignalAll(); bg_cv_.SignalAll();
// IMPORTANT: there should be no code after calling SignalAll. This call may // IMPORTANT: there should be no code after calling SignalAll. This call may
// signal the DB destructor that it's OK to proceed with destruction. In // signal the DB destructor that it's OK to proceed with destruction. In
@ -2026,7 +2025,6 @@ void DBImpl::BackgroundCallCompaction() {
if (madeProgress || bg_schedule_needed_) { if (madeProgress || bg_schedule_needed_) {
MaybeScheduleFlushOrCompaction(); MaybeScheduleFlushOrCompaction();
} }
log_buffer.FlushBufferToLog();
bg_cv_.SignalAll(); bg_cv_.SignalAll();
// IMPORTANT: there should be no code after calling SignalAll. This call may // IMPORTANT: there should be no code after calling SignalAll. This call may
// signal the DB destructor that it's OK to proceed with destruction. In // signal the DB destructor that it's OK to proceed with destruction. In