diff --git a/src/sql/engine/px/ob_px_rpc_processor.cpp b/src/sql/engine/px/ob_px_rpc_processor.cpp index b1ca7c128a..edafd52953 100644 --- a/src/sql/engine/px/ob_px_rpc_processor.cpp +++ b/src/sql/engine/px/ob_px_rpc_processor.cpp @@ -480,8 +480,7 @@ void ObFastInitSqcCB::on_timeout() { int ret = OB_TIMEOUT; ret = deal_with_rpc_timeout_err_safely(); - const bool is_timeout = true; - interrupt_qc(ret, is_timeout); + interrupt_qc(ret); } int ObFastInitSqcCB::process() @@ -491,8 +490,7 @@ int ObFastInitSqcCB::process() if (OB_FAIL(ret)) { int64_t cur_timestamp = ::oceanbase::common::ObTimeUtility::current_time(); if (timeout_ts_ - cur_timestamp > 0) { - const bool is_timeout = false; - interrupt_qc(ret, is_timeout); + interrupt_qc(ret); LOG_WARN("init fast sqc cb async interrupt qc", K_(trace_id), K(addr_), K(timeout_ts_), K(interrupt_id_), K(ret)); } else { @@ -518,7 +516,7 @@ int ObFastInitSqcCB::deal_with_rpc_timeout_err_safely() return call.ret_; } -void ObFastInitSqcCB::interrupt_qc(int err, bool is_timeout) +void ObFastInitSqcCB::interrupt_qc(int err) { int ret = OB_SUCCESS; ObGlobalInterruptManager *manager = ObGlobalInterruptManager::getInstance(); @@ -526,7 +524,7 @@ void ObFastInitSqcCB::interrupt_qc(int err, bool is_timeout) // if we are sure init_sqc msg is not sent to sqc successfully, we don't have to set sqc not alive. bool init_sqc_not_send_out = (get_error() == EASY_TIMEOUT_NOT_SENT_OUT || get_error() == EASY_DISCONNECT_NOT_SENT_OUT); - const bool need_set_not_alive = is_timeout && !init_sqc_not_send_out; + const bool need_set_not_alive = !init_sqc_not_send_out; ObFastInitSqcReportQCMessageCall call(sqc_, err, timeout_ts_, need_set_not_alive); if (OB_FAIL(manager->get_map().atomic_refactored(interrupt_id_, call))) { LOG_WARN("fail to set need report", K(interrupt_id_)); diff --git a/src/sql/engine/px/ob_px_rpc_processor.h b/src/sql/engine/px/ob_px_rpc_processor.h index c73f4b9c7c..3c2eb9dae9 100644 --- a/src/sql/engine/px/ob_px_rpc_processor.h +++ b/src/sql/engine/px/ob_px_rpc_processor.h @@ -168,7 +168,7 @@ public: } virtual void set_args(const Request &arg) { UNUSED(arg); } int deal_with_rpc_timeout_err_safely(); - void interrupt_qc(int err, bool is_timeout); + void interrupt_qc(int err); private: common::ObAddr addr_; ObQueryRetryInfo *retry_info_;