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

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


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 66421c42705 [chore](regression test) mv test_report_version_missing to 
p1 #40184 (#40646)
66421c42705 is described below

commit 66421c42705293de52f3a89fd2eaef2def7f1fb1
Author: yujun <yu.jun.re...@gmail.com>
AuthorDate: Wed Sep 11 15:28:23 2024 +0800

    [chore](regression test) mv test_report_version_missing to p1 #40184 
(#40646)
    
    cherry pick from #40184
---
 .../control_p0/test_report_version_missing.groovy  | 82 ---------------------
 .../control_p1/test_report_version_missing.groovy  | 85 ++++++++++++++++++++++
 2 files changed, 85 insertions(+), 82 deletions(-)

diff --git 
a/regression-test/suites/control_p0/test_report_version_missing.groovy 
b/regression-test/suites/control_p0/test_report_version_missing.groovy
deleted file mode 100644
index 675ac52362e..00000000000
--- a/regression-test/suites/control_p0/test_report_version_missing.groovy
+++ /dev/null
@@ -1,82 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-import org.apache.doris.regression.suite.ClusterOptions
-import org.apache.doris.regression.util.NodeType
-
-suite('test_report_version_missing', "nonConcurrent") {
-    if (isCloudMode()) {
-        return
-    }
-    def tableName = "test_set_replica_status_table_in_docker"
-    try {
-    setFeConfig('disable_tablet_scheduler', true)
-    Thread.sleep(2000)
-
-    sql "DROP TABLE IF EXISTS ${tableName}"
-    sql """
-        CREATE TABLE ${tableName} (
-            `id` LARGEINT NOT NULL,
-            `count` LARGEINT SUM DEFAULT "0")
-        AGGREGATE KEY(`id`)
-        DISTRIBUTED BY HASH(`id`) BUCKETS 1
-        PROPERTIES
-        (
-            "replication_num" = "1"
-        )
-        """
-    List<String> values = []
-    for (int i = 1; i <= 10; ++i) {
-        values.add("(${i}, ${i})")
-    }
-    sql """INSERT INTO ${tableName} VALUES ${values.join(",")}"""
-
-    def result = sql_return_maparray """show tablets from ${tableName}"""
-    assertNotNull(result)
-    def tabletId = null
-    for (def res : result) {
-        tabletId = res.TabletId
-        break
-    }
-
-        
GetDebugPoint().enableDebugPointForAllBEs("Tablet.build_tablet_report_info.version_miss",
 [tablet_id:"${tabletId}",version_miss:true])
-        boolean succ = false
-
-        for (int i = 0; i < 3; ++i) {
-            result = sql_return_maparray """show tablets from ${tableName}"""
-            logger.info("show tablets from ${result}, has after ${i} * 60 s")
-            assertNotNull(result)
-            // LstFailedVersion > 0, version missing
-            for (def res : result) {
-                if (res.TabletId.toLong() == tabletId.toLong() && 
res.LstFailedVersion.toLong() > 0) {
-                    succ = true
-                    break
-                }
-            }
-            if (succ) {
-                break
-            }
-            Thread.sleep(60000)
-        }
-        assertTrue(succ)
-        
-    } finally {
-        setFeConfig('disable_tablet_scheduler', false)
-        
GetDebugPoint().disableDebugPointForAllBEs("Tablet.build_tablet_report_info.version_miss")
-        sql "DROP TABLE IF EXISTS ${tableName}"
-    }
-}
diff --git 
a/regression-test/suites/control_p1/test_report_version_missing.groovy 
b/regression-test/suites/control_p1/test_report_version_missing.groovy
new file mode 100644
index 00000000000..63ccd4ed6dd
--- /dev/null
+++ b/regression-test/suites/control_p1/test_report_version_missing.groovy
@@ -0,0 +1,85 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+import org.apache.doris.regression.suite.ClusterOptions
+import org.apache.doris.regression.util.NodeType
+
+import org.awaitility.Awaitility
+import static java.util.concurrent.TimeUnit.SECONDS
+
+suite('test_report_version_missing', 'nonConcurrent,p1') {
+    if (isCloudMode()) {
+        return
+    }
+    def tableName = 'test_set_replica_status_table_in_docker'
+    try {
+        setFeConfig('disable_tablet_scheduler', true)
+        Thread.sleep(2000)
+
+        sql "DROP TABLE IF EXISTS ${tableName}"
+        sql """
+        CREATE TABLE ${tableName} (
+            `id` LARGEINT NOT NULL,
+            `count` LARGEINT SUM DEFAULT "0")
+        AGGREGATE KEY(`id`)
+        DISTRIBUTED BY HASH(`id`) BUCKETS 1
+        PROPERTIES
+        (
+            "replication_num" = "1"
+        )
+        """
+        List<String> values = []
+        for (int i = 1; i <= 10; ++i) {
+            values.add("(${i}, ${i})")
+        }
+        sql """INSERT INTO ${tableName} VALUES ${values.join(',')}"""
+
+        def result = sql_return_maparray """show tablets from ${tableName}"""
+        assertNotNull(result)
+        def tabletId = null
+        for (def res : result) {
+            tabletId = res.TabletId
+            break
+        }
+
+        
GetDebugPoint().enableDebugPointForAllBEs('Tablet.build_tablet_report_info.version_miss',
 [tablet_id:"${tabletId}", version_miss:true])
+        boolean succ = false
+
+        def backendId_to_backendIP = [:]
+        def backendId_to_backendHttpPort = [:]
+        getBackendIpHttpPort(backendId_to_backendIP, 
backendId_to_backendHttpPort)
+
+        backendId_to_backendIP.each { beId, beIp ->
+            def port = backendId_to_backendHttpPort.get(beId) as int
+            be_report_tablet(beIp, port)
+        }
+
+        Awaitility.await().atMost(180, SECONDS).pollInterval(1, 
SECONDS).await().until({
+            def tablets = sql_return_maparray """show tablets from 
${tableName}"""
+            logger.info("show tablets from ${tablets}")
+            assertNotNull(tablets)
+            succ = tablets.any { it.TabletId.toLong() == tabletId.toLong() && 
it.LstFailedVersion.toLong() > 0 }
+            return succ
+        })
+
+        assertTrue(succ)
+    } finally {
+        setFeConfig('disable_tablet_scheduler', false)
+        
GetDebugPoint().disableDebugPointForAllBEs('Tablet.build_tablet_report_info.version_miss')
+        sql "DROP TABLE IF EXISTS ${tableName}"
+    }
+}


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

Reply via email to