From d379d8994e6e5d323ba28b5751eb558678ecad8a Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 30 Sep 2024 09:38:21 +0800 Subject: [PATCH] add config --- source/libs/transport/src/transCli.c | 2 +- source/libs/transport/src/transSvr.c | 31 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index 27ad4aa565..1aafd71e67 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -285,7 +285,7 @@ static void cliWalkCb(uv_handle_t* handle, void* arg); static FORCE_INLINE int32_t destroyAllReqs(SCliConn* SCliConn); -static FORCE_INLINE bool filterAllReq(void* e, void* arg); +static FORCE_INLINE bool filterAllReq(void* key, void* arg); static FORCE_INLINE bool filerBySeq(void* key, void* arg); static FORCE_INLINE bool filterByQid(void* key, void* arg); static FORCE_INLINE bool filterToDebug_timeoutMsg(void* key, void* arg); diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c index 926fca7425..1ecf8eb247 100644 --- a/source/libs/transport/src/transSvr.c +++ b/source/libs/transport/src/transSvr.c @@ -441,23 +441,23 @@ static int32_t uvMayHandleReleaseReq(SSvrConn* pConn, STransMsgHead* pHead) { int64_t qId = taosHton64(pHead->qid); if (qId <= 0) { tError("conn %p recv release, but invalid qid:%" PRId64 "", pConn, qId); - return TSDB_CODE_RPC_NO_STATE; - } - - void* p = taosHashGet(pConn->pQTable, &qId, sizeof(qId)); - if (p == NULL) { code = TSDB_CODE_RPC_NO_STATE; - tTrace("conn %p recv release, and releady release by server qid:%" PRId64 "", pConn, qId); } else { - SSvrRegArg* arg = p; - (pInst->cfp)(pInst->parent, &(arg->msg), NULL); - tTrace("conn %p recv release, notify server app, qid:%" PRId64 "", pConn, qId); + void* p = taosHashGet(pConn->pQTable, &qId, sizeof(qId)); + if (p == NULL) { + code = TSDB_CODE_RPC_NO_STATE; + tTrace("conn %p recv release, and releady release by server qid:%" PRId64 "", pConn, qId); + } else { + SSvrRegArg* arg = p; + (pInst->cfp)(pInst->parent, &(arg->msg), NULL); + tTrace("conn %p recv release, notify server app, qid:%" PRId64 "", pConn, qId); - code = taosHashRemove(pConn->pQTable, &qId, sizeof(qId)); - if (code != 0) { - tDebug("conn %p failed to remove qid:%" PRId64 "", pConn, qId); + code = taosHashRemove(pConn->pQTable, &qId, sizeof(qId)); + if (code != 0) { + tDebug("conn %p failed to remove qid:%" PRId64 "", pConn, qId); + } + tTrace("conn %p clear state,qid:%" PRId64 "", pConn, qId); } - tTrace("conn %p clear state,qid:%" PRId64 "", pConn, qId); } STransMsg tmsg = {.code = code, @@ -468,7 +468,8 @@ static int32_t uvMayHandleReleaseReq(SSvrConn* pConn, STransMsgHead* pHead) { SSvrRespMsg* srvMsg = taosMemoryCalloc(1, sizeof(SSvrRespMsg)); if (srvMsg == NULL) { - tError("conn %p recv release, but invalid qid:%" PRId64 "", pConn, qId); + tError("conn %p recv release, failed to send release-resp since %s", pConn, terrno); + taosMemoryFree(pHead); return terrno; } srvMsg->msg = tmsg; @@ -479,7 +480,7 @@ static int32_t uvMayHandleReleaseReq(SSvrConn* pConn, STransMsgHead* pHead) { uvStartSendRespImpl(srvMsg); taosMemoryFree(pHead); - return code; + return TSDB_CODE_RPC_ASYNC_IN_PROCESS; } return 0; }