提交 e2e3d826 编写于 作者: O obdev 提交者: wangzelin.wzl

Fix follower update leader logic.

上级 24edf85f
......@@ -739,9 +739,7 @@ bool LogStateMgr::follower_active_need_switch_()
bool state_changed = false;
common::ObAddr new_leader;
if (need_update_leader_(new_leader)) {
if (new_leader.is_valid() || !leader_.is_valid() || leader_epoch_ == OB_INVALID_TIMESTAMP) {
state_changed = true;
}
state_changed = true;
} else if (new_leader.is_valid()
&& self_ == new_leader) {
state_changed = true;
......@@ -1020,6 +1018,7 @@ int LogStateMgr::check_and_try_fetch_log_()
} else {
last_check_start_id_ = start_id;
last_check_start_id_time_ns_ = now_ns;
PALF_LOG(TRACE, "sw try_fetch_log success", K(ret), K_(palf_id), K(start_id));
}
} else if (last_check_start_id_ != start_id) {
last_check_start_id_ = start_id;
......
......@@ -1948,6 +1948,7 @@ int PalfHandleImpl::set_location_cache_cb(PalfLocationCacheCb *lc_cb)
int ret = OB_SUCCESS;
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
PALF_LOG(WARN, "not initted", KR(ret), KPC(this));
} else if (OB_ISNULL(lc_cb)) {
ret = OB_INVALID_ARGUMENT;
PALF_LOG(WARN, "lc_cb is NULL, can't register", KR(ret), KPC(this));
......@@ -2288,7 +2289,7 @@ int PalfHandleImpl::do_init_mem_(
has_set_deleted_ = false;
palf_env_impl_ = palf_env_impl;
is_inited_ = true;
PALF_LOG(INFO, "PalfHandleImpl do_init_ success", K(ret), K(palf_id), K(log_dir), K(palf_base_info),
PALF_LOG(INFO, "PalfHandleImpl do_init_ success", K(ret), K(palf_id), K(self), K(log_dir), K(palf_base_info),
K(log_meta), K(fetch_log_engine), K(alloc_mgr), K(log_rpc), K(log_io_worker));
}
if (OB_FAIL(ret)) {
......
......@@ -224,6 +224,7 @@ public:
DELEGATE_WITH_RET(palf_handle_, switch_learner_to_acceptor, int);
DELEGATE_WITH_RET(palf_handle_, switch_acceptor_to_learner, int);
DELEGATE_WITH_RET(palf_handle_, set_region, int);
DELEGATE_WITH_RET(palf_handle_, set_location_cache_cb, int);
DELEGATE_WITH_RET(palf_handle_, change_access_mode, int);
DELEGATE_WITH_RET(palf_handle_, get_access_mode, int);
private:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册