remove balance_blacklist
This commit is contained in:
@ -353,7 +353,7 @@ int ObAlterLocalityChecker::check_partition_entity_locality_distribution(
|
|||||||
int ret = OB_SUCCESS;
|
int ret = OB_SUCCESS;
|
||||||
ObArenaAllocator allocator;
|
ObArenaAllocator allocator;
|
||||||
ObTablePartitionIterator iter;
|
ObTablePartitionIterator iter;
|
||||||
const bool need_fetch_faillist = true;
|
const bool need_fetch_faillist = false;
|
||||||
iter.set_need_fetch_faillist(need_fetch_faillist);
|
iter.set_need_fetch_faillist(need_fetch_faillist);
|
||||||
ObReplicaFilterHolder partition_filter;
|
ObReplicaFilterHolder partition_filter;
|
||||||
if (OB_FAIL(partition_filter.set_replica_status(REPLICA_STATUS_NORMAL))) {
|
if (OB_FAIL(partition_filter.set_replica_status(REPLICA_STATUS_NORMAL))) {
|
||||||
|
|||||||
@ -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 schema_full_replica_cnt = 0;
|
||||||
int64_t paxos_replica_num = 0;
|
int64_t paxos_replica_num = 0;
|
||||||
share::ObTablePartitionIterator iter;
|
share::ObTablePartitionIterator iter;
|
||||||
const bool need_fetch_faillist = true;
|
const bool need_fetch_faillist = false;
|
||||||
iter.set_need_fetch_faillist(need_fetch_faillist);
|
iter.set_need_fetch_faillist(need_fetch_faillist);
|
||||||
if (OB_FAIL(check_stop())) {
|
if (OB_FAIL(check_stop())) {
|
||||||
RS_LOG(WARN, "balancer stop", K(ret));
|
RS_LOG(WARN, "balancer stop", K(ret));
|
||||||
|
|||||||
@ -313,7 +313,7 @@ public:
|
|||||||
virtual ObRebalanceTaskType get_rebalance_task_type() const = 0;
|
virtual ObRebalanceTaskType get_rebalance_task_type() const = 0;
|
||||||
virtual bool need_process_failed_task() const
|
virtual bool need_process_failed_task() const
|
||||||
{
|
{
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
/* rebalance task mgr related virtual interface
|
/* rebalance task mgr related virtual interface
|
||||||
*/
|
*/
|
||||||
@ -1863,7 +1863,7 @@ public:
|
|||||||
UNUSED(curr_leader);
|
UNUSED(curr_leader);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
/* all_virtual_rebalance_task_stat虚接口
|
/* all_virtual_rebalance_task_stat virtual interface
|
||||||
*/
|
*/
|
||||||
virtual int get_virtual_rebalance_task_stat_info(
|
virtual int get_virtual_rebalance_task_stat_info(
|
||||||
common::ObAddr& src, common::ObAddr& data_src, common::ObAddr& dest, common::ObAddr& offline) const override;
|
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);
|
const bool tenant_dropped, const char* comment);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/* general虚接口
|
/* general virtual interface
|
||||||
*/
|
*/
|
||||||
virtual int get_timeout(const int64_t network_bandwidth, const int64_t server_concurrency_limit,
|
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;
|
const int64_t min_task_timeout_us, int64_t& timeout_us) const override;
|
||||||
@ -3258,7 +3258,7 @@ public:
|
|||||||
}
|
}
|
||||||
return ptr;
|
return ptr;
|
||||||
}
|
}
|
||||||
/* rebalance task mgr相关虚接口
|
/* rebalance task mgr relation virtual interface
|
||||||
*/
|
*/
|
||||||
virtual bool skip_put_to_queue() const override
|
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 int clone(void* input_ptr, ObRebalanceTask*& out_task) const override;
|
||||||
virtual void notify_cancel() 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 check_before_execute(share::ObPartitionTableOperator& pt_operator, common::ObAddr& leader) const override;
|
||||||
virtual int execute(obrpc::ObSrvRpcProxy& rpc_proxy, const common::ObAddr& dummy_leader,
|
virtual int execute(obrpc::ObSrvRpcProxy& rpc_proxy, const common::ObAddr& dummy_leader,
|
||||||
|
|||||||
@ -1385,10 +1385,6 @@ int ObRebalanceTaskMgr::add_task(const ObRebalanceTask& task)
|
|||||||
if (OB_SUCCESS != (tmp_ret = log_task_result(task, rc_array))) {
|
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));
|
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 {
|
} else {
|
||||||
ObThreadCondGuard guard(cond_);
|
ObThreadCondGuard guard(cond_);
|
||||||
|
|
||||||
@ -1531,16 +1527,10 @@ int ObRebalanceTaskMgr::do_execute_over(
|
|||||||
if (OB_SUCCESS != (log_ret = log_task_result(*task, rc_array))) {
|
if (OB_SUCCESS != (log_ret = log_task_result(*task, rc_array))) {
|
||||||
LOG_WARN("log task result failed", K(ret), K(log_ret));
|
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 {
|
} else {
|
||||||
if (OB_SUCCESS != (log_ret = log_task_result(input_task, rc_array))) {
|
if (OB_SUCCESS != (log_ret = log_task_result(input_task, rc_array))) {
|
||||||
LOG_WARN("log task result failed", K(ret), K(log_ret));
|
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()) {
|
if (NULL != balancer_ && balancer_->is_inited() && !balancer_->is_stop()) {
|
||||||
|
|||||||
@ -629,7 +629,7 @@ int ObShrinkResourcePoolChecker::check_single_partition_entity_finished(
|
|||||||
} else {
|
} else {
|
||||||
ObArenaAllocator allocator;
|
ObArenaAllocator allocator;
|
||||||
ObTablePartitionIterator iter;
|
ObTablePartitionIterator iter;
|
||||||
const bool need_fetch_faillist = true;
|
const bool need_fetch_faillist = false;
|
||||||
iter.set_need_fetch_faillist(need_fetch_faillist);
|
iter.set_need_fetch_faillist(need_fetch_faillist);
|
||||||
ObReplicaFilterHolder partition_filter;
|
ObReplicaFilterHolder partition_filter;
|
||||||
if (OB_FAIL(partition_filter.set_replica_status(REPLICA_STATUS_NORMAL))) {
|
if (OB_FAIL(partition_filter.set_replica_status(REPLICA_STATUS_NORMAL))) {
|
||||||
|
|||||||
Reference in New Issue
Block a user