From 1a70cc243a6b4f0e9f94a09a6d5187d10a73e514 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 16 Sep 2024 16:36:51 +0800 Subject: [PATCH] Merge branch '3.0' into enh/opt-transport --- source/libs/transport/src/transCli.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index dbdaa1a4aa..c0141dfa3a 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -377,11 +377,6 @@ void cliConnMaySetReadTimeout(SCliConn* conn, int timeout) { cliConnCheckTimoutMsg(conn); - if (conn->timer != NULL) { - // reset previous timer - cliResetConnTimer(conn); - } - if (conn->timer == NULL) { if (cliGetConnTimer(conn->hostThrd, conn) != 0) { return; @@ -634,7 +629,7 @@ void cliConnTimeout(uv_timer_t* handle) { bool filterToRmTimoutReq(void* key, void* arg) { SCliReq* pReq = QUEUE_DATA(key, SCliReq, q); - if (pReq->msg.info.qId == 0 && REQUEST_NO_RESP(&pReq->msg)) { + if (pReq->msg.info.qId == 0 && !REQUEST_NO_RESP(&pReq->msg) && pReq->ctx) { int64_t elapse = ((taosGetTimestampUs() - pReq->st) / 1000); if (elapse > READ_TIMEOUT) { return true;