From f45d1c69b80f7ec1a69fcd8133526d05962d854e Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Wed, 23 Aug 2023 16:17:52 +0800
Subject: [PATCH] fix: -t option and wal retention ci

---
 tests/system-test/0-others/walRetention.py | 38 +++++++++++-----------
 tools/shell/src/shellWebsocket.c           |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/system-test/0-others/walRetention.py b/tests/system-test/0-others/walRetention.py
index 5257b7644a..44e64ae5e7 100644
--- a/tests/system-test/0-others/walRetention.py
+++ b/tests/system-test/0-others/walRetention.py
@@ -161,9 +161,18 @@ class VNode :
     # get log size
     def getWalsSize(self):
         size = 0
+        lastSize = 0
+        max = -1
         for walFile in self.walFiles:
-            size += walFile.fsize
-        
+            if self.canDelete(walFile) == False:
+                tdLog.info(f"  calc vnode size {walFile.pathFile} size={walFile.fsize}")
+                size += walFile.fsize
+                if max < walFile.startVer:
+                    max = walFile.startVer
+                    lastSize = walFile.fsize
+
+        size -= lastSize
+        tdLog.info(f" last file size need reduct . lastSize={lastSize}")    
         return size
     
     # vnode
@@ -183,7 +192,7 @@ class VNode :
         delTs = delTsLine.timestamp()
         for walFile in self.walFiles:
             mt = datetime.fromtimestamp(walFile.mtime)
-            info = f" {walFile.pathFile} mt={mt} line={delTsLine}  start={walFile.startVer} snap={self.snapVer} end= {walFile.endVer}"
+            info = f" {walFile.pathFile} size={walFile.fsize} mt={mt} line={delTsLine}  start={walFile.startVer} snap={self.snapVer} end= {walFile.endVer}"
             tdLog.info(info) 
             if walFile.mtime < delTs and self.canDelete(walFile):
                 # wait a moment then check file exist
@@ -199,25 +208,16 @@ class VNode :
         if self.walSize == 0:
             return True
         
+        time.sleep(2)
         vnodeSize = self.getWalsSize()
-        if vnodeSize < self.walSize:
-            tdLog.info(f" wal size valid. {self.path} real = {vnodeSize} set = {self.walSize} ")
+        # need over 20%
+        if vnodeSize < self.walSize * 1.2:
+            tdLog.info(f" wal size valid. {self.path} real = {vnodeSize} set = {self.walSize} need over 20%")
             return True
         
-        # check valid
-        tdLog.info(f" wal size over set. {self.path} real = {vnodeSize} set = {self.walSize} ")
-        for walFile in self.walFiles:
-            if self.canDelete(walFile):
-                # wait a moment then check file exist
-                time.sleep(1) 
-                if os.path.exists(walFile.pathFile):
-                    tdLog.exit(f"  wal file size over .\
-                           \n   wal file = {walFile.pathFile}\
-                           \n   snapVer  = {self.snapVer}\
-                           \n   real     = {vnodeSize} bytes\
-                           \n   set      = {self.walSize} bytes")
-                return False
-        return True
+        # check over
+        tdLog.exit(f" wal size over set. {self.path} real = {vnodeSize} set = {self.walSize} ")
+        return False
 
 
 # insert by async
diff --git a/tools/shell/src/shellWebsocket.c b/tools/shell/src/shellWebsocket.c
index af7f13c69c..791e2c36ff 100644
--- a/tools/shell/src/shellWebsocket.c
+++ b/tools/shell/src/shellWebsocket.c
@@ -278,7 +278,7 @@ void shellRunSingleCommandWebsocketImp(char *command) {
       }
       if (code == TSDB_CODE_WS_SEND_TIMEOUT
                 || code == TSDB_CODE_WS_RECV_TIMEOUT) {
-        fprintf(stderr, "Hint: use -t to increase the timeout in seconds\n");
+        fprintf(stderr, "Hint: use -T to increase the timeout in seconds\n");
       } else if (code == TSDB_CODE_WS_INTERNAL_ERRO
                     || code == TSDB_CODE_WS_CLOSED) {
         shell.ws_conn = NULL;
-- 
GitLab