From f3c1eb829e9f071ebbbde1d131a19b391f059fe8 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Mon, 28 Nov 2022 10:10:11 +0800
Subject: [PATCH] refactor retry

---
 source/libs/transport/src/transCli.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 8b16c177f7..2f0b9609f3 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -1425,21 +1425,26 @@ bool cliResetEpset(STransConnCtx* pCtx, STransMsg* pResp, bool hasEpSet) {
       }
     }
   } else {
-    SEpSet epSet;
-
-    // assert(pResp->contLen == sizeof(epSet));
+    SEpSet  epSet;
     int32_t valid = tDeserializeSEpSet(pResp->pCont, pResp->contLen, &epSet);
     if (valid < 0) {
-      // assert(0);
-    }
-    if (!transEpSetIsEqual(&pCtx->epSet, &epSet)) {
-      tDebug("epset not equal, retry new epset");
-      pCtx->epSet = epSet;
+      tDebug("get invalid epset, epset equal, continue");
+      if (pCtx->epsetRetryCnt >= pCtx->epSet.numOfEps) {
+        noDelay = false;
+      } else {
+        EPSET_FORWARD_INUSE(&pCtx->epSet);
+        noDelay = true;
+      }
     } else {
-      tDebug("epset equal, continue");
-      EPSET_FORWARD_INUSE(&pCtx->epSet);
+      if (!transEpSetIsEqual(&pCtx->epSet, &epSet)) {
+        tDebug("epset not equal, retry new epset");
+        pCtx->epSet = epSet;
+      } else {
+        tDebug("epset equal, continue");
+        EPSET_FORWARD_INUSE(&pCtx->epSet);
+      }
+      noDelay = false;
     }
-    noDelay = false;
   }
   return noDelay;
 }
-- 
GitLab