This is an automated email from the ASF dual-hosted git repository.
morningman 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 8d46f0e1384 [fix](manager)fix manager insterface case.(#37082) (#37317)
8d46f0e1384 is described below
commit 8d46f0e1384c56e2c2feb7831ae9e5e73cf0014c
Author: daidai <2017501...@qq.com>
AuthorDate: Tue Jul 9 10:42:22 2024 +0800
[fix](manager)fix manager insterface case.(#37082) (#37317)
bp #37082
---
.../suites/manager/test_manager_interface_1.groovy | 41 +++++++++++++++-------
.../suites/manager/test_manager_interface_2.groovy | 12 +++++--
2 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/regression-test/suites/manager/test_manager_interface_1.groovy
b/regression-test/suites/manager/test_manager_interface_1.groovy
index 55d9f655453..880680959ce 100644
--- a/regression-test/suites/manager/test_manager_interface_1.groovy
+++ b/regression-test/suites/manager/test_manager_interface_1.groovy
@@ -322,13 +322,11 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
);"""
List<List<Object>> result = sql """ show create table
test_manager_tb_2 """
+ println result
assertTrue(result.size() == 1)
assertTrue(result[0][0] == "test_manager_tb_2")
def ddl_str = result[0][1]
- def idx = ddl_str.indexOf("replication_allocation")
- assertTrue(
ddl_str.substring(idx,ddl_str.length()).startsWith("""replication_allocation" =
"tag.location.default: 1"""))
-
- idx = ddl_str.indexOf("min_load_replica_num")
+ def idx = ddl_str.indexOf("min_load_replica_num")
assertTrue(
ddl_str.substring(idx,ddl_str.length()).startsWith("""min_load_replica_num" =
"-1"""))
sql """alter table test_manager_tb_2 set ("min_load_replica_num" =
"1")"""
@@ -370,6 +368,8 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
List<List<Object>> result = sql """ show table status from
test_manager_tb_case_3 like 'test_manager_tb%' """
+ println result
+
println result[0][4]
assertTrue(result[0][4] == 0 )// Rows
@@ -414,7 +414,7 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
sleep(10000)
}
if (j == retryTime) {
-
+ println result
logger.info(" TEST show table status from $db_name like
'$table_name';ROWS UPDATE FAIL.");
assertTrue(false);
}
@@ -448,6 +448,7 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
List<List<Object>> result = sql """ insert into test_manager_tb
values (5,"hell0",50); """
+ println result
assertTrue(result[0][0] == 1)
result = sql """ insert into test_manager_tb values (5,"hell0",50);
"""
assertTrue(result[0][0] == 1)
@@ -470,6 +471,7 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
}
sleep(1000);
}
+ println result
if (j == retryTime) {
logger.info(" TEST show index from '$table_name' FAIL.");
@@ -511,7 +513,7 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
futures.add( thread {
try{
- sql """ select sleep(9809); """
+ sql """ select sleep(4.809); """
}catch(Exception e){
}
@@ -519,12 +521,13 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
futures.add( thread {
sleep(1000);
List<List<Object>> result = sql """ show proc
'/current_query_stmts' """
+ println result
def x = 0
def queryid = ""
logger.info("result = ${result}")
for( int i = 0;i<result.size();i++) {
- if (result[i][7] != null &&
result[i][7].contains("sleep(9809)") )//Statement
+ if (result[i][7] != null &&
result[i][7].contains("sleep(4.809)") )//Statement
{
x = 1
queryid = result[i][0]
@@ -543,6 +546,7 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
x = 0
result = sql """ show proc '/current_queries' """
+ println result
logger.info("result = ${result}")
for( int i = 0;i<result.size();i++) {
if (result[i][0] == queryid )//QueryId
@@ -555,6 +559,7 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
assertTrue(x == 1)
result = sql """ show processlist """
+ println result
logger.info("result = ${result}")
for( int i =0 ;i < result.size();i++ ){
assertTrue( result[i][2].toLowerCase() != "null" )//User
@@ -574,6 +579,7 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
sleep(5000)
result = sql """ show proc '/current_queries' """
+ println result
logger.info("result = ${result}")
for( int i = 0;i<result.size();i++) {
if (result[i][0] == queryid )//QueryId
@@ -591,6 +597,8 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
def total_tablet_num = 0;
def total_healthy_num = 0;
result = sql """ SHOW PROC '/cluster_health/tablet_health' """
+ println result
+
for( int i =0 ;i < result.size();i++ ){
assertTrue(result[i][0].toLowerCase() != null ) // DbId
if (result[i][0].toLowerCase() == "total") {
@@ -624,13 +632,13 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
futures.add( thread {
try{
- sql """ select sleep(87676); """
+ sql """ select sleep(4.7676); """
}catch(Exception e){
}
})
futures.add( thread {
- sleep(3000)
+ sleep(1500)
result = sql """
select a.*, b.*, c.NAME as WORKLOAD_GROUP_NAME from
information_schema.active_queries a left join
@@ -643,7 +651,7 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
for( int i =0 ;i < result.size();i++ ){
assertTrue(result[i][0] != null ) // QueryId
- if ( result[i][9].contains("sleep(87676)") ){
+ if ( result[i][9].contains("sleep(4.7676)") ){
x = 1
queryId = result[i][0]
logger.info("result = ${queryId}}")
@@ -672,6 +680,7 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
sql """ set global enable_audit_plugin = true; """
List<List<Object>> result =sql """ show create table
__internal_schema.audit_log; """
+ println result
assertTrue(result[0][0] == "audit_log")
@@ -724,6 +733,8 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
List<List<Object>> result = sql """
admin show frontend config
"""
+ println result
+
def x = 0;
def val = 0;
@@ -744,6 +755,8 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
result = sql """
admin show frontend config
"""
+ println result
+
x = 0
for(int i = 0 ;i<result.size();i++) {
if (result[i][0] == "query_metadata_name_ids_timeout"){
@@ -758,20 +771,24 @@ DISTRIBUTED BY HASH(`k1`) BUCKETS 1"""))
val -= 2
sql """ admin set frontend config("query_metadata_name_ids_timeout"=
"${val}")"""
-
+ println result
x = 0
result = sql """ show global variables like
"create_table_partition_max_num" """
+ println result
+
assert(result[0][0] == "create_table_partition_max_num")
val = result[0][1].toBigInteger() + 1 ;
assert(result[0][2] == "10000")
sql """ set global create_table_partition_max_num = ${val} """
result = sql """ show global variables like
"create_table_partition_max_num" """
+ println result
+
assert(result[0][1].toBigInteger() == val)
val -= 1
sql """ set global create_table_partition_max_num = ${val} """
-
+ println result
result = sql """ show frontend config """
x = 0
diff --git a/regression-test/suites/manager/test_manager_interface_2.groovy
b/regression-test/suites/manager/test_manager_interface_2.groovy
index 329285364d7..ab3f51eb9e5 100644
--- a/regression-test/suites/manager/test_manager_interface_2.groovy
+++ b/regression-test/suites/manager/test_manager_interface_2.groovy
@@ -90,9 +90,11 @@ suite('test_manager_interface_2',"p0") {
"""
List<List<Object>> result = sql """ show partitions from
test_manager_tb """
-
+ println result
for( int i =0 ; i <result.size();i++) {
assertTrue( result[i][1] in ["less100","less200","less2000"])
+
+ println result[i][1] + ".ReplicationNum = " + result[i][9]
assertTrue( result[i][9].toBigInteger() == 1) // ReplicationNum
}
@@ -181,10 +183,11 @@ suite('test_manager_interface_2',"p0") {
sql """ALTER SYSTEM ADD BACKEND "${address}:${notExistPort}";"""
result = sql """SHOW BACKENDS;"""
-
+ println result
def x = 0
for(int i =0 ;i<result.size();i++) {
//HeartbeatPort:
+
if (result[i][2].toBigInteger() == notExistPort) {
assertTrue(result[i][0]!=null)//name
@@ -222,6 +225,7 @@ suite('test_manager_interface_2',"p0") {
sql """ALTER SYSTEM MODIFY BACKEND "${address}:${notExistPort}" SET
("disable_query" = "true"); """
sql """ALTER SYSTEM MODIFY BACKEND "${address}:${notExistPort}" SET
("disable_load" = "true"); """
result = sql """SHOW BACKENDS;"""
+ println result
x = 0
for(int i =0 ;i<result.size();i++) {
//HeartbeatPort:
@@ -248,7 +252,8 @@ suite('test_manager_interface_2',"p0") {
assertTrue(x==0)
- result = sql """ SHOW FRONTENDS """
+ result = sql """ SHOW FRONTENDS """
+ println result
x = 0
for(int i =0 ;i<result.size();i++) {
if (result[i][18]=="Yes") {
@@ -288,6 +293,7 @@ suite('test_manager_interface_2',"p0") {
sql """ALTER SYSTEM ADD BROKER test_manager_broker
"${address}:${notExistPort}";"""
result = sql """ show broker """
x = 0
+ println result
for ( int i =0 ;i<result.size();i++){
assertTrue(result[i][3] in ["true","false"])//Alive
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
