Merge pull request #15359 from taosdata/feature/3.0_mhli

refactor(sync): add ref id in raft entry

include/libs/sync/sync.h

@@ -26,7 +26,7 @@ extern "C" {
 
 extern bool gRaftDetailLog;
 
-#define SYNC_RESP_TTL_MS 10000
+#define SYNC_RESP_TTL_MS 10000000
 
 #define SYNC_MAX_BATCH_SIZE 500
 #define SYNC_INDEX_BEGIN 0

source/libs/sync/inc/syncRaftEntry.h

@@ -36,6 +36,7 @@ typedef struct SSyncRaftEntry {
   bool      isWeak;
   SyncTerm  term;
   SyncIndex index;
+  int64_t   rid;
   uint32_t  dataLen;  // origin RpcMsg.contLen
   char      data[];   // origin RpcMsg.pCont
 } SSyncRaftEntry;

source/libs/sync/src/syncRaftEntry.c

@@ -137,6 +137,8 @@ cJSON* syncEntry2Json(const SSyncRaftEntry* pEntry) {
     cJSON_AddStringToObject(pRoot, "term", u64buf);
     snprintf(u64buf, sizeof(u64buf), "%" PRIu64, pEntry->index);
     cJSON_AddStringToObject(pRoot, "index", u64buf);
+    snprintf(u64buf, sizeof(u64buf), "%" PRIu64, pEntry->rid);
+    cJSON_AddStringToObject(pRoot, "rid", u64buf);
     cJSON_AddNumberToObject(pRoot, "dataLen", pEntry->dataLen);
 
     char* s;

source/libs/sync/src/syncTimeout.c

@@ -19,11 +19,14 @@
 #include "syncRespMgr.h"
 
 int32_t syncNodeTimerRoutine(SSyncNode* ths) {
-  syncNodeEventLog(ths, "timer routines ... ");
+  syncNodeEventLog(ths, "timer routines");
 
+#if 0
   if (ths->vgId != 1) {
     syncRespClean(ths->pSyncRespMgr);
   }
+#endif
+
   return 0;
 }