[FEAT MERGE] Merge syslog user experience improvement to master
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:
@ -171,7 +171,7 @@ void MonitorEntryStack::pop()
|
||||
{
|
||||
LockGuard guard(lock_);
|
||||
if (curr_idx_ <= 0 || curr_idx_ > NEST_LIMIT) {
|
||||
SHARE_LOG(ERROR, "unexpected error, code mustn't go into this branch");
|
||||
SHARE_LOG_RET(ERROR, OB_ERR_UNEXPECTED, "unexpected error, code mustn't go into this branch");
|
||||
} else {
|
||||
inner_entry_[--curr_idx_].reset();
|
||||
}
|
||||
@ -336,7 +336,7 @@ void ObBGThreadMonitor::run_loop_()
|
||||
}
|
||||
int64_t cost_time = common::ObClockGenerator::getClock() - current_ts;
|
||||
if (cost_time > 100*1000) {
|
||||
SHARE_LOG(WARN, "ObBGThreadMonitor cost too much time", K(cost_time));
|
||||
SHARE_LOG_RET(WARN, OB_ERR_TOO_MUCH_TIME, "ObBGThreadMonitor cost too much time", K(cost_time));
|
||||
}
|
||||
int64_t sleep_time = CHECK_INTERVAL - cost_time;
|
||||
if (sleep_time < 0) {
|
||||
|
||||
Reference in New Issue
Block a user