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

[CP] Fix schema & upgrade related problems

Browse Source
This commit is contained in:
tino247
2022-12-13 13:07:55 +00:00
committed by ob-robot
parent 4c7cfd9120
commit e603b2fe6a
8 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rootserver/ob_system_admin_util.cpp
View File

@ -1403,7 +1403,7 @@ int ObAdminUpgradeCmd::execute(const Bool &upgrade)
}
}
if (OB_FAIL(ret)) {
} else if (admin_set_config.execute(set_config_arg)) {
} else if (OB_FAIL(admin_set_config.execute(set_config_arg))) {
LOG_WARN("execute set config failed", KR(ret));
} else {
LOG_INFO("change upgrade parameters",
@ -1434,7 +1434,7 @@ int ObAdminRollingUpgradeCmd::execute(const obrpc::ObAdminRollingUpgradeArg &arg
LOG_WARN("assign _upgrade_stage config value failed", KR(ret), K(arg));
} else if (OB_FAIL(set_config_arg.items_.push_back(upgrade_stage_item))) {
LOG_WARN("add _upgrade_stage config item failed", KR(ret), K(arg));
} else if (admin_set_config.execute(set_config_arg)) {
} else if (OB_FAIL(admin_set_config.execute(set_config_arg))) {
LOG_WARN("execute set config failed", KR(ret));
} else {
LOG_INFO("change upgrade parameters", KR(ret), "_upgrade_stage", arg.stage_);