From 32651f97c5e063a33fe1da8f79c2028f862998e3 Mon Sep 17 00:00:00 2001
From: leftgeek <1094669802@qq.com>
Date: Thu, 15 Jun 2023 07:42:24 +0000
Subject: [PATCH] Modify error code in table load coordinator

---
 .../table_load/ob_table_load_coordinator.cpp  | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/observer/table_load/ob_table_load_coordinator.cpp b/src/observer/table_load/ob_table_load_coordinator.cpp
index eb2c78c1b..ad50efd76 100644
--- a/src/observer/table_load/ob_table_load_coordinator.cpp
+++ b/src/observer/table_load/ob_table_load_coordinator.cpp
@@ -238,26 +238,24 @@ int ObTableLoadCoordinator::pre_begin_peers()
       //目前源表和目标表的分区信息连同每个分区的地址都完全一样
       const ObAddr &addr = leader_info.addr_;
       if (OB_UNLIKELY(leader_info.addr_ != target_leader_info.addr_)) {
-        ret = OB_ERR_UNEXPECTED;
-        LOG_WARN("addr must be same", K(leader_info.addr_), K(target_leader_info.addr_), KR(ret));
-      } else {
-        request.partition_id_array_ = leader_info.partition_id_array_;
-        request.target_partition_id_array_ = target_leader_info.partition_id_array_;
-        if (ObTableLoadUtils::is_local_addr(addr)) { // 本机
-          if (OB_FAIL(ObTableLoadStore::init_ctx(ctx_, request.partition_id_array_,
-                                                 request.target_partition_id_array_))) {
-            LOG_WARN("fail to store init ctx", KR(ret));
-          } else {
-            ObTableLoadStore store(ctx_);
-            if (OB_FAIL(store.init())) {
-              LOG_WARN("fail to init store", KR(ret));
-            } else if (OB_FAIL(store.pre_begin())) {
-              LOG_WARN("fail to store pre begin", KR(ret));
-            }
+        LOG_INFO("addr must be same", K(leader_info.addr_), K(target_leader_info.addr_));
+      }
+      request.partition_id_array_ = leader_info.partition_id_array_;
+      request.target_partition_id_array_ = target_leader_info.partition_id_array_;
+      if (ObTableLoadUtils::is_local_addr(addr)) { // 本机
+        if (OB_FAIL(ObTableLoadStore::init_ctx(ctx_, request.partition_id_array_,
+                                                request.target_partition_id_array_))) {
+          LOG_WARN("fail to store init ctx", KR(ret));
+        } else {
+          ObTableLoadStore store(ctx_);
+          if (OB_FAIL(store.init())) {
+            LOG_WARN("fail to init store", KR(ret));
+          } else if (OB_FAIL(store.pre_begin())) {
+            LOG_WARN("fail to store pre begin", KR(ret));
           }
-        } else { // 对端, 发送rpc
-          TABLE_LOAD_RPC_CALL(load_pre_begin_peer, addr, request, result);
         }
+      } else { // 对端, 发送rpc
+        TABLE_LOAD_RPC_CALL(load_pre_begin_peer, addr, request, result);
       }
     }
   }