fix

hx235 · Jul 15, 2024 · 36aabb5 · 36aabb5
1 parent 755010f
commit 36aabb5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/db/error_handler.cc b/db/error_handler.cc
@@ -423,10 +423,6 @@ void ErrorHandler::SetBGError(const Status& bg_status,
     // IO error as hard error. Note that, all the NoSpace error should be
     // handled by the SstFileManager::StartErrorRecovery(). Therefore, no matter
     // it is retryable or file scope, this logic will be bypassed.
-    bool auto_recovery = false;
-    EventHelpers::NotifyOnBackgroundError(db_options_.listeners, reason,
-                                          &new_bg_io_err, db_mutex_,
-                                          &auto_recovery);
 
     RecordStats({ERROR_HANDLER_BG_RETRYABLE_IO_ERROR_COUNT},
                 {} /* int_histograms */);
@@ -442,6 +438,10 @@ void ErrorHandler::SetBGError(const Status& bg_status,
       ROCKS_LOG_INFO(
           db_options_.info_log,
           "ErrorHandler: Compaction will schedule by itself to resume\n");
+      bool auto_recovery = false;
+      EventHelpers::NotifyOnBackgroundError(db_options_.listeners, reason,
+                                            &new_bg_io_err, db_mutex_,
+                                            &auto_recovery);
       // Not used in this code path.
       new_bg_io_err.PermitUncheckedError();
       return;
@@ -466,10 +466,13 @@ void ErrorHandler::SetBGError(const Status& bg_status,
     Status bg_err(new_bg_io_err, severity);
     CheckAndSetRecoveryAndBGError(bg_err);
     recover_context_ = context;
+    bool auto_recovery = db_options_.max_bgerror_resume_count > 0;
+    EventHelpers::NotifyOnBackgroundError(db_options_.listeners, reason,
+                                          &new_bg_io_err, db_mutex_,
+                                          &auto_recovery);
     StartRecoverFromRetryableBGIOError(bg_io_err);
     return;
   }
-
   HandleKnownErrors(new_bg_io_err, reason);
 }
 

diff --git a/db_stress_tool/db_stress_listener.h b/db_stress_tool/db_stress_listener.h
@@ -289,7 +289,8 @@ class DbStressListener : public EventListener {
     }
   }
 
-  void OnErrorRecoveryCompleted(Status /* old_bg_error */) override {
+  void OnErrorRecoveryEnd(
+      const BackgroundErrorRecoveryInfo& /*info*/) override {
     RandomSleep();
     if (FLAGS_error_recovery_with_no_fault_injection && fault_fs_guard) {
       fault_fs_guard->EnableThreadLocalErrorInjection(

diff --git a/unreleased_history/bug_fixes/event_listener_not_called.md b/unreleased_history/bug_fixes/event_listener_not_called.md
@@ -0,0 +1 @@
+Fixed a bug where `OnErrorRecoveryBegin()` is not called before auto recovery starts.