refactor(sync): hold wal handle with log store

source/libs/sync/inc/syncRaftLog.h

@@ -26,11 +26,13 @@ extern "C" {
 #include "syncInt.h"
 #include "syncRaftEntry.h"
 #include "taosdef.h"
+#include "wal.h"
 
 typedef struct SSyncLogStoreData {
-  SSyncNode* pSyncNode;
-  SWal*      pWal;
-  SyncIndex  beginIndex;  // valid begin index, default 0, may be set beginIndex > 0
+  SSyncNode*      pSyncNode;
+  SWal*           pWal;
+  SWalReadHandle* pWalHandle;
+  SyncIndex       beginIndex;  // valid begin index, default 0, may be set beginIndex > 0
 } SSyncLogStoreData;
 
 SSyncLogStore* logStoreCreate(SSyncNode* pSyncNode);

source/libs/sync/src/syncMain.c

@@ -1311,6 +1311,10 @@ void syncNodeEventLog(const SSyncNode* pSyncNode, char* str) {
   SyncIndex logBeginIndex = pSyncNode->pLogStore->syncLogBeginIndex(pSyncNode->pLogStore);
 
   char* pCfgStr = syncCfg2SimpleStr(&(pSyncNode->pRaftCfg->cfg));
+  char* printStr = "";
+  if (pCfgStr != NULL) {
+    printStr = pCfgStr;
+  }
 
   if (userStrLen < 256) {
     char logBuf[256 + 256];
@@ -1322,7 +1326,7 @@ void syncNodeEventLog(const SSyncNode* pSyncNode, char* str) {
                pSyncNode->vgId, syncUtilState2String(pSyncNode->state), str, pSyncNode->pRaftStore->currentTerm,
                pSyncNode->commitIndex, logBeginIndex, logLastIndex, snapshot.lastApplyIndex,
                pSyncNode->pRaftCfg->isStandBy, pSyncNode->replicaNum, pSyncNode->pRaftCfg->lastConfigIndex,
-               pSyncNode->changing, pCfgStr);
+               pSyncNode->changing, printStr);
     } else {
       snprintf(logBuf, sizeof(logBuf), "%s", str);
     }
@@ -1339,7 +1343,7 @@ void syncNodeEventLog(const SSyncNode* pSyncNode, char* str) {
                pSyncNode->vgId, syncUtilState2String(pSyncNode->state), str, pSyncNode->pRaftStore->currentTerm,
                pSyncNode->commitIndex, logBeginIndex, logLastIndex, snapshot.lastApplyIndex,
                pSyncNode->pRaftCfg->isStandBy, pSyncNode->replicaNum, pSyncNode->pRaftCfg->lastConfigIndex,
-               pSyncNode->changing, pCfgStr);
+               pSyncNode->changing, printStr);
     } else {
       snprintf(s, len, "%s", str);
     }

source/libs/sync/src/syncRaftCfg.c

@@ -107,26 +107,30 @@ char *syncCfg2Str(SSyncCfg *pSyncCfg) {
 }
 
 char *syncCfg2SimpleStr(SSyncCfg *pSyncCfg) {
-  int32_t len = 512;
-  char   *s = taosMemoryMalloc(len);
-  memset(s, 0, len);
-
-  snprintf(s, len, "{replica-num:%d, my-index:%d, ", pSyncCfg->replicaNum, pSyncCfg->myIndex);
-  char *p = s + strlen(s);
-  for (int i = 0; i < pSyncCfg->replicaNum; ++i) {
-    /*
-    if (p + 128 + 32 > s + len) {
-      break;
+  if (pSyncCfg != NULL) {
+    int32_t len = 512;
+    char   *s = taosMemoryMalloc(len);
+    memset(s, 0, len);
+
+    snprintf(s, len, "{replica-num:%d, my-index:%d, ", pSyncCfg->replicaNum, pSyncCfg->myIndex);
+    char *p = s + strlen(s);
+    for (int i = 0; i < pSyncCfg->replicaNum; ++i) {
+      /*
+      if (p + 128 + 32 > s + len) {
+        break;
+      }
+      */
+      char buf[128 + 32];
+      snprintf(buf, sizeof(buf), "%s:%d, ", pSyncCfg->nodeInfo[i].nodeFqdn, pSyncCfg->nodeInfo[i].nodePort);
+      strncpy(p, buf, sizeof(buf));
+      p = s + strlen(s);
     }
-    */
-    char buf[128 + 32];
-    snprintf(buf, sizeof(buf), "%s:%d, ", pSyncCfg->nodeInfo[i].nodeFqdn, pSyncCfg->nodeInfo[i].nodePort);
-    strncpy(p, buf, sizeof(buf));
-    p = s + strlen(s);
+    strcpy(p - 2, "}");
+
+    return s;
   }
-  strcpy(p - 2, "}");
 
-  return s;
+  return NULL;
 }
 
 int32_t syncCfgFromJson(const cJSON *pRoot, SSyncCfg *pSyncCfg) {

source/libs/sync/src/syncRaftLog.c

@@ -16,7 +16,6 @@
 #include "syncRaftLog.h"
 #include "syncRaftCfg.h"
 #include "syncRaftStore.h"
-#include "wal.h"
 
 // refactor, log[0 .. n] ==> log[m .. n]
 static int32_t   raftLogSetBeginIndex(struct SSyncLogStore* pLogStore, SyncIndex beginIndex);
@@ -233,7 +232,8 @@ static int32_t raftLogGetEntry(struct SSyncLogStore* pLogStore, SyncIndex index,
 
   *ppEntry = NULL;
 
-  SWalReadHandle* pWalHandle = walOpenReadHandle(pWal);
+  // SWalReadHandle* pWalHandle = walOpenReadHandle(pWal);
+  SWalReadHandle* pWalHandle = pData->pWalHandle;
   if (pWalHandle == NULL) {
     return -1;
   }
@@ -256,9 +256,11 @@ static int32_t raftLogGetEntry(struct SSyncLogStore* pLogStore, SyncIndex index,
       }
     } while (0);
 
-    int32_t saveErr = terrno;
-    walCloseReadHandle(pWalHandle);
-    terrno = saveErr;
+    /*
+        int32_t saveErr = terrno;
+        walCloseReadHandle(pWalHandle);
+        terrno = saveErr;
+    */
 
     return code;
   }
@@ -274,9 +276,11 @@ static int32_t raftLogGetEntry(struct SSyncLogStore* pLogStore, SyncIndex index,
   ASSERT((*ppEntry)->dataLen == pWalHandle->pHead->head.bodyLen);
   memcpy((*ppEntry)->data, pWalHandle->pHead->head.body, pWalHandle->pHead->head.bodyLen);
 
-  int32_t saveErr = terrno;
-  walCloseReadHandle(pWalHandle);
-  terrno = saveErr;
+  /*
+    int32_t saveErr = terrno;
+    walCloseReadHandle(pWalHandle);
+    terrno = saveErr;
+  */
 
   return code;
 }
@@ -319,6 +323,10 @@ SSyncLogStore* logStoreCreate(SSyncNode* pSyncNode) {
   SSyncLogStoreData* pData = pLogStore->data;
   pData->pSyncNode = pSyncNode;
   pData->pWal = pSyncNode->pWal;
+  ASSERT(pData->pWal != NULL);
+
+  pData->pWalHandle = walOpenReadHandle(pData->pWal);
+  ASSERT(pData->pWalHandle != NULL);
 
   SyncIndex firstVer = walGetFirstVer(pData->pWal);
   SyncIndex lastVer = walGetLastVer(pData->pWal);
@@ -357,6 +365,11 @@ SSyncLogStore* logStoreCreate(SSyncNode* pSyncNode) {
 
 void logStoreDestory(SSyncLogStore* pLogStore) {
   if (pLogStore != NULL) {
+    SSyncLogStoreData* pData = pLogStore->data;
+    if (pData->pWalHandle != NULL) {
+      walCloseReadHandle(pData->pWalHandle);
+    }
+
     taosMemoryFree(pLogStore->data);
     taosMemoryFree(pLogStore);
   }
@@ -405,7 +418,8 @@ SSyncRaftEntry* logStoreGetEntry(SSyncLogStore* pLogStore, SyncIndex index) {
   SWal*              pWal = pData->pWal;
 
   if (index >= SYNC_INDEX_BEGIN && index <= logStoreLastIndex(pLogStore)) {
-    SWalReadHandle* pWalHandle = walOpenReadHandle(pWal);
+    // SWalReadHandle* pWalHandle = walOpenReadHandle(pWal);
+    SWalReadHandle* pWalHandle = pData->pWalHandle;
     ASSERT(pWalHandle != NULL);
 
     int32_t code = walReadWithHandle(pWalHandle, index);
@@ -441,9 +455,11 @@ SSyncRaftEntry* logStoreGetEntry(SSyncLogStore* pLogStore, SyncIndex index) {
     ASSERT(pEntry->dataLen == pWalHandle->pHead->head.bodyLen);
     memcpy(pEntry->data, pWalHandle->pHead->head.body, pWalHandle->pHead->head.bodyLen);
 
-    int32_t saveErr = terrno;
-    walCloseReadHandle(pWalHandle);
-    terrno = saveErr;
+    /*
+        int32_t saveErr = terrno;
+        walCloseReadHandle(pWalHandle);
+        terrno = saveErr;
+    */
 
     return pEntry;