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

[FEAT MERGE] Merge syslog user experience improvement to master

Browse Source 
Co-authored-by: Charles0429 <xiezhenjiang@gmail.com>
Co-authored-by: tino247 <tino247@126.com>
Co-authored-by: chaser-ch <chaser.ch@antgroup.com>
This commit is contained in:
stdliu
2023-02-06 15:52:23 +08:00
committed by ob-robot
parent 1de9266dd0
commit f8c5c2647f
796 changed files with 4465 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/logservice/palf/election/algorithm/election_proposer.cpp
View File

@ -663,21 +663,21 @@ void ElectionProposer::on_change_leader(const ElectionChangeLeaderMsg &change_le
if (change_leader_msg.get_ballot_number() == ballot_number_) {
accept = true;
} else {
LOG_CHANGE_LEADER(WARN, "change leader to self msg's ballot number not expected");
LOG_CHANGE_LEADER_RET(WARN, OB_ERR_UNEXPECTED, "change leader to self msg's ballot number not expected");
}
} else {// 别人切给自己的
if (change_leader_msg.get_ballot_number() > ballot_number_) {
accept = true;
} else {
LOG_CHANGE_LEADER(WARN, "change leader msg's ballot number is too small");
LOG_CHANGE_LEADER_RET(WARN, OB_ERR_UNEXPECTED, "change leader msg's ballot number is too small");
}
}
if (!accept) {
LOG_CHANGE_LEADER(WARN, "change leader msg not accepted");
LOG_CHANGE_LEADER_RET(WARN, OB_ERR_UNEXPECTED, "change leader msg not accepted");
} else if (change_leader_msg.get_membership_version() > memberlist_with_states_.
get_member_list().
get_membership_version()) {
LOG_CHANGE_LEADER(WARN, "change leader msg's membership version is larger than self");
LOG_CHANGE_LEADER_RET(WARN, OB_ERR_UNEXPECTED, "change leader msg's membership version is larger than self");
} else {
advance_ballot_number_and_reset_related_states_(change_leader_msg.get_ballot_number(),
"receive change leader message");