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

Fix incorrect error messages printed by stop_server/stop_zone

Browse Source
This commit is contained in:
obdev 2023-02-13 10:44:46 +00:00 committed by ob-robot
parent 40590109cf
commit 1cff40eef7
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rootserver/ob_root_service.cpp
View File

@ -7212,7 +7212,7 @@ int ObRootService::stop_server(const obrpc::ObAdminServerArg &arg)
if (OB_FAIL(check_can_stop(zone, arg.servers_, false /*is_stop_zone*/))) {
LOG_WARN("fail to check can stop", KR(ret), K(zone), K(arg));
if (OB_OP_NOT_ALLOW == ret) {
LOG_USER_ERROR(OB_OP_NOT_ALLOW, "Stop all server in primary region is disabled");
LOG_USER_ERROR(OB_OP_NOT_ALLOW, "Stop all servers in primary region is");
}
}
} else {

15
src/share/ls/ob_ls_status_operator.cpp
View File

@ -1128,14 +1128,21 @@ int ObLSStatusOperator::check_ls_log_stat_info_(
} else {
LOG_WARN("fail to get leader replica", KR(ret), K(ls_log_stat_info));
}
} else if (!tenant_schema->get_previous_locality_str().empty()
|| leader.get_paxos_replica_num() != paxos_replica_num) { // make sure paxos_replica_num is consistent
} else if (!tenant_schema->get_previous_locality_str().empty()) {
ret = OB_OP_NOT_ALLOW;
LOG_WARN("locality is changing, can't stop server or zone",
KR(ret), K(ls_log_stat_info), K(leader), K(paxos_replica_num), K(to_stop_servers));
(void)snprintf(err_msg, sizeof(err_msg), "Tenant(%lu) locality is chaning, %s",
KR(ret), K(ls_log_stat_info), K(leader), K(paxos_replica_num), K(to_stop_servers),
"previous_locality", tenant_schema->get_previous_locality_str());
(void)snprintf(err_msg, sizeof(err_msg), "Tenant(%lu) locality is changing, %s",
ls_log_stat_info.get_tenant_id(), print_str);
LOG_USER_ERROR(OB_OP_NOT_ALLOW, err_msg);
} else if (leader.get_paxos_replica_num() != paxos_replica_num) {
ret = OB_OP_NOT_ALLOW;
LOG_WARN("paxos replica number is incorrect, can't stop server or zone",
KR(ret), K(ls_log_stat_info), K(leader), K(paxos_replica_num), K(to_stop_servers));
(void)snprintf(err_msg, sizeof(err_msg), "Tenant(%lu) LS(%ld) paxos replica number does not match with tenant. It should be %ld. %s",
ls_log_stat_info.get_tenant_id(), leader.get_ls_id().id(), paxos_replica_num, print_str);
LOG_USER_ERROR(OB_OP_NOT_ALLOW, err_msg);
} else if (OB_FAIL(generate_valid_servers_(
leader.get_member_list(),
zone_mgr,