From cb1b71f61006be084fcc08c77f82540196f7887d Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 13 Oct 2020 21:52:09 +0800
Subject: [PATCH] TD-1652

---
 src/sync/src/syncRetrieve.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/sync/src/syncRetrieve.c b/src/sync/src/syncRetrieve.c
index 60625d75ec..31efe64831 100644
--- a/src/sync/src/syncRetrieve.c
+++ b/src/sync/src/syncRetrieve.c
@@ -266,9 +266,15 @@ static int syncRetrieveLastWal(SSyncPeer *pPeer, char *name, uint64_t fversion,
       break;
     }
 
-    sDebug("%s, last wal is forwarded, ver:%" PRIu64, pPeer->id, pHead->version);
-    int ret = taosWriteMsg(pPeer->syncFd, pHead, wsize);
-    if (ret != wsize) break;
+    if (pHead->version > pPeer->version + 1) {
+      sError("%s, last wal skip forward, ver:%" PRIu64 ", peer ver:%" PRIu64, pPeer->id, pHead->version,
+             pPeer->sversion);
+    } else {
+      sDebug("%s, last wal is forwarded, ver:%" PRIu64, pPeer->id, pHead->version);
+      int ret = taosWriteMsg(pPeer->syncFd, pHead, wsize);
+      if (ret != wsize) break;
+    }
+
     pPeer->sversion = pHead->version;
 
     bytes += wsize;
-- 
GitLab