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 d0a9e5656dc [fix](auth)Add some log in auth case (#38289)
d0a9e5656dc is described below
commit d0a9e5656dcfa62c44a671a6fcb208bb96823f46
Author: zfr95 <87513668+zfr9...@users.noreply.github.com>
AuthorDate: Thu Jul 25 14:46:01 2024 +0800
[fix](auth)Add some log in auth case (#38289)
pick from master #37362
## Proposed changes
[fix](auth)Add some log in auth case
---
.../test_master_slave_consistency_auth.groovy | 49 ++++++++++++++--------
1 file changed, 31 insertions(+), 18 deletions(-)
diff --git
a/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
b/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
index 33fbbdeccb7..acb59e74326 100644
--- a/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
+++ b/regression-test/suites/auth_p0/test_master_slave_consistency_auth.groovy
@@ -19,8 +19,9 @@ suite ("test_follower_consistent_auth","p0,auth") {
def get_follower_ip = {
def result = sql """show frontends;"""
+ logger.info("result:" + result)
for (int i = 0; i < result.size(); i++) {
- if (result[i][7] == "FOLLOWER" && result[i][8] == "false") {
+ if (result[i][7] == "FOLLOWER" && result[i][8] == "false" &&
result[i][11] == "true") {
return result[i][1]
}
}
@@ -29,7 +30,10 @@ suite ("test_follower_consistent_auth","p0,auth") {
def switch_ip = get_follower_ip()
if (switch_ip != "null") {
logger.info("switch_ip: " + switch_ip)
- def new_jdbc_url = context.config.jdbcUrl.replaceAll(/\/\/[0-9.]+:/,
"//${switch_ip}:")
+
+ def tokens = context.config.jdbcUrl.split('/')
+ def url_tmp1 = tokens[0] + "//" + tokens[2] + "/" +
"information_schema" + "?"
+ def new_jdbc_url = url_tmp1.replaceAll(/\/\/[0-9.]+:/,
"//${switch_ip}:")
logger.info("new_jdbc_url: " + new_jdbc_url)
String user = 'test_follower_consistent_user'
@@ -101,8 +105,17 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql """refresh MATERIALIZED VIEW ${dbName}.${mtmv_name} auto"""
sql """grant select_priv on regression_test to ${user}"""
+ //cloud-mode
+ if (isCloudMode()) {
+ def clusters = sql " SHOW CLUSTERS; "
+ assertTrue(!clusters.isEmpty())
+ def validCluster = clusters[0][0]
+ sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+ }
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ logger.info("url_tmp1:" + url_tmp1)
+ logger.info("new_jdbc_url:" + new_jdbc_url)
+ connect(user=user, password="${pwd}", url=url_tmp1) {
try {
sql "SHOW CATALOG RECYCLE BIN WHERE NAME = '${catalog_name}'"
} catch (Exception e) {
@@ -118,7 +131,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
assertTrue(e.getMessage().contains("denied"))
}
}
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
try {
sql "SHOW DATA"
} catch (Exception e) {
@@ -135,7 +148,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
}
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
try {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
@@ -152,7 +165,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
}
sql """grant select_priv(username) on ${dbName}.${tableName} to
${user}"""
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
sql "select username from ${dbName}.${tableName}"
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -160,7 +173,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
try {
sql "select username from ${dbName}.${view_name}"
} catch (Exception e) {
@@ -177,7 +190,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
}
sql """grant select_priv(username) on ${dbName}.${view_name} to
${user}"""
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
sql "select username from ${dbName}.${view_name}"
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -185,7 +198,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
try {
sql "select username from ${dbName}.${mtmv_name}"
} catch (Exception e) {
@@ -202,7 +215,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
}
sql """grant select_priv(username) on ${dbName}.${mtmv_name} to
${user}"""
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
sql "select username from ${dbName}.${mtmv_name}"
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -215,7 +228,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
// user
sql """grant select_priv on ${dbName}.${tableName} to ${user}"""
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
sql "select username from ${dbName}.${tableName}"
}
connect(user=user, password="${pwd}", url=new_jdbc_url) {
@@ -223,7 +236,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
sql """revoke select_priv on ${dbName}.${tableName} from ${user}"""
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
try {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
@@ -244,7 +257,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
sql """grant select_priv on ${dbName}.${tableName} to ROLE '${role}'"""
sql """grant Load_priv on ${dbName}.${tableName} to ROLE '${role}'"""
sql """grant '${role}' to '${user}'"""
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
sql "select username from ${dbName}.${tableName}"
sql """insert into ${dbName}.`${tableName}` values (4, "444")"""
}
@@ -254,7 +267,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
sql """revoke '${role}' from '${user}'"""
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
try {
sql "select username from ${dbName}.${tableName}"
} catch (Exception e) {
@@ -273,7 +286,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
// workload group
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
sql """set workload_group = '${wg}';"""
try {
sql "select username from ${dbName}.${tableName}"
@@ -292,7 +305,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
}
sql """GRANT USAGE_PRIV ON WORKLOAD GROUP '${wg}' TO '${user}';"""
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
sql """set workload_group = '${wg}';"""
sql """select username from ${dbName}.${tableName}"""
}
@@ -302,7 +315,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
}
// resource group
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
def res = sql """SHOW RESOURCES;"""
assertTrue(res == [])
}
@@ -311,7 +324,7 @@ suite ("test_follower_consistent_auth","p0,auth") {
assertTrue(res == [])
}
sql """GRANT USAGE_PRIV ON RESOURCE ${rg} TO ${user};"""
- connect(user=user, password="${pwd}", url=context.config.jdbcUrl) {
+ connect(user=user, password="${pwd}", url=url_tmp1) {
def res = sql """SHOW RESOURCES;"""
assertTrue(res.size == 10)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
