remvoe unnecessary syncpoint

facebook · Oct 31, 2023 · e11f6d8 · e11f6d8
1 parent 05b26ca
commit e11f6d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/db/error_handler.cc b/db/error_handler.cc
@@ -764,8 +764,6 @@ void ErrorHandler::RecoverFromRetryableBGIOError() {
           RecordInHistogram(bg_error_stats_.get(),
                             ERROR_HANDLER_AUTORESUME_RETRY_COUNT, retry_count);
         }
-        TEST_SYNC_POINT(
-            "RecoverFromRetryableBGIOError:RecoverSuccessBeforeReturn");
         return;
       } else {
         // In this case: 1) recovery_error_ is more serious or not retryable

diff --git a/db/error_handler_fs_test.cc b/db/error_handler_fs_test.cc
@@ -1863,7 +1863,7 @@ TEST_F(DBErrorHandlingFSTest, MultipleRecoveryThreads) {
         "NotifyOnErrorRecoveryEnd:MutexUnlocked:2"},
        {"StartRecoverFromRetryableBGIOError:BeforeWaitingForOtherThread",
         "MultipleRecoveryThreads:3"},
-       {"RecoverFromRetryableBGIOError:RecoverSuccessBeforeReturn",
+       {"RecoverFromRetryableBGIOError:RecoverSuccess",
         "MultipleRecoveryThreads:4"},
        {"MultipleRecoveryThreads:5",
         "StartRecoverFromRetryableBGIOError:AfterWaitingForOtherThread"}});
@@ -1904,7 +1904,7 @@ TEST_F(DBErrorHandlingFSTest, MultipleRecoveryThreads) {
 
   // Set up sync point so that we can wait for the recovery thread to finish
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
-      {{"RecoverFromRetryableBGIOError:RecoverSuccessBeforeReturn",
+      {{"RecoverFromRetryableBGIOError:RecoverSuccess",
         "MultipleRecoveryThreads:6"}});
 
   // Wait for the second thread's recovery to be done