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

notify load election reference info after create ls

Browse Source
This commit is contained in:
maosy
2023-06-16 05:12:16 +00:00
committed by ob-robot
parent 3340486d7a
commit ab5a6d490b
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/share/ls/ob_ls_creator.cpp
View File

@ -27,6 +27,7 @@
#include "logservice/palf/palf_base_info.h"//palf::PalfBaseInfo #include "logservice/palf/palf_base_info.h"//palf::PalfBaseInfo
#include "share/scn.h" #include "share/scn.h"
#include "share/ls/ob_ls_life_manager.h" #include "share/ls/ob_ls_life_manager.h"
#include "rootserver/ob_root_utils.h"//notify_switch_leader
using namespace oceanbase::common; using namespace oceanbase::common;
using namespace oceanbase::share; using namespace oceanbase::share;
@ -590,6 +591,8 @@ int ObLSCreator::set_member_list_(const common::ObMemberList &member_list,
const common::GlobalLearnerList &learner_list) const common::GlobalLearnerList &learner_list)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObArray<common::ObAddr> server_list;
int tmp_ret = OB_SUCCESS;
if (OB_UNLIKELY(!is_valid())) { if (OB_UNLIKELY(!is_valid())) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", KR(ret)); LOG_WARN("invalid argument", KR(ret));
@ -605,7 +608,6 @@ int ObLSCreator::set_member_list_(const common::ObMemberList &member_list,
LOG_WARN("fail to set timeout ctx", KR(ret)); LOG_WARN("fail to set timeout ctx", KR(ret));
} else { } else {
int64_t rpc_count = 0; int64_t rpc_count = 0;
int tmp_ret = OB_SUCCESS;
ObArray<int> return_code_array; ObArray<int> return_code_array;
for (int64_t i = 0; OB_SUCC(ret) && i < member_list.get_member_number(); ++i) { for (int64_t i = 0; OB_SUCC(ret) && i < member_list.get_member_number(); ++i) {
ObAddr addr; ObAddr addr;
@ -620,6 +622,8 @@ int ObLSCreator::set_member_list_(const common::ObMemberList &member_list,
GCONF.cluster_id, tenant_id_, arg))) { GCONF.cluster_id, tenant_id_, arg))) {
LOG_WARN("failed to set member list", KR(tmp_ret), K(ctx.get_timeout()), K(arg), LOG_WARN("failed to set member list", KR(tmp_ret), K(ctx.get_timeout()), K(arg),
K(tenant_id_)); K(tenant_id_));
} else if (OB_FAIL(server_list.push_back(addr))) {
LOG_WARN("failed to push back server list", KR(ret), K(addr));
} }
} }
@ -634,6 +638,16 @@ int ObLSCreator::set_member_list_(const common::ObMemberList &member_list,
} }
} }
} }
if (OB_SUCC(ret)) {
obrpc::ObNotifySwitchLeaderArg arg;
if (OB_FAIL(arg.init(tenant_id_, id_, ObAddr(),
obrpc::ObNotifySwitchLeaderArg::CREATE_LS))) {
LOG_WARN("failed to init arg", KR(ret), K(tenant_id_), K(id_));
} else if (OB_TMP_FAIL(rootserver::ObRootUtils::notify_switch_leader(
GCTX.srv_rpc_proxy_, tenant_id_, arg, server_list))) {
LOG_WARN("failed to notiry switch leader", KR(ret), KR(tmp_ret), K(tenant_id_), K(arg), K(server_list));
}
}
return ret; return ret;
} }

2
src/share/ob_rpc_struct.cpp
View File

@ -6961,7 +6961,7 @@ int ObNotifySwitchLeaderArg::assign(const ObNotifySwitchLeaderArg &other)
const char* SwitchLeaderCommentStr[] = const char* SwitchLeaderCommentStr[] =
{ {
"STOP SERVER", "STOP ZONE", "CHANGE MEMBER", "MODIFY PRIMARY_ZONE", "MANUAL SWITCH" "STOP SERVER", "STOP ZONE", "CHANGE MEMBER", "MODIFY PRIMARY_ZONE", "MANUAL SWITCH", "CREATE LS"
}; };
const char* ObNotifySwitchLeaderArg::comment_to_str() const const char* ObNotifySwitchLeaderArg::comment_to_str() const
{ {

1
src/share/ob_rpc_struct.h
View File

@ -3103,6 +3103,7 @@ public:
CHANGE_MEMBER,//remove member, migrate replica, type transfer CHANGE_MEMBER,//remove member, migrate replica, type transfer
MODIFY_PRIMARY_ZONE, MODIFY_PRIMARY_ZONE,
MANUAL_SWITCH, MANUAL_SWITCH,
CREATE_LS,
}; };
const char* comment_to_str() const; const char* comment_to_str() const;
ObNotifySwitchLeaderArg() : tenant_id_(OB_INVALID_TENANT_ID), ls_id_(), advise_leader_(), ObNotifySwitchLeaderArg() : tenant_id_(OB_INVALID_TENANT_ID), ls_id_(), advise_leader_(),