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

remove update rs_list during do_restart

Browse Source
This commit is contained in:
maosy
2024-01-08 11:13:19 +00:00
committed by ob-robot
parent 346583d18e
commit 5a9c7b111d
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rootserver/ob_ls_recovery_stat_handler.cpp
View File

@ -480,6 +480,7 @@ int ObLSRecoveryStatHandler::gather_replica_readable_scn()
LOG_WARN("config version change", KR(ret), K(palf_stat_second), K(palf_stat_first)); LOG_WARN("config version change", KR(ret), K(palf_stat_second), K(palf_stat_first));
} else { } else {
SpinWLockGuard guard(lock_); SpinWLockGuard guard(lock_);
ObLSID ls_id = ls_->get_ls_id();
config_version_ = palf_stat_second.config_version_; config_version_ = palf_stat_second.config_version_;
replicas_scn_.reset(); replicas_scn_.reset();
if (OB_FAIL(replicas_scn_.assign(replicas_scn))) { if (OB_FAIL(replicas_scn_.assign(replicas_scn))) {
@ -487,9 +488,9 @@ int ObLSRecoveryStatHandler::gather_replica_readable_scn()
} }
const int64_t PRINT_INTERVAL = 10 * 1000 * 1000L; const int64_t PRINT_INTERVAL = 10 * 1000 * 1000L;
if (REACH_TIME_INTERVAL(PRINT_INTERVAL)) { if (REACH_TIME_INTERVAL(PRINT_INTERVAL)) {
LOG_INFO("ls readable scn in memory", KR(ret), K(replicas_scn_)); LOG_INFO("ls readable scn in memory", KR(ret), K(ls_id), K(replicas_scn_));
} else { } else {
LOG_TRACE("ls readable scn in memory", KR(ret), K(replicas_scn_)); LOG_TRACE("ls readable scn in memory", KR(ret), K(ls_id), K(replicas_scn_));
} }
} }
if (FAILEDx(try_reload_and_fix_config_version_(palf_stat_second.config_version_))) { if (FAILEDx(try_reload_and_fix_config_version_(palf_stat_second.config_version_))) {

32
src/rootserver/ob_root_service.cpp
View File

@ -5520,11 +5520,17 @@ int ObRootService::do_restart()
} }
// broadcast root server address, ignore error // broadcast root server address, ignore error
if (OB_SUCC(ret)) { // not full service, can not update rs_list success
int tmp_ret = update_rslist(); //if (OB_SUCC(ret)) {
if (OB_SUCCESS != tmp_ret) { // int tmp_ret = update_rslist();
FLOG_WARN("failed to update rslist but ignored", KR(tmp_ret)); // if (OB_SUCCESS != tmp_ret) {
} // FLOG_WARN("failed to update rslist but ignored", KR(tmp_ret));
// }
//}
if (FAILEDx(submit_update_rslist_task(true))) {
FLOG_WARN("submit_update_rslist_task failed", KR(ret));
} else {
FLOG_INFO("submit_update_rslist_task succeed");
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
@ -5634,17 +5640,17 @@ int ObRootService::do_restart()
// broadcast root server address again, this task must be in the end part of do_restart, // broadcast root server address again, this task must be in the end part of do_restart,
// because system may work properly without it. // because system may work properly without it.
if (FAILEDx(update_rslist())) { //if (FAILEDx(update_rslist())) {
FLOG_WARN("broadcast root address failed but ignored", KR(ret)); // FLOG_WARN("broadcast root address failed but ignored", KR(ret));
// it's ok ret be overwritten, update_rslist_task will retry until succeed // it's ok ret be overwritten, update_rslist_task will retry until succeed
if (OB_FAIL(submit_update_rslist_task(true))) { if (FAILEDx(submit_update_rslist_task(true))) {
FLOG_WARN("submit_update_rslist_task failed", KR(ret)); FLOG_WARN("submit_update_rslist_task failed", KR(ret));
} else {
FLOG_INFO("submit_update_rslist_task succeed");
}
} else { } else {
FLOG_INFO("broadcast root address succeed"); FLOG_INFO("submit_update_rslist_task succeed");
} }
//} else {
// FLOG_INFO("broadcast root address succeed");
//}
if (FAILEDx(report_single_replica(tenant_id, SYS_LS))) { if (FAILEDx(report_single_replica(tenant_id, SYS_LS))) {
FLOG_WARN("report all_core_table replica failed, but ignore", FLOG_WARN("report all_core_table replica failed, but ignore",