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

[CP] [fix] fix some ERROR and WARN logs

Browse Source
This commit is contained in:
BinChenn 2023-10-11 04:09:46 +00:00 committed by ob-robot
parent 828836002c
commit 92c27003a9
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/logservice/palf/log_mode_mgr.cpp
View File

@ -782,16 +782,20 @@ int LogModeMgr::ack_mode_meta(const common::ObAddr &server, const int64_t propos
} else if (false == server.is_valid() || INVALID_PROPOSAL_ID == proposal_id) {
ret = OB_INVALID_ARGUMENT;
PALF_LOG(WARN, "invalid arguments", K(ret), K_(palf_id), K_(self), K(server), K(proposal_id));
} else if (ModeChangeState::MODE_ACCEPT != state_ || new_proposal_id_ != proposal_id) {
} else if (ModeChangeState::MODE_ACCEPT != state_) {
PALF_LOG(TRACE, "ack_mode_meta not int ACCEPT state", K(ret), K_(palf_id),
K_(self), K(server), "state", state2str_(state_));
} else if (new_proposal_id_ != proposal_id) {
ret = OB_STATE_NOT_MATCH;
PALF_LOG(WARN, "ack_mode_meta not int ACCEPT state", K(ret), K_(palf_id), K_(self), K(server),
PALF_LOG(WARN, "ack_mode_meta failed", K(ret), K_(palf_id), K_(self), K(server),
K(proposal_id), K_(new_proposal_id), "state", state2str_(state_));
} else if (OB_FAIL(ack_list_.add_server(server))) {
PALF_LOG(WARN, "add_server failed", K(ret), K_(palf_id), K_(self), K(server));
} else { }
} else {
PALF_LOG(INFO, "ack_mode_meta finish", K(ret), K_(palf_id), K_(self), K(server),
K(proposal_id), K_(follower_list), K_(majority_cnt), K_(ack_list), K_(resend_mode_meta_list));
}
(void) resend_mode_meta_list_.remove_learner(server);
PALF_LOG(INFO, "ack_mode_meta finish", K(ret), K_(palf_id), K_(self), K(server),
K(proposal_id), K_(follower_list), K_(majority_cnt), K_(ack_list), K_(resend_mode_meta_list));
return ret;
}

3
src/logservice/palf/palf_handle_impl.cpp
View File

@ -2777,7 +2777,7 @@ int PalfHandleImpl::ack_mode_meta(const common::ObAddr &server,
} else if (OB_FAIL(mode_mgr_.ack_mode_meta(server, msg_proposal_id))) {
PALF_LOG(WARN, "ack_mode_meta failed", KR(ret), KPC(this), K(server), K(msg_proposal_id));
} else {
PALF_LOG(INFO, "ack_mode_meta success", KR(ret), KPC(this), K(server), K(msg_proposal_id));
PALF_LOG(TRACE, "ack_mode_meta success", KR(ret), KPC(this), K(server), K(msg_proposal_id));
}
return ret;
}
@ -5068,7 +5068,6 @@ void PalfHandleImpl::is_in_sync_(bool &is_log_sync, bool &is_use_cache)
CLOG_LOG(WARN, "get_palf_max_scn failed", K(ret), K_(self), K_(palf_id));
last_check_sync_time_us_ = OB_INVALID_TIMESTAMP;
} else if (leader_max_scn.is_valid() && leader_end_lsn.is_valid()) {
local_max_scn = sw_.get_max_scn();
sw_.get_committed_end_lsn(local_end_lsn);
const bool is_scn_sync = (leader_max_scn.convert_to_ts() - local_max_scn.convert_to_ts() <= PALF_LOG_SYNC_DELAY_THRESHOLD_US);
const bool is_log_size_sync = (leader_end_lsn - local_end_lsn) < 2 * PALF_BLOCK_SIZE;