From 0ba3326b9974fea730cfdf5f76d39adfbf81b9db Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 22 Jun 2022 10:35:39 +0800
Subject: [PATCH] fix(sync): update commit index when apply snapshot

---
 source/libs/sync/src/syncSnapshot.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/libs/sync/src/syncSnapshot.c b/source/libs/sync/src/syncSnapshot.c
index 3e062d395f..ff3dc56f71 100644
--- a/source/libs/sync/src/syncSnapshot.c
+++ b/source/libs/sync/src/syncSnapshot.c
@@ -533,6 +533,10 @@ int32_t syncNodeOnSnapshotSendCb(SSyncNode *pSyncNode, SyncSnapshotSend *pMsg) {
         ASSERT(writeCode == 0);
 
         pSyncNode->pFsm->FpSnapshotStopWrite(pSyncNode->pFsm, pReceiver->pWriter, true);
+        if (pReceiver->snapshot.lastApplyIndex > pReceiver->pSyncNode->commitIndex) {
+          pReceiver->pSyncNode->commitIndex = pReceiver->snapshot.lastApplyIndex;
+        }
+
         pSyncNode->pLogStore->syncLogSetBeginIndex(pSyncNode->pLogStore, pMsg->lastIndex + 1);
 
         // maybe update lastconfig
@@ -552,7 +556,7 @@ int32_t syncNodeOnSnapshotSendCb(SSyncNode *pSyncNode, SyncSnapshotSend *pMsg) {
         pSyncNode->pFsm->FpGetSnapshotInfo(pSyncNode->pFsm, &snapshot);
 
         do {
-          char *eventLog = snapshotReceiver2SimpleStr(pReceiver, "snapshot receiver finish");
+          char *eventLog = snapshotReceiver2SimpleStr(pReceiver, "snapshot receiver finish, apply snapshot");
           syncNodeEventLog(pSyncNode, eventLog);
           taosMemoryFree(eventLog);
         } while (0);
@@ -563,7 +567,7 @@ int32_t syncNodeOnSnapshotSendCb(SSyncNode *pSyncNode, SyncSnapshotSend *pMsg) {
         needRsp = true;
 
         do {
-          char *eventLog = snapshotReceiver2SimpleStr(pReceiver, "snapshot receiver end");
+          char *eventLog = snapshotReceiver2SimpleStr(pReceiver, "snapshot receiver stop");
           syncNodeEventLog(pSyncNode, eventLog);
           taosMemoryFree(eventLog);
         } while (0);