From 84e0aa0cfc0db3f06d9d88c9f5d49eed9bf89a3b Mon Sep 17 00:00:00 2001
From: obdev <obdev@oceanbase.com>
Date: Sat, 28 Jan 2023 20:25:18 +0800
Subject: [PATCH] fix fetch log print core

---
 .../restoreservice/ob_remote_fetch_log_worker.cpp     | 11 ++++++-----
 src/share/ob_debug_sync_point.h                       |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/logservice/restoreservice/ob_remote_fetch_log_worker.cpp b/src/logservice/restoreservice/ob_remote_fetch_log_worker.cpp
index db5081f23b..206cd2e9e1 100644
--- a/src/logservice/restoreservice/ob_remote_fetch_log_worker.cpp
+++ b/src/logservice/restoreservice/ob_remote_fetch_log_worker.cpp
@@ -171,7 +171,7 @@ int ObRemoteFetchWorker::submit_fetch_log_task(ObFetchLogTask *task)
   } else if (OB_FAIL(task_queue_.push(task))) {
     LOG_WARN("push task failed", K(ret), KPC(task));
   } else {
-    LOG_TRACE("submit_fetch_log_task succ", KPC(task));
+    LOG_TRACE("submit_fetch_log_task succ", KP(task));
   }
   return ret;
 }
@@ -256,9 +256,9 @@ int ObRemoteFetchWorker::handle_single_task_()
   } else {
     ObFetchLogTask *task = static_cast<ObFetchLogTask *>(data);
     ObLSID id = task->id_;
-    // after
+    // after task handle, DON'T print it any more
     if (OB_FAIL(handle_fetch_log_task_(task))) {
-      LOG_WARN("handle fetch log task failed", K(ret), KPC(task));
+      LOG_WARN("handle fetch log task failed", K(ret), KP(task), K(id));
     }
 
     // only fatal error report fail, retry with others
@@ -306,7 +306,7 @@ int ObRemoteFetchWorker::handle_fetch_log_task_(ObFetchLogTask *task)
     int tmp_ret = OB_SUCCESS;
     task->iter_.update_source_cb();
     if (OB_SUCCESS != (tmp_ret = try_retire_(task))) {
-      LOG_WARN("retire task failed", K(tmp_ret), KPC(task));
+      LOG_WARN("retire task failed", K(tmp_ret), KP(task));
     }
   }
 
@@ -409,6 +409,7 @@ int ObRemoteFetchWorker::push_submit_array_(ObFetchLogTask &task)
 {
   int ret = OB_SUCCESS;
   const ObLSID &id = task.id_;
+  DEBUG_SYNC(BEFORE_RESTORE_SERVICE_PUSH_FETCH_DATA);
   GET_RESTORE_HANDLER_CTX(id) {
     if (OB_FAIL(restore_handler->submit_sorted_task(task))) {
       LOG_WARN("submit sort task failed", K(ret), K(task));
@@ -496,7 +497,7 @@ int ObRemoteFetchWorker::foreach_ls_(const ObLSID &id)
         int tmp_ret = OB_SUCCESS;
         task->iter_.update_source_cb();
         if (OB_SUCCESS != (tmp_ret = try_retire_(task))) {
-          LOG_WARN("retire task failed", K(tmp_ret), KPC(task));
+          LOG_WARN("retire task failed", K(tmp_ret), KP(task));
         }
       }
     }
diff --git a/src/share/ob_debug_sync_point.h b/src/share/ob_debug_sync_point.h
index 66f32183b0..fdba5e78fe 100644
--- a/src/share/ob_debug_sync_point.h
+++ b/src/share/ob_debug_sync_point.h
@@ -444,6 +444,7 @@ class ObString;
     ACT(BEFORE_SET_LS_MEMBER_LIST,)\
     ACT(BEFORE_MIGRATION_FETCH_TABLET_INFO,)\
     ACT(BEFORE_BUILD_TABLET_GROUP_INFO,)\
+    ACT(BEFORE_RESTORE_SERVICE_PUSH_FETCH_DATA,)\
     ACT(MAX_DEBUG_SYNC_POINT,)
 
 DECLARE_ENUM(ObDebugSyncPoint, debug_sync_point, OB_DEBUG_SYNC_POINT_DEF);