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

[FEAT MERGE] log4100 branch

Browse Source 
Co-authored-by: tino247 <tino247@126.com>
Co-authored-by: BinChenn <binchenn.bc@gmail.com>
Co-authored-by: HaHaJeff <jeffzhouhhh@gmail.com>
This commit is contained in:
obdev
2023-01-28 18:17:31 +08:00
committed by ob-robot
parent a269ffe6be
commit 50024b39cd
772 changed files with 60275 additions and 11301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/share/ob_rs_mgr.cpp
View File

@ -368,7 +368,9 @@ int ObRsMgr::renew_master_rootserver(const int64_t cluster_id)
return ret;
}
int ObRsMgr::construct_initial_server_list(common::ObIArray<common::ObAddr> &server_list)
int ObRsMgr::construct_initial_server_list(
const bool check_ls_service,
common::ObIArray<common::ObAddr> &server_list)
{
int ret = OB_SUCCESS;
int tmp_ret = OB_SUCCESS;
@ -401,7 +403,9 @@ int ObRsMgr::construct_initial_server_list(common::ObIArray<common::ObAddr> &ser
}
}
// case 3: try get sys_ls's member_list from ObLSService
if (OB_SUCC(ret)) {
// For RTO scene, get_paxos_member_list() may be blocked and related threads will be hang.
// To avoid thread hang when refreshing ls locations by rpc, we don't use member_list of sys tenant's ls.
if (OB_SUCC(ret) && check_ls_service) {
MTL_SWITCH(OB_SYS_TENANT_ID) {
ObMemberList member_list;
ObLSService *ls_svr = nullptr;
@ -420,7 +424,7 @@ int ObRsMgr::construct_initial_server_list(common::ObIArray<common::ObAddr> &ser
ret = OB_ERR_UNEXPECTED;
LOG_WARN("ls_handle.get_ls() is nullptr", KR(ret));
} else if (OB_SUCCESS != (tmp_ret = ls_handle.get_ls()->get_paxos_member_list(member_list, paxos_replica_number))) {
LOG_WARN("get member_list from ObLS failed", KR(tmp_ret), "teannt_id", OB_SYS_TENANT_ID,
LOG_WARN("get member_list from ObLS failed", KR(tmp_ret), "tenant_id", OB_SYS_TENANT_ID,
"log_stream_id", SYS_LS.id(), K(ls_handle));
}
if (OB_SUCC(ret)) {