fix dropping column family bug

Summary: 1. db/db_impl.cc:2324 (DBImpl::BackgroundCompaction) should not raise bg_error_ when column family is dropped during compaction.

Test Plan: 1. db_stress

Reviewers: ljin, yhchiang, dhruba, igor, sdong

Reviewed By: igor

Subscribers: leveldb

Differential Revision: https://reviews.facebook.net/D22653

diff --git a/db/db_impl.cc b/db/db_impl.cc
index 9900ff2bbd87847885fde7a9cf4ce3291375cf94..f41d1d05d490b4faea5224574ba7fe3b05997044 100644 (file)
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -2321,7 +2321,7 @@ Status DBImpl::BackgroundCompaction(bool* madeProgress,
 
   if (status.ok()) {
     // Done
-  } else if (shutting_down_.Acquire_Load()) {
+  } else if (status.IsShutdownInProgress()) {
     // Ignore compaction errors found during shutting down
   } else {
     Log(InfoLogLevel::WARN_LEVEL, options_.info_log, "Compaction error: %s",

diff --git a/include/rocksdb/status.h b/include/rocksdb/status.h
index b20689a77c2c76020ec7d1ce696d4b8d9b0bfe69..d13ff9d81f0e03885bb32f2867ce106199c6c31b 100644 (file)
--- a/include/rocksdb/status.h
+++ b/include/rocksdb/status.h
@@ -96,7 +96,7 @@ class Status {
   // Returns true iff the status indicates Incomplete
   bool IsIncomplete() const { return code() == kIncomplete; }
 
-  // Returns true iff the status indicates Incomplete
+  // Returns true iff the status indicates Shutdown In progress
   bool IsShutdownInProgress() const { return code() == kShutdownInProgress; }
 
   bool IsTimedOut() const { return code() == kTimedOut; }