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 03cfd7915e1 [fix](regression test) fix test_tvf (#41792) (#41870)
03cfd7915e1 is described below

commit 03cfd7915e184ecf2052de4480e629a5e53a0a4e
Author: yujun <[email protected]>
AuthorDate: Wed Oct 16 09:46:38 2024 +0800

    [fix](regression test) fix test_tvf (#41792) (#41870)
    
    cherry pick from #41792
---
 regression-test/conf/regression-conf.groovy                       | 5 +++++
 .../cloud_p0/multi_cluster/test_fe_tablet_same_backend.groovy     | 8 ++++----
 regression-test/suites/cloud_p0/multi_cluster/test_tvf.groovy     | 5 +----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/regression-test/conf/regression-conf.groovy 
b/regression-test/conf/regression-conf.groovy
index 5fcdb97e371..ab8151e49e9 100644
--- a/regression-test/conf/regression-conf.groovy
+++ b/regression-test/conf/regression-conf.groovy
@@ -241,3 +241,8 @@ enableTrinoConnectorTest = false
 enableKerberosTest=false
 kerberosHmsPort=9883
 kerberosHdfsPort=8820
+
+// cloud
+metaServiceToken = "greedisgood9999"
+instanceId = "default_instance_id"
+multiClusterInstance = "default_instance_id"
diff --git 
a/regression-test/suites/cloud_p0/multi_cluster/test_fe_tablet_same_backend.groovy
 
b/regression-test/suites/cloud_p0/multi_cluster/test_fe_tablet_same_backend.groovy
index 9ef469ec6fe..13e67bd0b48 100644
--- 
a/regression-test/suites/cloud_p0/multi_cluster/test_fe_tablet_same_backend.groovy
+++ 
b/regression-test/suites/cloud_p0/multi_cluster/test_fe_tablet_same_backend.groovy
@@ -98,7 +98,7 @@ suite('test_fe_tablet_same_backend', 'multi_cluster,docker') {
     }
 
     def checkAllTable = { isAllBeAliveOrDeadLong ->
-        dockerAwaitUntil(30) {
+        dockerAwaitUntil(50) {
             checkAllTableImpl(isAllBeAliveOrDeadLong, true)
         }
         checkAllTableImpl(isAllBeAliveOrDeadLong, false)
@@ -127,8 +127,8 @@ suite('test_fe_tablet_same_backend', 
'multi_cluster,docker') {
         // all fe alive
         checkAllTable(true)
 
+        dockerAwaitUntil(30) {
         cluster.stopBackends(choseDeadBeIndex)
-        dockerAwaitUntil(10) {
             def chosenBe = cluster.getBeByIndex(choseDeadBeIndex)
             !chosenBe.alive
         }
@@ -144,13 +144,13 @@ suite('test_fe_tablet_same_backend', 
'multi_cluster,docker') {
 
         def choseRestartFeIndex = cluster.getOneFollowerFe().index
         cluster.stopFrontends(choseRestartFeIndex)
-        dockerAwaitUntil(10) {
+        dockerAwaitUntil(30) {
             def chosenFe = cluster.getFeByIndex(choseRestartFeIndex)
             !chosenFe.alive
         }
 
         cluster.startFrontends(choseRestartFeIndex)
-        dockerAwaitUntil(10) {
+        dockerAwaitUntil(30) {
             def chosenFe = cluster.getFeByIndex(choseRestartFeIndex)
             chosenFe.alive
         }
diff --git a/regression-test/suites/cloud_p0/multi_cluster/test_tvf.groovy 
b/regression-test/suites/cloud_p0/multi_cluster/test_tvf.groovy
index 68b89b6f3d6..09b19fa364b 100644
--- a/regression-test/suites/cloud_p0/multi_cluster/test_tvf.groovy
+++ b/regression-test/suites/cloud_p0/multi_cluster/test_tvf.groovy
@@ -18,10 +18,7 @@
 import org.apache.doris.regression.suite.ClusterOptions
 import groovy.json.JsonSlurper
 
-suite('test_tvf_in_cloud', 'multi_cluster,docker') {
-    if (!isCloudMode()) {
-        return;
-    }
+suite('test_tvf', 'multi_cluster,docker') {
     def options = new ClusterOptions()
     options.feConfigs += [
         'cloud_cluster_check_interval_second=1',


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to