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 93b11c71295 branch-3.0: [fix](docker case) Fix some docker case due to
`defined global variables in script are not allowed` #50976 (#51167)
93b11c71295 is described below
commit 93b11c7129596b57726ea08a4f6fac0ec564bd1f
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat May 24 10:53:42 2025 +0800
branch-3.0: [fix](docker case) Fix some docker case due to `defined global
variables in script are not allowed` #50976 (#51167)
Cherry-picked from #50976
Co-authored-by: deardeng <[email protected]>
---
.../cloud_p0/auth/test_set_default_cluster.groovy | 6 ++---
.../multi_cluster/test_no_cluster_hits.groovy | 29 +++++++++++++---------
.../node_mgr/test_rename_compute_group.groovy | 4 +--
3 files changed, 22 insertions(+), 17 deletions(-)
diff --git
a/regression-test/suites/cloud_p0/auth/test_set_default_cluster.groovy
b/regression-test/suites/cloud_p0/auth/test_set_default_cluster.groovy
index 2dad8283cc6..e5bb053e683 100644
--- a/regression-test/suites/cloud_p0/auth/test_set_default_cluster.groovy
+++ b/regression-test/suites/cloud_p0/auth/test_set_default_cluster.groovy
@@ -55,13 +55,13 @@ suite("test_default_cluster", "docker") {
setAndCheckDefaultCluster validCluster
// user1
- connectInDocker(user = user1, password = 'Cloud123456') {
+ connectInDocker(user1, 'Cloud123456') {
setAndCheckDefaultCluster validCluster
def ret = sql """show grants"""
log.info("ret = {}", ret)
}
- connectInDocker(user = user2, password = 'Cloud123456') {
+ connectInDocker(user2, 'Cloud123456') {
//java.sql.SQLException: errCode = 2, detailMessage = set default
compute group failed, user default_user2 has no permission to use compute group
'compute_cluster', please
//grant use privilege first , ComputeGroupException:
CURRENT_USER_NO_AUTH_TO_USE_COMPUTE_GROUP, you canuse SQL `GRANT USAGE_PRIV ON
COMPUTE GROUP {compute_group_name} TO
//{user}`
@@ -85,7 +85,7 @@ suite("test_default_cluster", "docker") {
// admin clean
sql """set property for $user2 'DEFAULT_CLOUD_CLUSTER' = '' """
- connectInDocker(user = user2, password = 'Cloud123456') {
+ connectInDocker(user2, 'Cloud123456') {
// user set himself
setAndCheckDefaultCluster validCluster
sql """set property 'DEFAULT_CLOUD_CLUSTER' = '' """
diff --git
a/regression-test/suites/cloud_p0/multi_cluster/test_no_cluster_hits.groovy
b/regression-test/suites/cloud_p0/multi_cluster/test_no_cluster_hits.groovy
index e5dc6197994..e1761a061ba 100644
--- a/regression-test/suites/cloud_p0/multi_cluster/test_no_cluster_hits.groovy
+++ b/regression-test/suites/cloud_p0/multi_cluster/test_no_cluster_hits.groovy
@@ -29,7 +29,8 @@ suite('test_no_cluster_hits', 'multi_cluster, docker') {
'cloud_cluster_check_interval_second=1',
'sys_log_verbose_modules=org',
'max_query_retry_time=2000',
- 'heartbeat_interval_second=1'
+ 'heartbeat_interval_second=1',
+ 'workload_group_check_interval_ms=1'
]
options.setFeNum(3)
options.setBeNum(3)
@@ -56,7 +57,7 @@ suite('test_no_cluster_hits', 'multi_cluster, docker') {
// no cluster auth
sql """GRANT SELECT_PRIV ON *.*.* TO ${user}"""
try {
- connectInDocker(user = user, password = '') {
+ connectInDocker(user, '') {
// errCode = 2, detailMessage = the user is not granted
permission to the compute group,
// ComputeGroupException:
CURRENT_USER_NO_AUTH_TO_USE_ANY_COMPUTE_GROUP, you can contact the system
administrator and request that they grant you the appropriate compute group
permissions, use SQL `GRANT USAGE_PRIV ON COMPUTE GROUP {compute_group_name} TO
{user}
sql """select * from information_schema.columns"""
@@ -70,7 +71,7 @@ suite('test_no_cluster_hits', 'multi_cluster, docker') {
logger.info("show cluster1 : {}", result)
def currentCluster = result.stream().filter(cluster ->
cluster.is_current == "TRUE").findFirst().orElse(null)
sql """GRANT USAGE_PRIV ON COMPUTE GROUP ${currentCluster.cluster} TO
$user"""
- connectInDocker(user = user, password = '') {
+ connectInDocker(user, '') {
try {
sql """select * from information_schema.columns"""
} catch (Exception e) {
@@ -92,8 +93,13 @@ suite('test_no_cluster_hits', 'multi_cluster, docker') {
"""
} catch (Exception e) {
logger.info("exception: {}", e.getMessage())
- assertTrue(e.getMessage().contains("ComputeGroupException:
COMPUTE_GROUPS_NO_ALIVE_BE"))
- assertTrue(e.getMessage().contains("are in an abnormal state"))
+ // assertTrue(e.getMessage().contains("ComputeGroupException:
COMPUTE_GROUPS_NO_ALIVE_BE"))
+ // assertTrue(e.getMessage().contains("are in an abnormal state"))
+
+ // The new optimizer code modifies the path and returns a
different exception message
+ // exception: errCode = 2, detailMessage = No backend available as
scan node, please check the status of your
+// backends.[1747384136706: not alive, 1747384136705: not alive,
1747384136704: not alive]
+ assertTrue(e.getMessage().contains("No backend available as scan
node"))
}
try {
@@ -116,15 +122,15 @@ suite('test_no_cluster_hits', 'multi_cluster, docker') {
sql """REVOKE USAGE_PRIV ON COMPUTE GROUP ${currentCluster.cluster}
from $user"""
try {
- connectInDocker(user = user, password = '') {
+ connectInDocker(user, '') {
sql """SET PROPERTY FOR '${user}' 'default_cloud_cluster' =
'${currentCluster.cluster}'"""
- // errCode = 2, detailMessage = tablet 10901 err: default
cluster compute_cluster check auth failed, ComputeGroupException:
CURRENT_USER_NO_AUTH_TO_USE_DEFAULT_COMPUTE_GROUP
+ //errCode = 2, detailMessage = set default compute group
failed, user test_no_cluster_hits_user has no permission to use compute group
'compute_cluster', please grant use privilege first , ComputeGroupException:
CURRENT_USER_NO_AUTH_TO_USE_COMPUTE_GROUP, you canuse SQL `GRANT USAGE_PRIV ON
COMPUTE GROUP {compute_group_name} TO {user}`
sql """select * from $table"""
}
} catch (Exception e) {
logger.info("exception: {}", e.getMessage())
- assertTrue(e.getMessage().contains("ComputeGroupException:
CURRENT_USER_NO_AUTH_TO_USE_DEFAULT_COMPUTE_GROUP"))
- assertTrue(e.getMessage().contains("check auth failed"))
+ assertTrue(e.getMessage().contains("ComputeGroupException:
CURRENT_USER_NO_AUTH_TO_USE_COMPUTE_GROUP"))
+ assertTrue(e.getMessage().contains("set default compute group
failed"))
}
// no cluster
@@ -146,14 +152,13 @@ suite('test_no_cluster_hits', 'multi_cluster, docker') {
}
try {
- // errCode = 2, detailMessage = tablet 10916 err: The current
compute group compute_cluster is not registered in the system,
ComputeGroupException: CURRENT_COMPUTE_GROUP_NOT_EXIST, you can contact the
administrator to confirm if the current compute group has been dropped
+ // errCode = 2, detailMessage = Can not find compute
group:compute_cluster
sql """
select * from $table
"""
} catch (Exception e) {
logger.info("exception: {}", e.getMessage())
- assertTrue(e.getMessage().contains("ComputeGroupException:
CURRENT_COMPUTE_GROUP_NOT_EXIST"))
- assertTrue(e.getMessage().contains("is not registered in the
system"))
+ assertTrue(e.getMessage().contains("Can not find compute group"))
}
}
}
diff --git
a/regression-test/suites/cloud_p0/node_mgr/test_rename_compute_group.groovy
b/regression-test/suites/cloud_p0/node_mgr/test_rename_compute_group.groovy
index 35c90c2713d..92077c679e5 100644
--- a/regression-test/suites/cloud_p0/node_mgr/test_rename_compute_group.groovy
+++ b/regression-test/suites/cloud_p0/node_mgr/test_rename_compute_group.groovy
@@ -108,7 +108,7 @@ suite('test_rename_compute_group', 'docker, p0') {
assertTrue(e.getMessage().contains("compute group 'newcluster1'
has existed in warehouse, unable to rename"))
}
// 4. test admin user can rename compute group
- connectInDocker(user = user1, password = 'Cloud123456') {
+ connectInDocker(user1, 'Cloud123456') {
sql """ALTER SYSTEM RENAME COMPUTE GROUP compute_cluster
compute_cluster1;"""
sql """sync"""
result = sql_return_maparray """SHOW COMPUTE GROUPS;"""
@@ -139,7 +139,7 @@ suite('test_rename_compute_group', 'docker, p0') {
}
// 5. test non admin user can't rename compute group
- connectInDocker(user = user2, password = 'Cloud123456') {
+ connectInDocker(user2, 'Cloud123456') {
try {
sql """ALTER SYSTEM RENAME COMPUTE GROUP compute_cluster1
compute_cluster2;"""
} catch (Exception e ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
