From b73efa85aeeee1215b4fc7f8f0957b4b5dd0fd1a Mon Sep 17 00:00:00 2001
From: obdev <obdev@oceanbase.com>
Date: Tue, 25 Oct 2022 19:49:39 +0800
Subject: [PATCH] Fix migration some bugs

---
 src/storage/high_availability/ob_physical_copy_task.cpp | 6 +++++-
 src/storage/ls/ob_ls_meta.cpp                           | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/storage/high_availability/ob_physical_copy_task.cpp b/src/storage/high_availability/ob_physical_copy_task.cpp
index 05c636ea37..e666dfa708 100644
--- a/src/storage/high_availability/ob_physical_copy_task.cpp
+++ b/src/storage/high_availability/ob_physical_copy_task.cpp
@@ -197,7 +197,7 @@ int ObPhysicalCopyTask::process()
     ret = OB_NOT_INIT;
     LOG_WARN("physical copy task do not init", K(ret));
   } else if (copy_ctx_->ha_dag_->get_ha_dag_net_ctx()->is_failed()) {
-    //do nothing
+    FLOG_INFO("ha dag net is already failed, skip physical copy task", KPC(copy_ctx_));
   } else {
     if (copy_ctx_->tablet_id_.is_inner_tablet() || copy_ctx_->tablet_id_.is_ls_inner_tablet()) {
     } else {
@@ -635,6 +635,8 @@ int ObPhysicalCopyFinishTask::process()
   if (!is_inited_) {
     ret = OB_NOT_INIT;
     LOG_WARN("physical copy finish task do not init", K(ret));
+  } else if (copy_ctx_.ha_dag_->get_ha_dag_net_ctx()->is_failed()) {
+    FLOG_INFO("ha dag net is already failed, skip physical copy finish task", K(copy_ctx_));
   } else if (OB_FAIL(create_sstable_())) {
     LOG_WARN("failed to create sstable", K(ret), K(copy_ctx_));
   } else if (OB_FAIL(check_sstable_valid_())) {
@@ -1104,6 +1106,8 @@ int ObTabletCopyFinishTask::process()
   if (!is_inited_) {
     ret = OB_NOT_INIT;
     LOG_WARN("tablet copy finish task do not init", K(ret));
+  } else if (ha_dag_->get_ha_dag_net_ctx()->is_failed()) {
+    FLOG_INFO("ha dag net is already failed, skip physical copy finish task", K(tablet_id_), KPC(ha_dag_));
   } else if (OB_FAIL(create_new_table_store_())) {
     LOG_WARN("failed to create new table store", K(ret), K(tablet_id_));
   } else if (OB_FAIL(update_tablet_data_status_())) {
diff --git a/src/storage/ls/ob_ls_meta.cpp b/src/storage/ls/ob_ls_meta.cpp
index 4c1cfa311a..1cb3027416 100644
--- a/src/storage/ls/ob_ls_meta.cpp
+++ b/src/storage/ls/ob_ls_meta.cpp
@@ -403,6 +403,7 @@ int ObLSMeta::update_ls_meta(
       tmp.clog_checkpoint_ts_ = src_ls_meta.clog_checkpoint_ts_;
       tmp.replayable_point_ = src_ls_meta.replayable_point_;
       tmp.tablet_change_checkpoint_ts_ = src_ls_meta.tablet_change_checkpoint_ts_;
+      tmp.rebuild_seq_++;
       if (update_restore_status) {
         tmp.restore_status_ = ls_restore_status;
       }
-- 
GitLab