This is an automated email from the ASF dual-hosted git repository.

dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new 26cc81f1fa7 [cherry-pick](branch-3.0) Pick "[Fix](test) Fix infinate 
loop in test_cumu_compaction_with_delete case #46719" (#46785)
26cc81f1fa7 is described below

commit 26cc81f1fa7960ff16f2b45754ce8db75a2908ef
Author: abmdocrt <lianyuk...@selectdb.com>
AuthorDate: Sun Jan 12 15:42:35 2025 +0800

    [cherry-pick](branch-3.0) Pick "[Fix](test) Fix infinate loop in 
test_cumu_compaction_with_delete case #46719" (#46785)
    
    
    Pick #46719
---
 .../test_cumu_compaction_with_delete.groovy        | 40 ++++++++++++++--------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git 
a/regression-test/suites/compaction/test_cumu_compaction_with_delete.groovy 
b/regression-test/suites/compaction/test_cumu_compaction_with_delete.groovy
index 2f37403496a..4ac3953f55a 100644
--- a/regression-test/suites/compaction/test_cumu_compaction_with_delete.groovy
+++ b/regression-test/suites/compaction/test_cumu_compaction_with_delete.groovy
@@ -18,7 +18,19 @@
 import org.codehaus.groovy.runtime.IOGroovyMethods
 
 suite("test_cumu_compaction_with_delete") {
-    def tableName = "test_cumu_compaction_with_delete"
+    def backendId_to_backendIP = [:]
+    def backendId_to_backendHttpPort = [:]
+    getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
+
+    def set_be_config = { key, value ->
+        for (String backend_id: backendId_to_backendIP.keySet()) {
+            def (code, out, err) = 
update_be_config(backendId_to_backendIP.get(backend_id), 
backendId_to_backendHttpPort.get(backend_id), key, value)
+            logger.info("update config: code=" + code + ", out=" + out + ", 
err=" + err)
+        }
+    }
+    set_be_config.call("enable_sleep_between_delete_cumu_compaction", "false")
+
+    def tableName = "test_cumu_compaction_with_delete1"
     def check_cumu_point = { cumu_point ->
         def tablets = sql_return_maparray """ show tablets from ${tableName}; 
"""
         int cumuPoint = 0
@@ -56,7 +68,12 @@ suite("test_cumu_compaction_with_delete") {
             if(check_cumu_point(100)){
                 break;
             }
-            Thread.sleep(1000)
+            Thread.sleep(10000)
+
+            def duration = System.currentTimeMillis() - now
+            if(duration > 10 * 60 * 1000) {
+                assertTrue(false)
+            }
         }
         def time_diff = System.currentTimeMillis() - now
         logger.info("time_diff:" + time_diff)
@@ -70,19 +87,9 @@ suite("test_cumu_compaction_with_delete") {
         try_sql("DROP TABLE IF EXISTS ${tableName} FORCE")
     }
 
-    def backendId_to_backendIP = [:]
-    def backendId_to_backendHttpPort = [:]
-    getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
-
-    def set_be_config = { key, value ->
-        for (String backend_id: backendId_to_backendIP.keySet()) {
-            def (code, out, err) = 
update_be_config(backendId_to_backendIP.get(backend_id), 
backendId_to_backendHttpPort.get(backend_id), key, value)
-            logger.info("update config: code=" + code + ", out=" + out + ", 
err=" + err)
-        }
-    }
-
     try {
         set_be_config.call("enable_sleep_between_delete_cumu_compaction", 
"true")
+        tableName = "test_cumu_compaction_with_delete2"
         sql """ DROP TABLE IF EXISTS ${tableName} """
         sql """
             CREATE TABLE ${tableName} (
@@ -105,7 +112,12 @@ suite("test_cumu_compaction_with_delete") {
             if(check_cumu_point(100)){
                 break;
             }
-            Thread.sleep(1000)
+            Thread.sleep(10000)
+
+            def duration = System.currentTimeMillis() - now
+            if(duration > 10 * 60 * 1000) {
+                assertTrue(false)
+            }
         }
         def time_diff = System.currentTimeMillis() - now
         logger.info("time_diff:" + time_diff)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to