From 6ada77a51210ee7e95308992868ac420f14f2365 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 14 Feb 2022 16:58:09 +0800 Subject: [PATCH 1/4] test --- cmake/cmake.options | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/cmake.options b/cmake/cmake.options index e84d02800c..e6af89f8e9 100644 --- a/cmake/cmake.options +++ b/cmake/cmake.options @@ -47,13 +47,13 @@ option( option( BUILD_WITH_UV "If build with libuv" - OFF + ON ) option( BUILD_WITH_UV_TRANS "If build with libuv_trans " - OFF + ON ) option( From 079bbb9fc6198acef17888e6924cbebf9fb4e007 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 14 Feb 2022 17:20:23 +0800 Subject: [PATCH 2/4] reset option --- cmake/cmake.options | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/cmake.options b/cmake/cmake.options index e6af89f8e9..e84d02800c 100644 --- a/cmake/cmake.options +++ b/cmake/cmake.options @@ -47,13 +47,13 @@ option( option( BUILD_WITH_UV "If build with libuv" - ON + OFF ) option( BUILD_WITH_UV_TRANS "If build with libuv_trans " - ON + OFF ) option( From 8ffa7f6e2479bd230add67f39b80a37e0a6c882b Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Mon, 14 Feb 2022 17:26:03 +0800 Subject: [PATCH 3/4] test --- source/libs/transport/src/transCli.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index 00d9174e76..68c353ec74 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -712,7 +712,6 @@ void rpcSendRecv(void* shandle, SEpSet* pEpSet, SRpcMsg* pReq, SRpcMsg* pRsp) { // pthread_mutex_lock(&thrd->msgMtx); // QUEUE_PUSH(&thrd->msg, &cliMsg->q); // pthread_mutex_unlock(&thrd->msgMtx); - // int start = taosGetTimestampUs(); transSendAsync(thrd->asyncPool, &(cliMsg->q)); From 2fb3d3f2df0bed6dd10049ab9c0e2ca57ec98643 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Tue, 15 Feb 2022 20:56:57 +0800 Subject: [PATCH 4/4] fixBug --- source/libs/transport/src/transCli.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index 68c353ec74..b021149c7a 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -140,7 +140,7 @@ static void clientHandleResp(SCliConn* conn) { conn->push = NULL; } else { if (pCtx->pSem == NULL) { - tTrace("client conn%p handle resp", conn); + tTrace("client conn %p handle resp", conn); (pRpc->cfp)(pRpc->parent, &rpcMsg, NULL); } else { tTrace("client conn(sync) %p handle resp", conn); @@ -178,11 +178,16 @@ static void clientHandleExcept(SCliConn* pConn) { tTrace("client conn %p start to destroy", pConn); SCliMsg* pMsg = pConn->data; + tmsg_t msgType = TDMT_MND_CONNECT; + if (pMsg != NULL) { + msgType = pMsg->msg.msgType; + } STransConnCtx* pCtx = pMsg->ctx; SRpcMsg rpcMsg = {0}; rpcMsg.ahandle = pCtx->ahandle; rpcMsg.code = TSDB_CODE_RPC_NETWORK_UNAVAIL; + rpcMsg.msgType = msgType + 1; if (pConn->push != NULL && pConn->notifyCount != 0) { (*pConn->push->callback)(pConn->push->arg, &rpcMsg);