hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove balance_blacklist

Browse Source
This commit is contained in:
maosy
2022-03-09 20:34:16 +08:00
committed by LINxiansheng
parent dda1e1300c
commit 2e21515a30
5 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rootserver/ob_alter_locality_checker.cpp
View File

@ -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))) {

2
src/rootserver/ob_balance_info.h
View File

@ -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));

10
src/rootserver/ob_rebalance_task.h
View File

@ -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,

10
src/rootserver/ob_rebalance_task_mgr.cpp
View File

@ -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()) {

2
src/rootserver/ob_shrink_resource_pool_checker.cpp
View File

@ -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))) {