From 1a22de765cff422ce3d7fc2b1535ecaab8abc978 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Thu, 26 May 2022 18:03:38 +0800
Subject: [PATCH] fix(sync) add multi mnodes

---
 source/libs/sync/src/syncAppendEntries.c | 36 +++++++++++++-----------
 source/libs/sync/src/syncCommit.c        |  5 +++-
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/source/libs/sync/src/syncAppendEntries.c b/source/libs/sync/src/syncAppendEntries.c
index b0c33ba347..008bc00dbc 100644
--- a/source/libs/sync/src/syncAppendEntries.c
+++ b/source/libs/sync/src/syncAppendEntries.c
@@ -363,28 +363,32 @@ int32_t syncNodeOnAppendEntriesCb(SSyncNode* ths, SyncAppendEntries* pMsg) {
                     break;
                   }
                 }
-                ASSERT(hit == true);
 
+                SReConfigCbMeta cbMeta = {0};
                 bool isDrop;
-                syncNodeUpdateConfig(ths, &newSyncCfg, &isDrop);
 
-                // change isStandBy to normal
-                if (!isDrop) {
-                  if (ths->state == TAOS_SYNC_STATE_LEADER) {
-                    syncNodeBecomeLeader(ths);
-                  } else {
-                    syncNodeBecomeFollower(ths);
+                // I am in newConfig
+                if (hit) {
+                  syncNodeUpdateConfig(ths, &newSyncCfg, &isDrop);
+
+                  // change isStandBy to normal
+                  if (!isDrop) {
+                    if (ths->state == TAOS_SYNC_STATE_LEADER) {
+                      syncNodeBecomeLeader(ths);
+                    } else {
+                      syncNodeBecomeFollower(ths);
+                    }
                   }
+
+                  char* sOld = syncCfg2Str(&oldSyncCfg);
+                  char* sNew = syncCfg2Str(&newSyncCfg);
+                  sInfo("==config change== 0x11 old:%s new:%s isDrop:%d \n", sOld, sNew, isDrop);
+                  taosMemoryFree(sOld);
+                  taosMemoryFree(sNew);
                 }
 
-                char* sOld = syncCfg2Str(&oldSyncCfg);
-                char* sNew = syncCfg2Str(&newSyncCfg);
-                sInfo("==config change== 0x11 old:%s new:%s isDrop:%d \n", sOld, sNew, isDrop);
-                taosMemoryFree(sOld);
-                taosMemoryFree(sNew);
-
-                if (ths->pFsm->FpReConfigCb != NULL) {
-                  SReConfigCbMeta cbMeta = {0};
+                // always call FpReConfigCb
+                if (ths->pFsm->FpReConfigCb != NULL) {     
                   cbMeta.code = 0;
                   cbMeta.currentTerm = ths->pRaftStore->currentTerm;
                   cbMeta.index = pEntry->index;
diff --git a/source/libs/sync/src/syncCommit.c b/source/libs/sync/src/syncCommit.c
index a9b055820b..4a1a40a2d7 100644
--- a/source/libs/sync/src/syncCommit.c
+++ b/source/libs/sync/src/syncCommit.c
@@ -141,7 +141,10 @@ void syncMaybeAdvanceCommitIndex(SSyncNode* pSyncNode) {
                 break;
               }
             }
-            ASSERT(hit == true);
+
+            if (pSyncNode->state == TAOS_SYNC_STATE_LEADER) {
+              ASSERT(hit == true);
+            }
 
             bool isDrop;
             syncNodeUpdateConfig(pSyncNode, &newSyncCfg, &isDrop);