From e54044de732badcbb4eda63731bbe07e7d3bce45 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Fri, 24 Jun 2022 19:24:14 +0800
Subject: [PATCH] update retry

---
 source/libs/transport/src/transCli.c | 34 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index b9eaae6cba..653666ee70 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -272,17 +272,17 @@ static void cliReleaseUnfinishedMsg(SCliConn* conn) {
   do {                                                           \
     (epSet)->inUse = (++((epSet)->inUse)) % ((epSet)->numOfEps); \
   } while (0)
-#define EPSET_DEBUG_STR(epSet, buf)                                                                                  \
-  do {                                                                                                               \
-    int len = snprintf(buf, sizeof(buf), "epset:{");                                                                 \
-    for (int i = 0; i < (epSet)->numOfEps; i++) {                                                                    \
-      if (i == (epSet)->numOfEps - 1) {                                                                              \
-        len += snprintf(buf + len, sizeof(buf) - len, "%d. %s:%d", i, (epSet)->eps[i].fqdn, (epSet)->eps[i].port);   \
-      } else {                                                                                                       \
-        len += snprintf(buf + len, sizeof(buf) - len, "%d. %s:%d, ", i, (epSet)->eps[i].fqdn, (epSet)->eps[i].port); \
-      }                                                                                                              \
-    }                                                                                                                \
-    len += snprintf(buf + len, sizeof(buf) - len, "}");                                                              \
+#define EPSET_DEBUG_STR(epSet, tbuf)                                                                                   \
+  do {                                                                                                                 \
+    int len = snprintf(tbuf, sizeof(tbuf), "epset:{");                                                                 \
+    for (int i = 0; i < (epSet)->numOfEps; i++) {                                                                      \
+      if (i == (epSet)->numOfEps - 1) {                                                                                \
+        len += snprintf(tbuf + len, sizeof(tbuf) - len, "%d. %s:%d", i, (epSet)->eps[i].fqdn, (epSet)->eps[i].port);   \
+      } else {                                                                                                         \
+        len += snprintf(tbuf + len, sizeof(tbuf) - len, "%d. %s:%d, ", i, (epSet)->eps[i].fqdn, (epSet)->eps[i].port); \
+      }                                                                                                                \
+    }                                                                                                                  \
+    len += snprintf(tbuf + len, sizeof(tbuf) - len, "}, inUse:%d", (epSet)->inUse);                                    \
   } while (0);
 
 static void* cliWorkThread(void* arg);
@@ -989,9 +989,10 @@ static void cliSchedMsgToNextNode(SCliMsg* pMsg, SCliThrd* pThrd) {
   STraceId*      trace = &pMsg->msg.info.traceId;
   STransConnCtx* pCtx = pMsg->ctx;
 
-  char buf[256] = {0};
-  EPSET_DEBUG_STR(&pCtx->epSet, buf);
-  tGTrace("%s %s, retryCnt:%d, limit:%d", transLabel(pThrd), buf, pCtx->retryCnt + 1, pCtx->retryLimit);
+  char tbuf[256] = {0};
+  EPSET_DEBUG_STR(&pCtx->epSet, tbuf);
+  tGTrace("%s retry to send msg to next node %dms later , use %s, retryCnt:%d, limit:%d", transLabel(pThrd->pTransInst),
+          TRANS_RETRY_INTERVAL, tbuf, pCtx->retryCnt + 1, pCtx->retryLimit);
 
   STaskArg* arg = taosMemoryMalloc(sizeof(STaskArg));
   arg->param1 = pMsg;
@@ -1029,18 +1030,17 @@ int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg) {
       pMsg->sent = 0;
       pCtx->retryCnt += 1;
       if (code == TSDB_CODE_RPC_NETWORK_UNAVAIL) {
-        transUnrefCliHandle(pConn);
-
         cliUpdateRetryLimit(&pCtx->retryLimit, TRANS_RETRY_COUNT_LIMIT, EPSET_GET_SIZE(&pCtx->epSet) * 3);
         if (pCtx->retryCnt < pCtx->retryLimit) {
+          transUnrefCliHandle(pConn);
           EPSET_FORWARD_INUSE(&pCtx->epSet);
           cliSchedMsgToNextNode(pMsg, pThrd);
           return -1;
         }
       } else {
-        addConnToPool(pThrd->pool, pConn);
         cliUpdateRetryLimit(&pCtx->retryLimit, TRANS_RETRY_COUNT_LIMIT, TRANS_RETRY_COUNT_LIMIT);
         if (pCtx->retryCnt < pCtx->retryLimit) {
+          addConnToPool(pThrd->pool, pConn);
           if (pResp->contLen == 0) {
             EPSET_FORWARD_INUSE(&pCtx->epSet);
           } else {
-- 
GitLab