Merge pull request #11988 from taosdata/feature/refator_retry

refactor(rpc): fefactor retry way

source/libs/transport/inc/transComm.h

@@ -348,14 +348,13 @@ typedef struct SDelayQueue {
   uv_timer_t* timer;
   Heap*       heap;
   uv_loop_t*  loop;
-  void (*free)(void* arg);
 } SDelayQueue;
 
-int transCreateDelayQueue(uv_loop_t* loop, SDelayQueue** queue);
+int transDQCreate(uv_loop_t* loop, SDelayQueue** queue);
 
-void transDestroyDelayQueue(SDelayQueue* queue);
+void transDQDestroy(SDelayQueue* queue);
 
-int transPutTaskToDelayQueue(SDelayQueue* queue, void (*func)(void* arg), void* arg, uint64_t timeoutMs);
+int transDQSched(SDelayQueue* queue, void (*func)(void* arg), void* arg, uint64_t timeoutMs);
 
 /*
  * init global func

source/libs/transport/src/transCli.c

@@ -842,7 +842,7 @@ static SCliThrdObj* createThrdObj() {
 
   pThrd->pool = createConnPool(4);
 
-  transCreateDelayQueue(pThrd->loop, &pThrd->delayQueue);
+  transDQCreate(pThrd->loop, &pThrd->delayQueue);
 
   pThrd->quit = false;
   return pThrd;
@@ -857,7 +857,7 @@ static void destroyThrdObj(SCliThrdObj* pThrd) {
   taosThreadMutexDestroy(&pThrd->msgMtx);
   transDestroyAsyncPool(pThrd->asyncPool);
 
-  transDestroyDelayQueue(pThrd->delayQueue);
+  transDQDestroy(pThrd->delayQueue);
   taosMemoryFree(pThrd->loop);
   taosMemoryFree(pThrd);
 }
@@ -923,14 +923,14 @@ int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg) {
         STaskArg* arg = taosMemoryMalloc(sizeof(STaskArg));
         arg->param1 = pMsg;
         arg->param2 = pThrd;
-        transPutTaskToDelayQueue(pThrd->delayQueue, doDelayTask, arg, TRANS_RETRY_INTERVAL);
+        transDQSched(pThrd->delayQueue, doDelayTask, arg, TRANS_RETRY_INTERVAL);
 
         cliDestroy((uv_handle_t*)pConn->stream);
         return -1;
       }
     } else if (pCtx->retryCount < TRANS_RETRY_COUNT_LIMIT) {
       if (pResp->contLen == 0) {
-        pEpSet->inUse = (pEpSet->inUse++) % pEpSet->numOfEps;
+        pEpSet->inUse = (++pEpSet->inUse) % pEpSet->numOfEps;
       } else {
         SMEpSet emsg = {0};
         tDeserializeSMEpSet(pResp->pCont, pResp->contLen, &emsg);
@@ -940,7 +940,7 @@ int cliAppCb(SCliConn* pConn, STransMsg* pResp, SCliMsg* pMsg) {
       arg->param1 = pMsg;
       arg->param2 = pThrd;
 
-      transPutTaskToDelayQueue(pThrd->delayQueue, doDelayTask, arg, TRANS_RETRY_INTERVAL);
+      transDQSched(pThrd->delayQueue, doDelayTask, arg, TRANS_RETRY_INTERVAL);
       addConnToPool(pThrd, pConn);
       return -1;
     }

source/libs/transport/src/transComm.c

@@ -369,7 +369,7 @@ static int32_t timeCompare(const HeapNode* a, const HeapNode* b) {
   }
 }
 
-static void transDelayQueueTimeout(uv_timer_t* timer) {
+static void transDQTimeout(uv_timer_t* timer) {
   SDelayQueue* queue = timer->data;
   tTrace("timer %p timeout", timer);
   uint64_t timeout = 0;
@@ -388,10 +388,10 @@ static void transDelayQueueTimeout(uv_timer_t* timer) {
     }
   } while (1);
   if (timeout != 0) {
-    uv_timer_start(queue->timer, transDelayQueueTimeout, timeout, 0);
+    uv_timer_start(queue->timer, transDQTimeout, timeout, 0);
   }
 }
-int transCreateDelayQueue(uv_loop_t* loop, SDelayQueue** queue) {
+int transDQCreate(uv_loop_t* loop, SDelayQueue** queue) {
   uv_timer_t* timer = taosMemoryCalloc(1, sizeof(uv_timer_t));
   uv_timer_init(loop, timer);
 
@@ -407,7 +407,7 @@ int transCreateDelayQueue(uv_loop_t* loop, SDelayQueue** queue) {
   return 0;
 }
 
-void transDestroyDelayQueue(SDelayQueue* queue) {
+void transDQDestroy(SDelayQueue* queue) {
   taosMemoryFree(queue->timer);
 
   while (heapSize(queue->heap) > 0) {
@@ -424,19 +424,15 @@ void transDestroyDelayQueue(SDelayQueue* queue) {
   taosMemoryFree(queue);
 }
 
-int transPutTaskToDelayQueue(SDelayQueue* queue, void (*func)(void* arg), void* arg, uint64_t timeoutMs) {
+int transDQSched(SDelayQueue* queue, void (*func)(void* arg), void* arg, uint64_t timeoutMs) {
   SDelayTask* task = taosMemoryCalloc(1, sizeof(SDelayTask));
-
   task->func = func;
   task->arg = arg;
   task->execTime = taosGetTimestampMs() + timeoutMs;
 
   tTrace("timer %p put task into queue, timeoutMs: %" PRIu64 "", queue->timer, timeoutMs);
   heapInsert(queue->heap, &task->node);
-  if (heapSize(queue->heap) == 1) {
-    uv_timer_start(queue->timer, transDelayQueueTimeout, timeoutMs, 0);
-  }
-
+  uv_timer_start(queue->timer, transDQTimeout, timeoutMs, 0);
   return 0;
 }
 #endif