From a2e0480839c932ae45d12509c4519575c224255f Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Wed, 18 Oct 2023 16:09:51 +0800
Subject: [PATCH] refact: rename as SYNC_FSM_STATE_COMPLETE

---
 include/libs/sync/sync.h                 | 2 +-
 source/dnode/vnode/src/vnd/vnodeSync.c   | 2 +-
 source/libs/sync/src/syncAppendEntries.c | 2 +-
 source/libs/sync/src/syncMain.c          | 2 +-
 source/libs/sync/src/syncPipeline.c      | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h
index 71c56e8c86..ad525a2aa7 100644
--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
@@ -87,7 +87,7 @@ typedef enum {
 } ESyncRole;
 
 typedef enum {
-  SYNC_FSM_STATE_NORMAL = 0,
+  SYNC_FSM_STATE_COMPLETE = 0,
   SYNC_FSM_STATE_INCOMPLETE,
 } ESyncFsmState;
 
diff --git a/source/dnode/vnode/src/vnd/vnodeSync.c b/source/dnode/vnode/src/vnd/vnodeSync.c
index 86fb7cb55b..6c03ed68e9 100644
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
@@ -791,7 +791,7 @@ int32_t vnodeGetSnapshot(SVnode *pVnode, SSnapshot *pSnap) {
   pSnap->lastApplyIndex = pVnode->state.committed;
   pSnap->lastApplyTerm = pVnode->state.commitTerm;
   pSnap->lastConfigIndex = -1;
-  pSnap->state = SYNC_FSM_STATE_NORMAL;
+  pSnap->state = SYNC_FSM_STATE_COMPLETE;
 
   if (tsdbSnapGetFsState(pVnode) != TSDB_FS_STATE_NORMAL) {
     pSnap->state = SYNC_FSM_STATE_INCOMPLETE;
diff --git a/source/libs/sync/src/syncAppendEntries.c b/source/libs/sync/src/syncAppendEntries.c
index 647b86bae9..51a0679889 100644
--- a/source/libs/sync/src/syncAppendEntries.c
+++ b/source/libs/sync/src/syncAppendEntries.c
@@ -155,7 +155,7 @@ int32_t syncNodeOnAppendEntries(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
          pMsg->vgId, pMsg->prevLogIndex + 1, pMsg->term, pMsg->prevLogIndex, pMsg->prevLogTerm, pMsg->commitIndex,
          pEntry->term);
 
-  if (ths->fsmState != SYNC_FSM_STATE_NORMAL) {
+  if (ths->fsmState == SYNC_FSM_STATE_INCOMPLETE) {
     pReply->fsmState = ths->fsmState;
     sWarn("vgId:%d, unable to accept, due to incomplete fsm state. index:%" PRId64, ths->vgId, pEntry->index);
     syncEntryDestroy(pEntry);
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index eaaccecf90..f9dc10da02 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -1010,7 +1010,7 @@ SSyncNode* syncNodeOpen(SSyncInfo* pSyncInfo, int32_t vnodeVersion) {
       sNTrace(pSyncNode, "reset commit index by snapshot");
     }
     pSyncNode->fsmState = snapshot.state;
-    if (pSyncNode->fsmState != SYNC_FSM_STATE_NORMAL) {
+    if (pSyncNode->fsmState == SYNC_FSM_STATE_INCOMPLETE) {
       sError("vgId:%d, fsm state is incomplete.", pSyncNode->vgId);
       if (pSyncNode->replicaNum == 1) {
         goto _error;
diff --git a/source/libs/sync/src/syncPipeline.c b/source/libs/sync/src/syncPipeline.c
index a38d67a388..a7ee37cc3b 100644
--- a/source/libs/sync/src/syncPipeline.c
+++ b/source/libs/sync/src/syncPipeline.c
@@ -840,8 +840,8 @@ int32_t syncLogReplRecover(SSyncLogReplMgr* pMgr, SSyncNode* pNode, SyncAppendEn
     }
 
     if (pMsg->fsmState == SYNC_FSM_STATE_INCOMPLETE || (!pMsg->success && pMsg->matchIndex >= pMsg->lastSendIndex)) {
-      char* msg1 = "rollback match index failure";
-      char* msg2 = "incomplete fsm state";
+      char* msg1 = " rollback match index failure";
+      char* msg2 = " incomplete fsm state";
       sInfo("vgId:%d, snapshot replication to dnode:%d. reason:%s, match index:%" PRId64 ", last sent:%" PRId64,
             pNode->vgId, DID(&destId), (pMsg->fsmState == SYNC_FSM_STATE_INCOMPLETE ? msg2 : msg1), pMsg->matchIndex,
             pMsg->lastSendIndex);