From fcc50467f43f20abd303bd80fbc37d6af23b6ff2 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 9 Nov 2022 17:33:22 +0800
Subject: [PATCH 1/2] fix(sync): fix AddressSanitizer error

---
 source/libs/sync/src/syncMain.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index f6925946e9..85668068a5 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -1040,6 +1040,7 @@ void syncNodeClose(SSyncNode* pSyncNode) {
 
   ret = raftStoreClose(pSyncNode->pRaftStore);
   ASSERT(ret == 0);
+  pSyncNode->pRaftStore = NULL;
 
   syncRespMgrDestroy(pSyncNode->pSyncRespMgr);
   pSyncNode->pSyncRespMgr = NULL;
@@ -2174,10 +2175,18 @@ static void syncNodeEqPeerHeartbeatTimer(void* param, void* tmrId) {
   SSyncNode*        pSyncNode = pData->pSyncNode;
   SSyncTimer*       pSyncTimer = pData->pTimer;
 
+  if (pSyncNode == NULL) {
+    return;
+  }
+
   if (pSyncNode->state != TAOS_SYNC_STATE_LEADER) {
     return;
   }
 
+  if (pSyncNode->pRaftStore == NULL) {
+    return;
+  }
+
   // sNTrace(pSyncNode, "eq peer hb timer");
 
   int64_t timerLogicClock = atomic_load_64(&pSyncTimer->logicClock);

From fb9e62afe24cdab219a71cc7ad9fac229c82e362 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 9 Nov 2022 19:02:50 +0800
Subject: [PATCH 2/2] refactor(sync): if index less than wal.commitVer, do not
 truncate, otherwise it will print much log

---
 source/libs/sync/src/syncRaftLog.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/source/libs/sync/src/syncRaftLog.c b/source/libs/sync/src/syncRaftLog.c
index d3d69b288b..7b1158319e 100644
--- a/source/libs/sync/src/syncRaftLog.c
+++ b/source/libs/sync/src/syncRaftLog.c
@@ -301,6 +301,12 @@ static int32_t raftLogTruncate(struct SSyncLogStore* pLogStore, SyncIndex fromIn
     return 0;
   }
 
+  // need not truncate
+  SyncIndex walCommitVer = walGetCommittedVer(pWal);
+  if (fromIndex <= walCommitVer) {
+    return 0;
+  }
+
   int32_t code = walRollback(pWal, fromIndex);
   if (code != 0) {
     int32_t     err = terrno;