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

fix role_change_service wait all async cb

Browse Source
This commit is contained in:
maosy
2022-11-02 15:10:43 +00:00
committed by wangzelin.wzl
parent e2e3d82648
commit 118f0e1943
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/rootserver/ob_tenant_role_transition_service.cpp
View File

@ -407,7 +407,10 @@ int ObTenantRoleTransitionService::get_ls_access_mode_(ObIArray<LSAccessModeInfo
*rpc_proxy_, &obrpc::ObSrvRpcProxy::get_ls_access_mode); *rpc_proxy_, &obrpc::ObSrvRpcProxy::get_ls_access_mode);
obrpc::ObGetLSAccessModeInfoArg arg; obrpc::ObGetLSAccessModeInfoArg arg;
int64_t rpc_count = 0; int64_t rpc_count = 0;
ObArray<int> return_code_array;
int tmp_ret = OB_SUCCESS;
for (int64_t i = 0; OB_SUCC(ret) && i < status_info_array.count(); ++i) { for (int64_t i = 0; OB_SUCC(ret) && i < status_info_array.count(); ++i) {
return_code_array.reset();
const ObLSStatusInfo &info = status_info_array.at(i); const ObLSStatusInfo &info = status_info_array.at(i);
const int64_t timeout = ctx.get_timeout(); const int64_t timeout = ctx.get_timeout();
if (info.ls_is_create_abort()) { if (info.ls_is_create_abort()) {
@ -424,7 +427,6 @@ int ObTenantRoleTransitionService::get_ls_access_mode_(ObIArray<LSAccessModeInfo
rpc_count++; rpc_count++;
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
int tmp_ret = OB_SUCCESS;
const obrpc::ObGetLSAccessModeInfoArg &arg = proxy.get_args().at(i); const obrpc::ObGetLSAccessModeInfoArg &arg = proxy.get_args().at(i);
if (OB_SUCCESS !=(tmp_ret = GCTX.location_service_->nonblock_renew( if (OB_SUCCESS !=(tmp_ret = GCTX.location_service_->nonblock_renew(
GCONF.cluster_id, tenant_id_, info.ls_id_))) { GCONF.cluster_id, tenant_id_, info.ls_id_))) {
@ -433,9 +435,12 @@ int ObTenantRoleTransitionService::get_ls_access_mode_(ObIArray<LSAccessModeInfo
} }
}//end for }//end for
//get result //get result
ObArray<int> return_code_array; //need to wait all result whether success or fail
if (FAILEDx(proxy.wait_all(return_code_array))) { if (OB_SUCCESS != (tmp_ret = proxy.wait_all(return_code_array))) {
LOG_WARN("wait all batch result failed", KR(ret)); LOG_WARN("wait all batch result failed", KR(ret), KR(tmp_ret));
ret = OB_SUCC(ret) ? tmp_ret : ret;
} else if (OB_FAIL(ret)) {
//no need to process return code
} else if (rpc_count != return_code_array.count() || } else if (rpc_count != return_code_array.count() ||
rpc_count != proxy.get_args().count() || rpc_count != proxy.get_args().count() ||
rpc_count != proxy.get_results().count()) { rpc_count != proxy.get_results().count()) {