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

fix expected_task_load of split_task_range equals to 0.

Browse Source
This commit is contained in:
obdev
2023-06-01 13:53:21 +00:00
committed by ob-robot
parent 2bde3becf7
commit 2a28ee0b5c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/ddl/ob_complement_data_task.cpp
View File

@ -158,7 +158,7 @@ int ObComplementDataParam::split_task_ranges(
ObArrayArray<ObStoreRange> multi_range_split_array; ObArrayArray<ObStoreRange> multi_range_split_array;
ObParallelBlockRangeTaskParams params; ObParallelBlockRangeTaskParams params;
params.parallelism_ = hint_parallelism; params.parallelism_ = hint_parallelism;
params.expected_task_load_ = tablet_size / 1024 / 1024; params.expected_task_load_ = tablet_size / 1024 / 1024 <= 0 ? sql::OB_EXPECTED_TASK_LOAD : tablet_size / 1024 / 1024;
if (OB_FAIL(ranges.push_back(range))) { if (OB_FAIL(ranges.push_back(range))) {
LOG_WARN("push back range failed", K(ret)); LOG_WARN("push back range failed", K(ret));
} else if (OB_FAIL(tablet_service->get_multi_ranges_cost(tablet_id, } else if (OB_FAIL(tablet_service->get_multi_ranges_cost(tablet_id,

2
src/storage/ddl/ob_tablet_ddl_kv_mgr.cpp
View File

@ -309,7 +309,7 @@ int ObTabletDDLKvMgr::wait_ddl_merge_success(const SCN &start_scn, const SCN &co
LOG_WARN("check status failed", K(ret)); LOG_WARN("check status failed", K(ret));
} else if (OB_FAIL(schedule_ddl_merge_task(start_scn, commit_scn, false/*is_replay*/, table_id, ddl_task_id))) { } else if (OB_FAIL(schedule_ddl_merge_task(start_scn, commit_scn, false/*is_replay*/, table_id, ddl_task_id))) {
if (OB_EAGAIN == ret) { if (OB_EAGAIN == ret) {
ob_usleep(10L * 1000L); ob_usleep(100L); // 100us.
ret = OB_SUCCESS; // retry ret = OB_SUCCESS; // retry
} else { } else {
LOG_WARN("commit ddl log failed", K(ret), K(start_scn), K(commit_scn), K(ls_id_), K(tablet_id_)); LOG_WARN("commit ddl log failed", K(ret), K(start_scn), K(commit_scn), K(ls_id_), K(tablet_id_));