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

[CP] fix balance ls primary_zone

Browse Source
This commit is contained in:
maosy
2023-05-09 19:37:40 +00:00
committed by ob-robot
parent 2c1d3153d7
commit dd02a63c3e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rootserver/ob_primary_ls_service.cpp
View File

@ -1887,7 +1887,6 @@ int ObTenantLSInfo::balance_ls_primary_zone(
} else { } else {
int64_t max_count = -1, max_index = 0; int64_t max_count = -1, max_index = 0;
int64_t min_count = INT64_MAX, min_index = 0; int64_t min_count = INT64_MAX, min_index = 0;
const int64_t each_ls_max_count = ceil((double)(ls_count)/primary_zone_count);
do { do {
max_count = -1, max_index = 0; max_count = -1, max_index = 0;
min_count = INT64_MAX, min_index = 0; min_count = INT64_MAX, min_index = 0;
@ -1910,16 +1909,15 @@ int ObTenantLSInfo::balance_ls_primary_zone(
K(primary_zone_array), K(primary_zone_count), K(ls_primary_zone)); K(primary_zone_array), K(primary_zone_count), K(ls_primary_zone));
} else if (max_count - min_count > 1) { } else if (max_count - min_count > 1) {
//choose the max count to min count //choose the max count to min count
int64_t need_change = min(each_ls_max_count - min_count, max_count - each_ls_max_count); for (int64_t i = 0; OB_SUCC(ret) && i < ls_count; ++i) {
for (int64_t i = 0; OB_SUCC(ret) && i < ls_count && need_change > 0; ++i) {
if (ls_primary_zone.at(i) == primary_zone_array.at(max_index)) { if (ls_primary_zone.at(i) == primary_zone_array.at(max_index)) {
if (OB_FAIL(ls_primary_zone.at(i).assign(primary_zone_array.at(min_index)))) { if (OB_FAIL(ls_primary_zone.at(i).assign(primary_zone_array.at(min_index)))) {
LOG_WARN("failed to push back ls primary zone", KR(ret), K(min_index)); LOG_WARN("failed to push back ls primary zone", KR(ret), K(min_index));
} else { } else {
need_change--;
count_group_by_zone.at(max_index)--; count_group_by_zone.at(max_index)--;
count_group_by_zone.at(min_index)++; count_group_by_zone.at(min_index)++;
} }
break;
} }
} }
} }