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

[4.2][NetStandby] Modify log level for OB_TIMEOUT and fix a problem

Browse Source
This commit is contained in:
obdev
2023-06-28 11:18:21 +00:00
committed by ob-robot
parent 8aee534b66
commit a587dddecc
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/logservice/logfetcher/ob_log_ls_fetch_stream.cpp
View File

@ -1234,14 +1234,20 @@ int FetchStream::handle_fetch_log_error_(
if (OB_SUCCESS != rcode.rcode_) { if (OB_SUCCESS != rcode.rcode_) {
need_kick_out = true; need_kick_out = true;
kick_out_reason = FETCH_LOG_FAIL_ON_RPC; kick_out_reason = FETCH_LOG_FAIL_ON_RPC;
if (OB_NOT_NULL(ls_fetch_ctx_) && OB_IN_STOP_STATE != ret) { if (OB_NOT_NULL(ls_fetch_ctx_)) {
ls_fetch_ctx_->handle_error(ls_fetch_ctx_->get_tls_id().get_ls_id(), if (OB_IN_STOP_STATE != rcode.rcode_) {
ls_fetch_ctx_->handle_error(ls_fetch_ctx_->get_tls_id().get_ls_id(),
IObLogErrHandler::ErrType::FETCH_LOG, IObLogErrHandler::ErrType::FETCH_LOG,
trace_id, trace_id,
ls_fetch_ctx_->get_next_lsn(), ls_fetch_ctx_->get_next_lsn(),
rcode.rcode_, rcode.rcode_,
"%s"); "%s");
LOG_ERROR("fetch log fail on rpc, need_switch_server", K(svr_), K(rcode), "fetch_stream", this); }
if (OB_TIMEOUT == rcode.rcode_) {
LOG_WARN("fetch log fail on rpc, need_switch_server", K(svr_), K(rcode), "fetch_stream", this);
} else {
LOG_ERROR("fetch log fail on rpc, need_switch_server", K(svr_), K(rcode), "fetch_stream", this);
}
} }
} }
// server return error // server return error
@ -1249,16 +1255,24 @@ int FetchStream::handle_fetch_log_error_(
// Other errors, switch server directly // Other errors, switch server directly
need_kick_out = true; need_kick_out = true;
kick_out_reason = FETCH_LOG_FAIL_ON_SERVER; kick_out_reason = FETCH_LOG_FAIL_ON_SERVER;
if (OB_NOT_NULL(ls_fetch_ctx_) && OB_IN_STOP_STATE != ret ) { if (OB_NOT_NULL(ls_fetch_ctx_)) {
ls_fetch_ctx_->handle_error(ls_fetch_ctx_->get_tls_id().get_ls_id(), if (OB_IN_STOP_STATE != resp.get_err()) {
ls_fetch_ctx_->handle_error(ls_fetch_ctx_->get_tls_id().get_ls_id(),
IObLogErrHandler::ErrType::FETCH_LOG, IObLogErrHandler::ErrType::FETCH_LOG,
trace_id, trace_id,
ls_fetch_ctx_->get_next_lsn(), ls_fetch_ctx_->get_next_lsn(),
resp.get_err(), resp.get_err(),
"%s"); "%s");
LOG_ERROR("fetch log fail on server, need_switch_server", "fetch_stream", this, K(svr_), }
"svr_err", resp.get_err(), "svr_debug_err", resp.get_debug_err(), if (OB_TIMEOUT == resp.get_err()) {
K(rcode), K(resp)); LOG_WARN("fetch log fail on server, need_switch_server", "fetch_stream", this, K(svr_),
"svr_err", resp.get_err(), "svr_debug_err", resp.get_debug_err(),
K(rcode), K(resp));
} else {
LOG_ERROR("fetch log fail on server, need_switch_server", "fetch_stream", this, K(svr_),
"svr_err", resp.get_err(), "svr_debug_err", resp.get_debug_err(),
K(rcode), K(resp));
}
} }
} else { } else {
need_kick_out = false; need_kick_out = false;