FpReConfigCb

include/libs/sync/sync.h

@@ -99,14 +99,15 @@ typedef struct SSyncFSM {
   void (*FpRestoreFinishCb)(struct SSyncFSM* pFsm);
   int32_t (*FpGetSnapshot)(struct SSyncFSM* pFsm, SSnapshot* pSnapshot);
 
-  // if (*ppIter == NULL) 
+  // if (*ppIter == NULL)
   //   *ppIter = new iter;
-  // else 
+  // else
   //   *ppIter.next();
   //
   // if success, return 0. else return error code
-  int32_t (*FpSnapshotRead)(struct SSyncFSM* pFsm, const SSnapshot* pSnapshot, void** ppIter, char** ppBuf, int32_t* len);
-  
+  int32_t (*FpSnapshotRead)(struct SSyncFSM* pFsm, const SSnapshot* pSnapshot, void** ppIter, char** ppBuf,
+                            int32_t* len);
+
   // apply data into fsm
   int32_t (*FpSnapshotApply)(struct SSyncFSM* pFsm, const SSnapshot* pSnapshot, char* pBuf, int32_t len);
 

source/dnode/mnode/impl/src/mndSync.c

@@ -74,6 +74,7 @@ int32_t mndSnapshotApply(struct SSyncFSM* pFsm, const SSnapshot* pSnapshot, char
 }
   
 void mndReConfig(struct SSyncFSM* pFsm, SSyncCfg newCfg, SReConfigCbMeta cbMeta) {
+  mInfo("mndReConfig cbMeta.code:%d, cbMeta.currentTerm:%ld, cbMeta.term:%ld, cbMeta.index:%ld", cbMeta.code, cbMeta.currentTerm, cbMeta.term, cbMeta.index);
   if (cbMeta.code == 0) {
     // config change success
   } else {

source/libs/sync/src/syncAppendEntries.c

@@ -357,6 +357,16 @@ int32_t syncNodeOnAppendEntriesCb(SSyncNode* ths, SyncAppendEntries* pMsg) {
                 } else {
                   syncNodeBecomeFollower(ths);
                 }
+
+                // maybe newSyncCfg.myIndex is updated in syncNodeUpdateConfig
+                if (ths->pFsm->FpReConfigCb != NULL) {
+                  SReConfigCbMeta cbMeta = {0};
+                  cbMeta.code = 0;
+                  cbMeta.currentTerm = ths->pRaftStore->currentTerm;
+                  cbMeta.index = pEntry->index;
+                  cbMeta.term = pEntry->term;
+                  ths->pFsm->FpReConfigCb(ths->pFsm, newSyncCfg, cbMeta);
+                }
               }
 
               // restore finish

source/libs/sync/src/syncCommit.c

@@ -134,6 +134,16 @@ void syncMaybeAdvanceCommitIndex(SSyncNode* pSyncNode) {
             } else {
               syncNodeBecomeFollower(pSyncNode);
             }
+
+            // maybe newSyncCfg.myIndex is updated in syncNodeUpdateConfig
+            if (pSyncNode->pFsm->FpReConfigCb != NULL) {
+              SReConfigCbMeta cbMeta = {0};
+              cbMeta.code = 0;
+              cbMeta.currentTerm = pSyncNode->pRaftStore->currentTerm;
+              cbMeta.index = pEntry->index;
+              cbMeta.term = pEntry->term;
+              pSyncNode->pFsm->FpReConfigCb(pSyncNode->pFsm, newSyncCfg, cbMeta);
+            }
           }
 
           // restore finish

source/libs/sync/src/syncMain.c

@@ -377,7 +377,7 @@ SSyncNode* syncNodeOpen(const SSyncInfo* pOldSyncInfo) {
     assert(pSyncNode->pRaftCfg != NULL);
     pSyncInfo->syncCfg = pSyncNode->pRaftCfg->cfg;
 
-    char *seralized = raftCfg2Str(pSyncNode->pRaftCfg);
+    char* seralized = raftCfg2Str(pSyncNode->pRaftCfg);
     sInfo("syncNodeOpen update config :%s", seralized);
     taosMemoryFree(seralized);
 

source/libs/sync/test/syncTest.cpp

@@ -49,7 +49,7 @@ void test4() {
   logTest((char*)__FUNCTION__);
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char** argv) {
   // taosInitLog("tmp/syncTest.log", 100);
   tsAsyncLog = 0;