From cc033c926021018620266345346039f020eb5ec5 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 14 Oct 2024 18:02:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/3.0' into enh/opt-transport --- source/libs/transport/src/transCli.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index 7f04512308..1074f050fa 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -3643,14 +3643,15 @@ static void cliConnRemoveTimoutQidMsg(SCliConn* pConn, int64_t* st, queue* set) tstrerror(code)); break; } + tWarn("%s conn %p remove timeout msg sid:%" PRId64 "", CONN_GET_INST_LABEL(pConn), pConn, *qid); } pIter = taosHashIterate(pConn->pQTable, pIter); } for (int32_t i = 0; i < taosArrayGetSize(pQIdBuf); i++) { int64_t* qid = taosArrayGet(pQIdBuf, i); - transQueueRemoveByFilter(&pConn->reqsSentOut, filterByQid, qid, &set, -1); - transQueueRemoveByFilter(&pConn->reqsToSend, filterByQid, qid, &set, -1); + transQueueRemoveByFilter(&pConn->reqsSentOut, filterByQid, qid, set, -1); + transQueueRemoveByFilter(&pConn->reqsToSend, filterByQid, qid, set, -1); STransCtx* p = taosHashGet(pConn->pQTable, qid, sizeof(*qid)); transCtxCleanup(p); @@ -3668,7 +3669,7 @@ static void cliConnRemoveTimeoutNoQidMsg(SCliConn* pConn, int64_t* st, queue* se SCliThrd* pThrd = pConn->hostThrd; STrans* pInst = pThrd->pInst; SListFilterArg arg = {.id = *st, .pInst = pInst}; - transQueueRemoveByFilter(&pConn->reqsToSend, filterTimeoutReq, &arg, &set, -1); + transQueueRemoveByFilter(&pConn->reqsToSend, filterTimeoutReq, &arg, set, -1); return; }