From e3f50c0d481eab72fae604c4f0d2d00af29acda2 Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Sun, 16 Oct 2022 11:49:53 +0800
Subject: [PATCH] fix: align vers.firstVer with vers.snapshotVer+1 in WAL meta
 info

---
 source/libs/wal/src/walMeta.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/source/libs/wal/src/walMeta.c b/source/libs/wal/src/walMeta.c
index 8808363bb2..279f4dc656 100644
--- a/source/libs/wal/src/walMeta.c
+++ b/source/libs/wal/src/walMeta.c
@@ -257,23 +257,23 @@ static void walRebuildFileInfoSet(SArray* metaLogList, SArray* actualLogList) {
 }
 
 void walAlignVersions(SWal* pWal) {
-  if (pWal->vers.firstVer > pWal->vers.snapshotVer) {
-    wWarn("vgId:%d, firstVer:%" PRId64 " is larger than snapshotVer:%" PRId64 ". reset it.", pWal->cfg.vgId,
+  if (pWal->vers.firstVer > pWal->vers.snapshotVer + 1) {
+    wWarn("vgId:%d, firstVer:%" PRId64 " is larger than snapshotVer:%" PRId64 " + 1. align with it.", pWal->cfg.vgId,
           pWal->vers.firstVer, pWal->vers.snapshotVer);
-    pWal->vers.firstVer = pWal->vers.snapshotVer;
+    pWal->vers.firstVer = pWal->vers.snapshotVer + 1;
   }
   if (pWal->vers.lastVer < pWal->vers.snapshotVer) {
-    wWarn("vgId:%d, lastVer:%" PRId64 " is less than snapshotVer:%" PRId64 ". reset it.", pWal->cfg.vgId,
+    wWarn("vgId:%d, lastVer:%" PRId64 " is less than snapshotVer:%" PRId64 ". align with it.", pWal->cfg.vgId,
           pWal->vers.lastVer, pWal->vers.snapshotVer);
     pWal->vers.lastVer = pWal->vers.snapshotVer;
   }
   if (pWal->vers.commitVer < pWal->vers.snapshotVer) {
-    wWarn("vgId:%d, commitVer:%" PRId64 " is less than snapshotVer:%" PRId64 ". reset it.", pWal->cfg.vgId,
+    wWarn("vgId:%d, commitVer:%" PRId64 " is less than snapshotVer:%" PRId64 ". align with it.", pWal->cfg.vgId,
           pWal->vers.commitVer, pWal->vers.snapshotVer);
     pWal->vers.commitVer = pWal->vers.snapshotVer;
   }
   if (pWal->vers.appliedVer < pWal->vers.snapshotVer) {
-    wWarn("vgId:%d, appliedVer:%" PRId64 " is less than snapshotVer:%" PRId64 ". reset it.", pWal->cfg.vgId,
+    wWarn("vgId:%d, appliedVer:%" PRId64 " is less than snapshotVer:%" PRId64 ". align with it.", pWal->cfg.vgId,
           pWal->vers.appliedVer, pWal->vers.snapshotVer);
     pWal->vers.appliedVer = pWal->vers.snapshotVer;
   }
@@ -384,7 +384,6 @@ int walCheckAndRepairMeta(SWal* pWal) {
   actualFileNum = taosArrayGetSize(pWal->fileInfoSet);
   pWal->writeCur = actualFileNum - 1;
   pWal->totSize = totSize;
-  pWal->vers.firstVer = -1;
   pWal->vers.lastVer = -1;
   if (actualFileNum > 0) {
     pWal->vers.firstVer = ((SWalFileInfo*)taosArrayGet(pWal->fileInfoSet, 0))->firstVer;