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

resolve naming conflicts for parameters and system variables

Browse Source
This commit is contained in:
obdev
2023-06-01 08:42:20 +00:00
committed by ob-robot
parent 2e68d02fde
commit 88ab4bb424
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/observer/ob_heartbeat.cpp
View File

@ -161,8 +161,8 @@ void ObHeartBeatProcess::check_and_update_server_id_(const uint64_t server_id)
K(GCTX.server_id_), K(server_id));
}
if (OB_FAIL(ret)) {
} else if (0 == GCONF.server_id) {
GCONF.server_id = server_id;
} else if (0 == GCONF.observer_id) {
GCONF.observer_id = server_id;
LOG_INFO("receive new server id in GCONF", K(server_id));
if (OB_SUCCESS != (tmp_ret = TG_SCHEDULE(lib::TGDefIDs::CONFIG_MGR, server_id_persist_task_, delay, repeat))) {
server_id_persist_task_.enable_need_retry_flag();
@ -170,9 +170,9 @@ void ObHeartBeatProcess::check_and_update_server_id_(const uint64_t server_id)
} else {
server_id_persist_task_.disable_need_retry_flag();
}
} else if (server_id != GCONF.server_id) {
} else if (server_id != GCONF.observer_id) {
ret = OB_ERR_UNEXPECTED;
uint64_t server_id_in_GCONF = GCONF.server_id;
uint64_t server_id_in_GCONF = GCONF.observer_id;
LOG_ERROR("GCONF.server_id is not the same as server_id in RS", KR(ret),
K(server_id_in_GCONF), K(server_id));
}

2
src/observer/ob_server.cpp
View File

@ -2275,7 +2275,7 @@ int ObServer::init_global_context()
(void)gctx_.set_upgrade_stage(obrpc::OB_UPGRADE_STAGE_INVALID);
gctx_.flashback_scn_ = opts_.flashback_scn_;
gctx_.server_id_ = config_.server_id;
gctx_.server_id_ = config_.observer_id;
if (is_valid_server_id(gctx_.server_id_)) {
LOG_INFO("this observer has had a valid server_id", K(gctx_.server_id_));
}

4
src/observer/ob_service.cpp
View File

@ -1546,7 +1546,7 @@ int ObService::check_server_for_adding_server(
if (OB_SUCC(ret) && server_empty) {
uint64_t server_id = arg.get_server_id();
GCTX.server_id_ = server_id;
GCONF.server_id = server_id;
GCONF.observer_id = server_id;
if (OB_ISNULL(GCTX.config_mgr_)) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("GCTX.config_mgr_ is null", KR(ret));
@ -1669,7 +1669,7 @@ int ObService::check_server_empty(bool &is_empty)
ret = OB_NOT_INIT;
LOG_WARN("not init", K(ret));
} else {
uint64_t server_id_in_GCONF = GCONF.server_id;
uint64_t server_id_in_GCONF = GCONF.observer_id;
if (is_empty) {
if (is_valid_server_id(GCTX.server_id_) || is_valid_server_id(server_id_in_GCONF)) {
is_empty = false;

2
src/share/parameter/ob_parameter_seed.ipp
View File

@ -1436,7 +1436,7 @@ DEF_STR(_load_tde_encrypt_engine, OB_CLUSTER_PARAMETER, "NONE",
ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_STR(local_ip, OB_CLUSTER_PARAMETER, "", "the IP address of the machine on which the ObServer will be installed",
ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::READONLY));
DEF_INT(server_id, OB_CLUSTER_PARAMETER, "0", "[1, 18446744073709551615]",
DEF_INT(observer_id, OB_CLUSTER_PARAMETER, "0", "[1, 18446744073709551615]",
"the unique id that been assigned by rootservice for each observer in cluster, "
"default: 0 (invalid id), Range: [1, 18446744073709551615]",
ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::READONLY));

2
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result
View File

@ -147,6 +147,7 @@ min_observer_version
mysql_port
net_thread_count
obconfig_url
observer_id
ob_compaction_schedule_interval
ob_enable_batched_multi_statement
ob_event_history_recycle_interval
@ -194,7 +195,6 @@ server_balance_disk_tolerance_percent
server_check_interval
server_cpu_quota_max
server_cpu_quota_min
server_id
server_permanent_offline_time
sql_login_thread_count
sql_net_thread_count