Merge remote-tracking branch 'origin/fix/sync' into fix/TD-20095

00c37cf1 · Shengliang Guan · 17e3c59a · dccbe25a · 00c37cf1
隐藏空白更改
内联并排

Showing with 7 addition and 1 deletion

source/libs/sync/src/syncMain.c source/libs/sync/src/syncMain.c +7 -1

未找到文件。
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -2157,7 +2157,13 @@ void syncNodeUpdateTermWithoutStepDown(SSyncNode* pSyncNode, SyncTerm term) {
 }

 void syncNodeStepDown(SSyncNode* pSyncNode, SyncTerm newTerm) {
-  ASSERT(pSyncNode->pRaftStore->currentTerm <= newTerm);
+  if (pSyncNode->pRaftStore->currentTerm > newTerm) {
+    char logBuf[128];
+    snprintf(logBuf, sizeof(logBuf), "step down, ignore, new-term:%" PRIu64 ", current-term:%" PRIu64, newTerm,
+             pSyncNode->pRaftStore->currentTerm);
+    syncNodeEventLog(pSyncNode, logBuf);
+    return;
+  }

  do {
    char logBuf[128];