From e11f6d89da2d12edb4c245f820661e28510fb429 Mon Sep 17 00:00:00 2001
From: Jay Huh <jewoongh@meta.com>
Date: Mon, 30 Oct 2023 10:13:47 -0700
Subject: [PATCH] remvoe unnecessary syncpoint

---
 db/error_handler.cc         | 2 --
 db/error_handler_fs_test.cc | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/db/error_handler.cc b/db/error_handler.cc
index 43d01a71ef45..344db308f4ae 100644
--- 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
index 19c1deb4b94e..7f8cabb248fe 100644
--- 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