diff --git a/db/error_handler_fs_test.cc b/db/error_handler_fs_test.cc index 3283ffcf0..c01273819 100644 --- a/db/error_handler_fs_test.cc +++ b/db/error_handler_fs_test.cc @@ -90,13 +90,6 @@ class ErrorHandlerFSListener : public EventListener { } } - void OnErrorRecoveryCompleted(Status old_bg_error) override { - InstrumentedMutexLock l(&mutex_); - recovery_complete_ = true; - cv_.SignalAll(); - old_bg_error.PermitUncheckedError(); - } - void OnErrorRecoveryEnd(const BackgroundErrorRecoveryInfo& info) override { InstrumentedMutexLock l(&mutex_); recovery_complete_ = true; diff --git a/include/rocksdb/listener.h b/include/rocksdb/listener.h index 1ffbc73a4..cf54e1248 100644 --- a/include/rocksdb/listener.h +++ b/include/rocksdb/listener.h @@ -706,7 +706,9 @@ class EventListener : public Customizable { // is recovered from read-only mode after an error. When this is called, it // means normal writes to the database can be issued and the user can // initiate any further recovery actions needed - virtual void OnErrorRecoveryCompleted(Status /* old_bg_error */) {} + virtual void OnErrorRecoveryCompleted(Status old_bg_error) { + old_bg_error.PermitUncheckedError(); + } // A callback function for RocksDB which will be called once the recovery // attempt from a background retryable error is completed. The recovery