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 909ed0efebd [fix](vcg docker case) Fix case due to dockerAwaitUntil
func removed (#53758)
909ed0efebd is described below
commit 909ed0efebdafd175c8129120b5046e36e2899f7
Author: deardeng <[email protected]>
AuthorDate: Wed Jul 23 20:04:58 2025 +0800
[fix](vcg docker case) Fix case due to dockerAwaitUntil func removed
(#53758)
---
.../multi_cluster/virtual_compute_group/test_vcg.groovy | 16 ++++++++--------
.../virtual_compute_group/test_vcg_metrics.groovy | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/test_vcg.groovy
b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/test_vcg.groovy
index 74aef9e628e..88cb8ed4e1d 100644
---
a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/test_vcg.groovy
+++
b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/test_vcg.groovy
@@ -198,7 +198,7 @@ suite('test_vcg', 'multi_cluster,docker') {
// test manual cancel warm up job, generate new jobs
sql """CANCEL WARM UP JOB WHERE ID=${showWarmup[0].JobId}"""
- dockerAwaitUntil(50, 3) {
+ awaitUntil(50, 3) {
showWarmup = sql_return_maparray """SHOW WARM UP JOB"""
// cancel 2, generate 2
showWarmup.size() == 4
@@ -295,7 +295,7 @@ suite('test_vcg', 'multi_cluster,docker') {
assertTrue(json.code.equalsIgnoreCase("OK"))
}
- dockerAwaitUntil(20) {
+ awaitUntil(20) {
showComputeGroup = sql_return_maparray """ SHOW COMPUTE GROUPS
"""
log.info("show compute group after alter {}", showComputeGroup)
vcgInShow = showComputeGroup.find { it.Name ==
normalVclusterName }
@@ -307,7 +307,7 @@ suite('test_vcg', 'multi_cluster,docker') {
assertTrue(vcgInShow.Policy.contains('"activeComputeGroup":"newcluster2","standbyComputeGroup":"newcluster1"'))
// alter active -> sync to fe -> cancel old jobs -> generate new
jobs
// -> sync to ms -> sync to fe -> save new jobs
- dockerAwaitUntil(50, 3) {
+ awaitUntil(50, 3) {
showWarmup = sql_return_maparray """SHOW WARM UP JOB"""
// cancel 2, generate 2
showWarmup.size() == 6
@@ -326,7 +326,7 @@ suite('test_vcg', 'multi_cluster,docker') {
cluster.stopBackends(6)
// test warm up job destory and generate new jobs
- dockerAwaitUntil(50, 3) {
+ awaitUntil(50, 3) {
sql """USE @${normalVclusterName}"""
sql """select count(*) from ${tbl}"""
showComputeGroup = sql_return_maparray """ SHOW COMPUTE GROUPS
"""
@@ -337,7 +337,7 @@ suite('test_vcg', 'multi_cluster,docker') {
assertEquals(showWarmup.size(), 6)
cluster.startBackends(6)
- dockerAwaitUntil(50, 3) {
+ awaitUntil(50, 3) {
showWarmup = sql_return_maparray """SHOW WARM UP JOB"""
showWarmup.size() == 8
}
@@ -350,7 +350,7 @@ suite('test_vcg', 'multi_cluster,docker') {
// test rename vcg
def newNormalVclusterName = "newNormalVirtualClusterName"
rename_cloud_cluster.call(newNormalVclusterName, normalVclusterId,
ms)
- dockerAwaitUntil(20) {
+ awaitUntil(20) {
showComputeGroup = sql_return_maparray """ SHOW COMPUTE GROUPS
"""
log.info("show compute group after rename {}",
showComputeGroup)
vcgInShow = showComputeGroup.find { it.Name ==
normalVclusterName }
@@ -365,7 +365,7 @@ suite('test_vcg', 'multi_cluster,docker') {
// rename back to
rename_cloud_cluster.call(normalVclusterName, normalVclusterId, ms)
- dockerAwaitUntil(20) {
+ awaitUntil(20) {
showComputeGroup = sql_return_maparray """ SHOW COMPUTE GROUPS
"""
log.info("show compute group after rename back {}",
showComputeGroup)
vcgInShow = showComputeGroup.find { it.Name ==
normalVclusterName }
@@ -393,7 +393,7 @@ suite('test_vcg', 'multi_cluster,docker') {
jsonObject = jsonSlurper.parseText(tag)
cloudClusterId = jsonObject.compute_group_id
drop_cluster(clusterName2, cloudClusterId, ms)
- dockerAwaitUntil(20) {
+ awaitUntil(20) {
def showRet = sql """SHOW COMPUTE GROUPS"""
log.info("show cgs: {}", showRet)
showRet.size() == 2
diff --git
a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/test_vcg_metrics.groovy
b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/test_vcg_metrics.groovy
index 9939539568c..b698799b753 100644
---
a/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/test_vcg_metrics.groovy
+++
b/regression-test/suites/cloud_p0/multi_cluster/virtual_compute_group/test_vcg_metrics.groovy
@@ -139,7 +139,7 @@ suite('test_vcg_metrics', 'multi_cluster,docker') {
cluster.stopBackends(4, 5)
// test warm up job destory and generate new jobs
- dockerAwaitUntil(50, 3) {
+ awaitUntil(50, 3) {
sql """USE @${normalVclusterName}"""
sql """select count(*) from ${tbl}"""
showComputeGroup = sql_return_maparray """ SHOW COMPUTE GROUPS
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
