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

to avoid use get_tenant_info

Browse Source
This commit is contained in:
obdev
2023-05-31 12:47:28 +00:00
committed by ob-robot
parent 184ff59015
commit b3b766dfb1
12 changed files with 195 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rootserver/ob_create_standby_from_net_actor.cpp
View File

@ -152,8 +152,8 @@ int ObCreateStandbyFromNetActor::finish_restore_if_possible_()
arg.exec_tenant_id_ = OB_SYS_TENANT_ID;
arg.tenant_id_ = tenant_id_;
obrpc::ObCommonRpcProxy *rs_rpc_proxy = GCTX.rs_rpc_proxy_;
ObAllTenantInfo tenant_info;
SCN min_user_ls_create_scn = SCN::base_scn();
SCN readable_scn = SCN::base_scn();
if (OB_ISNULL(rs_rpc_proxy)) {
ret = OB_ERR_UNEXPECTED;
@ -177,11 +177,11 @@ int ObCreateStandbyFromNetActor::finish_restore_if_possible_()
} else if (is_dropped) {
ret = OB_TENANT_HAS_BEEN_DROPPED;
LOG_WARN("tenant has been dropped", KR(ret), K_(tenant_id));
} else if (OB_FAIL(tenant_info_loader->get_tenant_info(tenant_info))) {
WSTAT("failed to get tenant info", KR(ret));
} else if (tenant_info.get_standby_scn() >= min_user_ls_create_scn) {
} else if (OB_FAIL(tenant_info_loader->get_readable_scn(readable_scn))) {
WSTAT("failed to get readable_scn", KR(ret));
} else if (readable_scn >= min_user_ls_create_scn) {
retry_cnt_after_sync_user_ls++;
ISTAT("tenant readable scn can read inner table", K(tenant_info), K(min_user_ls_create_scn),
ISTAT("tenant readable scn can read inner table", K(readable_scn), K(min_user_ls_create_scn),
K(retry_cnt_after_sync_user_ls));
bool is_refreshed = false;
@ -207,7 +207,7 @@ int ObCreateStandbyFromNetActor::finish_restore_if_possible_()
}
}
ISTAT("finish_restore_if_possible", K(ret), K_(tenant_id), K(min_user_ls_create_scn), K(arg), K(tenant_info));
ISTAT("finish_restore_if_possible", K(ret), K_(tenant_id), K(min_user_ls_create_scn), K(arg), K(readable_scn));
return ret;
}