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

Reduce log and increase timeout for balance task

Browse Source
This commit is contained in:
ZhenNan0
2023-07-07 02:42:44 +00:00
committed by ob-robot
parent 3ffff7efcd
commit bf2c1bcc06
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rootserver/balance/ob_ls_all_part_builder.cpp
View File

@ -127,7 +127,7 @@ int ObLSAllPartBuilder::build_part_info_(
ret = OB_NEED_RETRY; ret = OB_NEED_RETRY;
LOG_WARN("table schema is NULL, maybe schema guard is not latest, retry again", KR(ret), K(tablet)); LOG_WARN("table schema is NULL, maybe schema guard is not latest, retry again", KR(ret), K(tablet));
} else if (! need_balance_table(*table_schema)) { } else if (! need_balance_table(*table_schema)) {
LOG_INFO("[BUILD_LS_ALL_PART] ignore need not balance table", K(tablet), KPC(table_schema)); LOG_TRACE("[BUILD_LS_ALL_PART] ignore need not balance table", K(tablet));
need_skip = true; need_skip = true;
} else { } else {
const ObTabletID &tablet_id = tablet.get_tablet_id(); const ObTabletID &tablet_id = tablet.get_tablet_id();

3
src/rootserver/ob_balance_task_execute_service.cpp
View File

@ -336,10 +336,11 @@ int ObBalanceTaskExecuteService::execute_task_()
const ObBalanceTaskID task_id = task.get_balance_task_id(); const ObBalanceTaskID task_id = task.get_balance_task_id();
ObBalanceTask task_in_trans;//for update ObBalanceTask task_in_trans;//for update
ObTimeoutCtx timeout_ctx; ObTimeoutCtx timeout_ctx;
const int64_t balance_task_execute_timeout = GCONF.internal_sql_execute_timeout + 100 * 1000 * 1000L; // +100s
DEBUG_SYNC(BEFORE_EXECUTE_BALANCE_TASK); DEBUG_SYNC(BEFORE_EXECUTE_BALANCE_TASK);
if (OB_FAIL(trans.start(sql_proxy_, tenant_id_))) { if (OB_FAIL(trans.start(sql_proxy_, tenant_id_))) {
LOG_WARN("failed to start trans", KR(ret), K(tenant_id_)); LOG_WARN("failed to start trans", KR(ret), K(tenant_id_));
} else if (OB_FAIL(ObShareUtil::set_default_timeout_ctx(timeout_ctx, GCONF.internal_sql_execute_timeout))) { } else if (OB_FAIL(ObShareUtil::set_default_timeout_ctx(timeout_ctx, balance_task_execute_timeout))) {
LOG_WARN("failed to get rs default timeout ctx", KR(ret)); LOG_WARN("failed to get rs default timeout ctx", KR(ret));
} else if (OB_FAIL(get_balance_job_task_for_update_(task, job, task_in_trans, trans))) { } else if (OB_FAIL(get_balance_job_task_for_update_(task, job, task_in_trans, trans))) {
LOG_WARN("failed to get job", KR(ret), K(task)); LOG_WARN("failed to get job", KR(ret), K(task));