From 44133225dc4c53a310c14290fa2d2627dcda1114 Mon Sep 17 00:00:00 2001 From: wxhwang Date: Wed, 7 Feb 2024 12:24:20 +0000 Subject: [PATCH] fix restore minor failed --- .../backup/ob_backup_data_set_task_mgr.cpp | 19 +++++++++++++++++-- src/share/ob_debug_sync_point.h | 1 + .../ob_storage_ha_tablet_builder.cpp | 4 ---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/rootserver/backup/ob_backup_data_set_task_mgr.cpp b/src/rootserver/backup/ob_backup_data_set_task_mgr.cpp index 722548a5b..0c51857c2 100644 --- a/src/rootserver/backup/ob_backup_data_set_task_mgr.cpp +++ b/src/rootserver/backup/ob_backup_data_set_task_mgr.cpp @@ -491,7 +491,14 @@ int ObBackupSetTaskMgr::backup_user_meta_() } else if (OB_FAIL(do_backup_root_key_())) { LOG_WARN("[DATA_BACKUP]failed to do backup root key", K(ret)); } else if (ls_task.count() == finish_cnt) { - ROOTSERVICE_EVENT_ADD("backup_data", "before_backup_data"); + ROOTSERVICE_EVENT_ADD("backup_data", + "before_backup_data", + "tenant_id", + job_attr_->tenant_id_, + "job_id", + job_attr_->job_id_, + "task_id", + set_task_attr_.task_id_); share::SCN consistent_scn; bool need_change_meta_turn = false; if (OB_FAIL(check_need_change_meta_turn_(ls_task, need_change_meta_turn))) { @@ -542,6 +549,7 @@ int ObBackupSetTaskMgr::calc_consistent_scn_(ObIArray { int ret = OB_SUCCESS; consistent_scn.set_min(); + DEBUG_SYNC(BEFORE_CALC_CONSISTENT_SCN); // let consistent_scn be the biggest max_tablet_checkpoint_scn_ of all the ls and the cur gts. if (OB_FAIL(ObBackupDataScheduler::get_backup_scn(*sql_proxy_, job_attr_->tenant_id_, true, consistent_scn))) { LOG_WARN("failed to get backup scn", K(ret), "tenant_id", job_attr_->tenant_id_); @@ -737,7 +745,14 @@ int ObBackupSetTaskMgr::merge_tablet_to_ls_info_(const share::SCN &consistent_sc } else if (OB_FAIL(generate_ls_tasks_(ls_ids, type))) { LOG_WARN("failed to generate ls tasks", K(ret), K(ls_ids), K(type)); } else { - ROOTSERVICE_EVENT_ADD("backup_data", "after_backup_consistent_scn"); + ROOTSERVICE_EVENT_ADD("backup_data", + "after_backup_consistent_scn", + "tenant_id", + job_attr_->tenant_id_, + "job_id", + job_attr_->job_id_, + "task_id", + set_task_attr_.task_id_); } if (trans_.is_started()) { int tmp_ret = OB_SUCCESS; diff --git a/src/share/ob_debug_sync_point.h b/src/share/ob_debug_sync_point.h index b017e926f..d91d4d68f 100755 --- a/src/share/ob_debug_sync_point.h +++ b/src/share/ob_debug_sync_point.h @@ -566,6 +566,7 @@ class ObString; ACT(BEFORE_SEND_PARALLEL_CREATE_TABLE,)\ ACT(BEFORE_DROP_TENANT,)\ ACT(BEFORE_WAIT_SYS_LS_END_SCN,)\ + ACT(BEFORE_CALC_CONSISTENT_SCN,)\ ACT(MAX_DEBUG_SYNC_POINT,) DECLARE_ENUM(ObDebugSyncPoint, debug_sync_point, OB_DEBUG_SYNC_POINT_DEF); diff --git a/src/storage/high_availability/ob_storage_ha_tablet_builder.cpp b/src/storage/high_availability/ob_storage_ha_tablet_builder.cpp index cee20e45a..7e4ab8e45 100644 --- a/src/storage/high_availability/ob_storage_ha_tablet_builder.cpp +++ b/src/storage/high_availability/ob_storage_ha_tablet_builder.cpp @@ -2812,10 +2812,6 @@ int ObStorageHATabletBuilderUtil::check_need_merge_tablet_meta_( need_merge = true; } else if (tablet->get_tablet_meta().clog_checkpoint_scn_ >= src_tablet_meta->clog_checkpoint_scn_) { need_merge = false; - } else if (OB_FAIL(check_remote_logical_sstable_exist(tablet, is_exist))) { - LOG_WARN("failed to check remote logical sstable exist", K(ret), KPC(tablet)); - } else if (!is_exist) { - need_merge = false; } else { need_merge = true; }