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

check before auto migrate unit

Browse Source
This commit is contained in:
zs0
2021-08-24 20:23:54 +08:00
committed by wangzelin.wzl
parent d011a52219
commit e93afdc702
4 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/rootserver/ob_unit_manager.cpp
View File

@ -8187,8 +8187,8 @@ int ObUnitManager::check_can_migrate_in(const ObAddr& server, bool& can_migrate_
return ret;
}
int ObUnitManager::try_migrate_unit(const uint64_t unit_id, const ObUnitStat& unit_stat,
const ObIArray<ObUnitStat>& migrating_unit_stat, const ObAddr& dst, const bool is_manual)
int ObUnitManager::try_migrate_unit(const uint64_t unit_id, const uint64_t tenant_id, const ObUnitStat &unit_stat,
const ObIArray<ObUnitStat> &migrating_unit_stat, const ObAddr &dst, const bool is_manual)
{
int ret = OB_SUCCESS;
ObServerStatus server_status;
@ -8237,13 +8237,10 @@ int ObUnitManager::try_migrate_unit(const uint64_t unit_id, const ObUnitStat& un
if (OB_SUCC(ret)) {
bool can_migrate = false;
share::ObUnitInfo unit_info;
if (OB_FAIL(get_unit_info_by_id(unit_id, unit_info))) {
LOG_WARN("fail to get unit info by id", KR(ret), K(unit_id));
} else if (OB_FAIL(check_unit_can_migrate(unit_info.pool_.tenant_id_, can_migrate))) {
LOG_WARN("fail to check unit can migrate", KR(ret), K(unit_info), K(can_migrate));
if (OB_FAIL(check_unit_can_migrate(tenant_id, can_migrate))) {
LOG_WARN("fail to check unit can migrate", KR(ret), K(tenant_id), K(can_migrate));
} else if (!can_migrate) {
LOG_INFO("can't migrate unit, don't need auto migrate unit", K(unit_info));
LOG_INFO("can't migrate unit, don't need auto migrate unit", K(tenant_id));
} else if (OB_FAIL(migrate_unit(unit_id, dst, is_manual))) {
LOG_WARN("fail migrate unit", K(unit_id), K(dst), K(ret));
}