From 2e21515a30ab329ed8cc1b412b1b283261d157ba Mon Sep 17 00:00:00 2001
From: maosy <630014370@qq.com>
Date: Wed, 9 Mar 2022 20:34:16 +0800
Subject: [PATCH] remove balance_blacklist

---
 src/rootserver/ob_alter_locality_checker.cpp       |  2 +-
 src/rootserver/ob_balance_info.h                   |  2 +-
 src/rootserver/ob_rebalance_task.h                 | 10 +++++-----
 src/rootserver/ob_rebalance_task_mgr.cpp           | 10 ----------
 src/rootserver/ob_shrink_resource_pool_checker.cpp |  2 +-
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/rootserver/ob_alter_locality_checker.cpp b/src/rootserver/ob_alter_locality_checker.cpp
index 8798568703..faf7595730 100644
--- a/src/rootserver/ob_alter_locality_checker.cpp
+++ b/src/rootserver/ob_alter_locality_checker.cpp
@@ -353,7 +353,7 @@ int ObAlterLocalityChecker::check_partition_entity_locality_distribution(
   int ret = OB_SUCCESS;
   ObArenaAllocator allocator;
   ObTablePartitionIterator iter;
-  const bool need_fetch_faillist = true;
+  const bool need_fetch_faillist = false;
   iter.set_need_fetch_faillist(need_fetch_faillist);
   ObReplicaFilterHolder partition_filter;
   if (OB_FAIL(partition_filter.set_replica_status(REPLICA_STATUS_NORMAL))) {
diff --git a/src/rootserver/ob_balance_info.h b/src/rootserver/ob_balance_info.h
index f126d906e1..ae0d6e22e6 100644
--- a/src/rootserver/ob_balance_info.h
+++ b/src/rootserver/ob_balance_info.h
@@ -1214,7 +1214,7 @@ int TenantBalanceStat::fill_partition_entity(const uint64_t schema_id, const SCH
   int64_t schema_full_replica_cnt = 0;
   int64_t paxos_replica_num = 0;
   share::ObTablePartitionIterator iter;
-  const bool need_fetch_faillist = true;
+  const bool need_fetch_faillist = false;
   iter.set_need_fetch_faillist(need_fetch_faillist);
   if (OB_FAIL(check_stop())) {
     RS_LOG(WARN, "balancer stop", K(ret));
diff --git a/src/rootserver/ob_rebalance_task.h b/src/rootserver/ob_rebalance_task.h
index c153f4dca6..055ab85c33 100644
--- a/src/rootserver/ob_rebalance_task.h
+++ b/src/rootserver/ob_rebalance_task.h
@@ -313,7 +313,7 @@ public:
   virtual ObRebalanceTaskType get_rebalance_task_type() const = 0;
   virtual bool need_process_failed_task() const
   {
-    return true;
+    return false;
   }
   /* rebalance task mgr related virtual interface
    */
@@ -1863,7 +1863,7 @@ public:
     UNUSED(curr_leader);
     return true;
   }
-  /* all_virtual_rebalance_task_stat虚接口
+  /* all_virtual_rebalance_task_stat virtual interface 
    */
   virtual int get_virtual_rebalance_task_stat_info(
       common::ObAddr& src, common::ObAddr& data_src, common::ObAddr& dest, common::ObAddr& offline) const override;
@@ -3230,7 +3230,7 @@ public:
       const bool tenant_dropped, const char* comment);
 
 public:
-  /* general虚接口
+  /* general virtual interface
    */
   virtual int get_timeout(const int64_t network_bandwidth, const int64_t server_concurrency_limit,
       const int64_t min_task_timeout_us, int64_t& timeout_us) const override;
@@ -3258,7 +3258,7 @@ public:
     }
     return ptr;
   }
-  /* rebalance task mgr相关虚接口
+  /* rebalance task mgr relation virtual interface
    */
   virtual bool skip_put_to_queue() const override
   {
@@ -3273,7 +3273,7 @@ public:
   virtual int clone(void* input_ptr, ObRebalanceTask*& out_task) const override;
   virtual void notify_cancel() const override
   {}
-  /* rebalance task executor虚接口implement
+  /* rebalance task executor virtual interface implement
    */
   virtual int check_before_execute(share::ObPartitionTableOperator& pt_operator, common::ObAddr& leader) const override;
   virtual int execute(obrpc::ObSrvRpcProxy& rpc_proxy, const common::ObAddr& dummy_leader,
diff --git a/src/rootserver/ob_rebalance_task_mgr.cpp b/src/rootserver/ob_rebalance_task_mgr.cpp
index 1da5932fdf..3ee05ce7ae 100644
--- a/src/rootserver/ob_rebalance_task_mgr.cpp
+++ b/src/rootserver/ob_rebalance_task_mgr.cpp
@@ -1385,10 +1385,6 @@ int ObRebalanceTaskMgr::add_task(const ObRebalanceTask& task)
     if (OB_SUCCESS != (tmp_ret = log_task_result(task, rc_array))) {
       LOG_WARN("fail to log task result", K(ret), K(tmp_ret), K(task));
     }
-    if (OB_SUCCESS != (tmp_ret = process_failed_task(task, rc_array))) {
-      LOG_WARN("fail to process failed task", K(ret), K(task));
-    } else {
-    }  // no more to do
   } else {
     ObThreadCondGuard guard(cond_);
 
@@ -1531,16 +1527,10 @@ int ObRebalanceTaskMgr::do_execute_over(
     if (OB_SUCCESS != (log_ret = log_task_result(*task, rc_array))) {
       LOG_WARN("log task result failed", K(ret), K(log_ret));
     }
-    if (OB_SUCCESS != (log_ret = process_failed_task(*task, rc_array))) {
-      LOG_WARN("failed to process task", K(log_ret), K(*task));
-    }
   } else {
     if (OB_SUCCESS != (log_ret = log_task_result(input_task, rc_array))) {
       LOG_WARN("log task result failed", K(ret), K(log_ret));
     }
-    if (OB_SUCCESS != (log_ret = process_failed_task(input_task, rc_array))) {
-      LOG_WARN("failed to process task", K(log_ret), K(input_task));
-    }
   }
 
   if (NULL != balancer_ && balancer_->is_inited() && !balancer_->is_stop()) {
diff --git a/src/rootserver/ob_shrink_resource_pool_checker.cpp b/src/rootserver/ob_shrink_resource_pool_checker.cpp
index febbd22caa..6884bdc55f 100644
--- a/src/rootserver/ob_shrink_resource_pool_checker.cpp
+++ b/src/rootserver/ob_shrink_resource_pool_checker.cpp
@@ -629,7 +629,7 @@ int ObShrinkResourcePoolChecker::check_single_partition_entity_finished(
   } else {
     ObArenaAllocator allocator;
     ObTablePartitionIterator iter;
-    const bool need_fetch_faillist = true;
+    const bool need_fetch_faillist = false;
     iter.set_need_fetch_faillist(need_fetch_faillist);
     ObReplicaFilterHolder partition_filter;
     if (OB_FAIL(partition_filter.set_replica_status(REPLICA_STATUS_NORMAL))) {