From d9c84b4b720a502fe0b7d2b22709dbf3e3debea9 Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Thu, 30 Nov 2023 11:55:17 +0800
Subject: [PATCH] enh: tolerate out-of-order of closeTS in walEndSnapshot

---
 source/libs/wal/src/walWrite.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/libs/wal/src/walWrite.c b/source/libs/wal/src/walWrite.c
index 33d8d34514..341d989f8f 100644
--- a/source/libs/wal/src/walWrite.c
+++ b/source/libs/wal/src/walWrite.c
@@ -327,15 +327,19 @@ int32_t walEndSnapshot(SWal *pWal) {
 
     // iterate files, until the searched result
     // delete according to file size or close time
+    SWalFileInfo *pUntil = NULL;
     for (SWalFileInfo *iter = pWal->fileInfoSet->pData; iter < pInfo; iter++) {
       if ((pWal->cfg.retentionSize > 0 && newTotSize > pWal->cfg.retentionSize) ||
           (pWal->cfg.retentionPeriod == 0 ||
            pWal->cfg.retentionPeriod > 0 && iter->closeTs >= 0 && iter->closeTs + pWal->cfg.retentionPeriod < ts)) {
-        deleteCnt++;
         newTotSize -= iter->fileSize;
-        taosArrayPush(pWal->toDeleteFiles, iter);
+        pUntil = iter;
       }
     }
+    for (SWalFileInfo *iter = pWal->fileInfoSet->pData; iter <= pUntil; iter++) {
+      deleteCnt++;
+      taosArrayPush(pWal->toDeleteFiles, iter);
+    }
 
     // make new array, remove files
     taosArrayPopFrontBatch(pWal->fileInfoSet, deleteCnt);