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

make root key synchronization more robust

Browse Source
This commit is contained in:
yinyj17
2023-09-14 07:10:30 +00:00
committed by ob-robot
parent 8a13fac989
commit 864eccfc5c
4 changed files with 151 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/rootserver/ob_root_service.cpp
View File

@ -10573,10 +10573,26 @@ int ObRootService::get_root_key_from_obs(const obrpc::ObRootKeyArg &arg,
ObZone empty_zone;
ObArray<ObAddr> active_server_list;
ObArray<ObAddr> inactive_server_list;
if (OB_FAIL(SVR_TRACER.get_servers_by_status(empty_zone, active_server_list,
inactive_server_list))) {
const ObSimpleTenantSchema *simple_tenant = NULL;
ObSchemaGetterGuard guard;
const uint64_t tenant_id = arg.tenant_id_;
bool enable_default = false;
if (OB_ISNULL(schema_service_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("schema_serviece_ is null", KR(ret));
} else if (OB_FAIL(schema_service_->get_tenant_schema_guard(OB_SYS_TENANT_ID, guard))) {
LOG_WARN("fail to get sys schema guard", KR(ret));
} else if (OB_FAIL(guard.get_tenant_info(tenant_id, simple_tenant))) {
LOG_WARN("fail to get simple tenant schema", KR(ret), K(tenant_id));
} else if (OB_NOT_NULL(simple_tenant) && simple_tenant->is_normal()) {
enable_default = true;
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(SVR_TRACER.get_servers_by_status(empty_zone, active_server_list,
inactive_server_list))) {
LOG_WARN("get alive servers failed", K(ret));
} else if (OB_FAIL(ObDDLService::notify_root_key(rpc_proxy_, arg, active_server_list, result))) {
} else if (OB_FAIL(ObDDLService::notify_root_key(rpc_proxy_, arg, active_server_list, result,
enable_default))) {
LOG_WARN("failed to notify root key");
}
return ret;