diff --git a/deps/oblib/src/rpc/obrpc/ob_rpc_processor_base.cpp b/deps/oblib/src/rpc/obrpc/ob_rpc_processor_base.cpp index 24bf55b814..90d6062151 100644 --- a/deps/oblib/src/rpc/obrpc/ob_rpc_processor_base.cpp +++ b/deps/oblib/src/rpc/obrpc/ob_rpc_processor_base.cpp @@ -578,7 +578,9 @@ int ObRpcProcessorBase::flush(int64_t wait_timeout) req_ = NULL; //wait fail, invalid req_ reuse(); is_stream_end_ = true; - RPC_OBRPC_LOG(WARN, "wait next packet fail, set req_ to null", K(ret), K(wait_timeout)); + int pcode = m_get_pcode(); + RPC_OBRPC_LOG(WARN, "wait next packet fail, set req_ to null", K(ret), + K(pcode), K(wait_timeout)); } else if (OB_ISNULL(req)) { ret = OB_ERR_UNEXPECTED; RPC_OBRPC_LOG(ERROR, "Req should not be NULL", K(ret)); diff --git a/deps/oblib/src/rpc/obrpc/ob_rpc_session_handler.cpp b/deps/oblib/src/rpc/obrpc/ob_rpc_session_handler.cpp index 1f5c0fad15..d36b6ab641 100644 --- a/deps/oblib/src/rpc/obrpc/ob_rpc_session_handler.cpp +++ b/deps/oblib/src/rpc/obrpc/ob_rpc_session_handler.cpp @@ -64,8 +64,12 @@ bool ObRpcSessionHandler::wakeup_next_thread(ObRequest &req) LOG_WARN_RET(hash_ret, "wakeup session but no thread wait", K(req)); bret = false; } else if (NULL != wait_object.req_) { - LOG_ERROR_RET(OB_ERR_UNEXPECTED, "previous stream request hasn't processed", - "request", *wait_object.req_); + const ObRpcPacket &pkt = reinterpret_cast(req.get_packet()); + ObRpcPacketCode pcode = pkt.get_pcode(); + bool is_stream_last = pkt.is_stream_last(); + LOG_WARN_RET(OB_ERR_UNEXPECTED, "previous stream request hasn't been processed yet, " + "this might be an abort packet that indicates execution has timed out", + K(pcode), K(is_stream_last), "previous request", *wait_object.req_); bret = false; } else { // set packet to wait object