xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0' into enh/opt-transport

This commit is contained in:
yihaoDeng 2024-10-14 18:02:59 +08:00
parent ae770e1dd0
commit cc033c9260
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/libs/transport/src/transCli.c
View File

@ -3643,14 +3643,15 @@ static void cliConnRemoveTimoutQidMsg(SCliConn* pConn, int64_t* st, queue* set)
tstrerror(code)); tstrerror(code));
break; break;
} }
tWarn("%s conn %p remove timeout msg sid:%" PRId64 "", CONN_GET_INST_LABEL(pConn), pConn, *qid);
} }
pIter = taosHashIterate(pConn->pQTable, pIter); pIter = taosHashIterate(pConn->pQTable, pIter);
} }
for (int32_t i = 0; i < taosArrayGetSize(pQIdBuf); i++) { for (int32_t i = 0; i < taosArrayGetSize(pQIdBuf); i++) {
int64_t* qid = taosArrayGet(pQIdBuf, i); int64_t* qid = taosArrayGet(pQIdBuf, i);
transQueueRemoveByFilter(&pConn->reqsSentOut, filterByQid, qid, &set, -1); transQueueRemoveByFilter(&pConn->reqsSentOut, filterByQid, qid, set, -1);
transQueueRemoveByFilter(&pConn->reqsToSend, filterByQid, qid, &set, -1); transQueueRemoveByFilter(&pConn->reqsToSend, filterByQid, qid, set, -1);
STransCtx* p = taosHashGet(pConn->pQTable, qid, sizeof(*qid)); STransCtx* p = taosHashGet(pConn->pQTable, qid, sizeof(*qid));
transCtxCleanup(p); transCtxCleanup(p);
@ -3668,7 +3669,7 @@ static void cliConnRemoveTimeoutNoQidMsg(SCliConn* pConn, int64_t* st, queue* se
SCliThrd* pThrd = pConn->hostThrd; SCliThrd* pThrd = pConn->hostThrd;
STrans* pInst = pThrd->pInst; STrans* pInst = pThrd->pInst;
SListFilterArg arg = {.id = *st, .pInst = pInst}; SListFilterArg arg = {.id = *st, .pInst = pInst};
transQueueRemoveByFilter(&pConn->reqsToSend, filterTimeoutReq, &arg, &set, -1); transQueueRemoveByFilter(&pConn->reqsToSend, filterTimeoutReq, &arg, set, -1);
return; return;
} }