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

4
src/logservice/palf/election/algorithm/election_acceptor.cpp
View File

@ -29,7 +29,7 @@ namespace election
#define CHECK_SILENCE()\
do {\
if (ATOMIC_LOAD(&INIT_TS) < 0) {\
ELECT_LOG(ERROR, "INIT_TS is less than 0, may not call GLOBAL_INIT_ELECTION_MODULE yet!", K(*this));\
ELECT_LOG_RET(ERROR, common::OB_ERROR, "INIT_TS is less than 0, may not call GLOBAL_INIT_ELECTION_MODULE yet!", K(*this));\
return;\
} else if (OB_UNLIKELY(get_monotonic_ts() < ATOMIC_LOAD(&INIT_TS) + MAX_LEASE_TIME)) {\
ELECT_LOG(INFO, "keep silence for safty, won't send response", K(*this));\
@ -108,7 +108,7 @@ void ElectionAcceptor::advance_ballot_number_and_reset_related_states_(const int
ballot_of_time_window_ = ballot_number_;
reset_time_window_states_(phase);
} else {
LOG_PHASE(ERROR, phase, "invalid argument");
LOG_PHASE_RET(ERROR, OB_INVALID_ARGUMENT, phase, "invalid argument");
}
#undef PRINT_WRAPPER
}