From d8361e979c50911b281ae1b6237b75ab65e79f84 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Thu, 22 Feb 2024 16:47:27 +0800
Subject: [PATCH] fix: add check s3 upload over logic

---
 tests/army/enterprise/s3/s3_basic.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tests/army/enterprise/s3/s3_basic.py b/tests/army/enterprise/s3/s3_basic.py
index 58dbd12d7b..5d9a52ebc4 100644
--- a/tests/army/enterprise/s3/s3_basic.py
+++ b/tests/army/enterprise/s3/s3_basic.py
@@ -81,15 +81,23 @@ class TDTestCase(TBase):
         cmd = f"ls {rootPath}/dnode1/data20/vnode/vnode*/tsdb/*.data"
         tdLog.info(cmd)
         loop = 0
-        while len(eos.runRetList(cmd)) > 0 and loop < 100:
-            time.sleep(5)
+        rets = []
+        while loop < 500:
+            rets = eos.runRetList(cmd)
+            cnt = len(rets)
+            if cnt == 0:
+                tdLog.info("All data file upload to server over.")
+                break
+            time.sleep(3)
             self.trimDb(True)
             loop += 1
-            tdLog.info(f"loop={loop} wait 5s...")
+            tdLog.info(f"loop={loop} data files have {cnt} wait 5s...")
             if loop == 4:
                 sc.dnodeStop(1)
                 time.sleep(2)
                 sc.dnodeStart(1)
+        if len(rets) > 0:
+            tdLog.exit(f"s3 can not upload all data to server. data files={rets}")
 
     def checkStreamCorrect(self):
         sql = f"select count(*) from {self.db}.stm1"