From c5675bc8212bf2c4942fae29f69eb67f2bc5d18c Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Fri, 15 Jul 2022 14:40:42 +0800 Subject: [PATCH] fix: fix msg disorder issue --- source/libs/qworker/src/qwUtil.c | 2 +- source/libs/transport/src/transCli.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source/libs/qworker/src/qwUtil.c b/source/libs/qworker/src/qwUtil.c index 1d5d9a989a..b56cb29628 100644 --- a/source/libs/qworker/src/qwUtil.c +++ b/source/libs/qworker/src/qwUtil.c @@ -472,7 +472,7 @@ void qwDestroyImpl(void *pMgmt) { QW_GET_QTID(key, qId, tId, eId); qwFreeTaskCtx(ctx); - QW_TASK_DLOG("task ctx freed"); + QW_TASK_DLOG_E("task ctx freed"); pIter = taosHashIterate(mgmt->ctxHash, pIter); } taosHashCleanup(mgmt->ctxHash); diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index 3805787ce2..851824e439 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -1206,7 +1206,13 @@ SCliThrd* transGetWorkThrd(STrans* trans, int64_t handle, bool* validHandle) { if (idx < 0) return NULL; return ((SCliObj*)trans->tcphandle)->pThreadObj[idx]; } - return transGetWorkThrdFromHandle(handle, validHandle); + SCliThrd* pThrd = transGetWorkThrdFromHandle(handle, validHandle); + if (*validHandle == true && pThrd == NULL) { + int idx = cliRBChoseIdx(trans); + if (idx < 0) return NULL; + pThrd = ((SCliObj*)trans->tcphandle)->pThreadObj[idx]; + } + return pThrd; } void transReleaseCliHandle(void* handle) { int idx = -1; -- GitLab