Merge pull request #15338 from taosdata/fix/rpcQuit

fix: rpc quit

source/libs/index/src/indexFilter.c

@@ -708,7 +708,7 @@ static int32_t sifCalculate(SNode *pNode, SIFParam *pDst) {
     taosHashRemove(ctx.pRes, (void *)&pNode, POINTER_BYTES);
   }
   sifFreeRes(ctx.pRes);
-  
+
   SIF_RET(code);
 }
 

source/libs/transport/src/transCli.c

@@ -196,6 +196,10 @@ static void cliReleaseUnfinishedMsg(SCliConn* conn) {
       CONN_GET_MSGCTX_BY_AHANDLE(conn, ahandle);                                                                  \
       transClearBuffer(&conn->readBuf);                                                                           \
       transFreeMsg(transContFromHead((char*)head));                                                               \
+      if (transQueueSize(&conn->cliMsgs) > 0 && ahandle == 0) {                                                   \
+        SCliMsg* cliMsg = transQueueGet(&conn->cliMsgs, 0);                                                       \
+        if (cliMsg->type == Release) return;                                                                      \
+      }                                                                                                           \
       tDebug("%s conn %p receive release request, ref:%d", CONN_GET_INST_LABEL(conn), conn, T_REF_VAL_GET(conn)); \
       if (T_REF_VAL_GET(conn) > 1) {                                                                              \
         transUnrefCliHandle(conn);                                                                                \

source/libs/transport/src/transSvr.c

@@ -149,34 +149,35 @@ static void* transAcceptThread(void* arg);
 static bool addHandleToWorkloop(SWorkThrd* pThrd, char* pipeName);
 static bool addHandleToAcceptloop(void* arg);
 
-#define CONN_SHOULD_RELEASE(conn, head)                                                                        \
-  do {                                                                                                         \
-    if ((head)->release == 1 && (head->msgLen) == sizeof(*head)) {                                             \
-      reallocConnRef(conn);                                                                                    \
-      tTrace("conn %p received release request", conn);                                                        \
-                                                                                                               \
-      STraceId traceId = head->traceId;                                                                        \
-      conn->status = ConnRelease;                                                                              \
-      transClearBuffer(&conn->readBuf);                                                                        \
-      transFreeMsg(transContFromHead((char*)head));                                                            \
-                                                                                                               \
-      STransMsg tmsg = {.code = 0, .info.handle = (void*)conn, .info.traceId = traceId, .info.ahandle = NULL}; \
-      SSvrMsg*  srvMsg = taosMemoryCalloc(1, sizeof(SSvrMsg));                                                 \
-      srvMsg->msg = tmsg;                                                                                      \
-      srvMsg->type = Release;                                                                                  \
-      srvMsg->pConn = conn;                                                                                    \
-      if (!transQueuePush(&conn->srvMsgs, srvMsg)) {                                                           \
-        return;                                                                                                \
-      }                                                                                                        \
-      if (conn->regArg.init) {                                                                                 \
-        tTrace("conn %p release, notify server app", conn);                                                    \
-        STrans* pTransInst = conn->pTransInst;                                                                 \
-        (*pTransInst->cfp)(pTransInst->parent, &(conn->regArg.msg), NULL);                                     \
-        memset(&conn->regArg, 0, sizeof(conn->regArg));                                                        \
-      }                                                                                                        \
-      uvStartSendRespInternal(srvMsg);                                                                         \
-      return;                                                                                                  \
-    }                                                                                                          \
+#define CONN_SHOULD_RELEASE(conn, head)                                                                   \
+  do {                                                                                                    \
+    if ((head)->release == 1 && (head->msgLen) == sizeof(*head)) {                                        \
+      reallocConnRef(conn);                                                                               \
+      tTrace("conn %p received release request", conn);                                                   \
+                                                                                                          \
+      STraceId traceId = head->traceId;                                                                   \
+      conn->status = ConnRelease;                                                                         \
+      transClearBuffer(&conn->readBuf);                                                                   \
+      transFreeMsg(transContFromHead((char*)head));                                                       \
+                                                                                                          \
+      STransMsg tmsg = {                                                                                  \
+          .code = 0, .info.handle = (void*)conn, .info.traceId = traceId, .info.ahandle = (void*)0x9527}; \
+      SSvrMsg* srvMsg = taosMemoryCalloc(1, sizeof(SSvrMsg));                                             \
+      srvMsg->msg = tmsg;                                                                                 \
+      srvMsg->type = Release;                                                                             \
+      srvMsg->pConn = conn;                                                                               \
+      if (!transQueuePush(&conn->srvMsgs, srvMsg)) {                                                      \
+        return;                                                                                           \
+      }                                                                                                   \
+      if (conn->regArg.init) {                                                                            \
+        tTrace("conn %p release, notify server app", conn);                                               \
+        STrans* pTransInst = conn->pTransInst;                                                            \
+        (*pTransInst->cfp)(pTransInst->parent, &(conn->regArg.msg), NULL);                                \
+        memset(&conn->regArg, 0, sizeof(conn->regArg));                                                   \
+      }                                                                                                   \
+      uvStartSendRespInternal(srvMsg);                                                                    \
+      return;                                                                                             \
+    }                                                                                                     \
   } while (0)
 
 #define SRV_RELEASE_UV(loop)       \
@@ -396,11 +397,11 @@ static void uvPrepareSendData(SSvrMsg* smsg, uv_buf_t* wb) {
 
   if (pConn->status == ConnNormal) {
     pHead->msgType = (0 == pMsg->msgType ? pConn->inType + 1 : pMsg->msgType);
+    if (smsg->type == Release) pHead->msgType = 0;
   } else {
     if (smsg->type == Release) {
       pHead->msgType = 0;
       pConn->status = ConnNormal;
-
       destroyConnRegArg(pConn);
       transUnrefSrvHandle(pConn);
     } else {