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 037de3deddf [Fix](executor)Fix workload policy test #35146
037de3deddf is described below
commit 037de3deddfe1d9f724d165ba63cd2000a3cfcb3
Author: wangbo <wan...@apache.org>
AuthorDate: Tue May 21 19:04:04 2024 +0800
[Fix](executor)Fix workload policy test #35146
---
.../test_workload_sched_policy.groovy | 33 +++++++++++++---------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git
a/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
b/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
index 6dc1a28d463..d3f9b35426a 100644
---
a/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
+++
b/regression-test/suites/workload_manager_p0/test_workload_sched_policy.groovy
@@ -115,7 +115,6 @@ suite("test_workload_sched_policy") {
qt_select_policy_tvf_after_drop "select
name,condition,action,priority,enabled,version from
information_schema.workload_policy where name
in('be_policy','fe_policy','set_action_policy','test_cancel_policy') order by
name;"
// test workload policy
- sql "ADMIN SET FRONTEND CONFIG ('workload_sched_policy_interval_ms' =
'500');"
sql """drop user if exists test_workload_sched_user"""
sql """create user test_workload_sched_user identified by '12345'"""
sql """grant ADMIN_PRIV on *.*.* to test_workload_sched_user"""
@@ -123,36 +122,42 @@ suite("test_workload_sched_policy") {
// 1 create test_set_var_policy
sql """drop workload policy if exists test_set_var_policy;"""
sql """drop workload policy if exists test_set_var_policy2;"""
+ sql "drop workload group if exists test_set_session_wg;"
+ sql "drop workload group if exists test_set_session_wg2;"
+ sql "create workload group test_set_session_wg
properties('cpu_share'='1024');"
+ sql "create workload group test_set_session_wg2
properties('cpu_share'='1024');"
+
sql "create workload policy test_set_var_policy
conditions(username='test_workload_sched_user')" +
- "actions(set_session_variable 'parallel_pipeline_task_num=33');"
+ "actions(set_session_variable
'workload_group=test_set_session_wg');"
+
def result1 = connect(user = 'test_workload_sched_user', password =
'12345', url = context.config.jdbcUrl) {
logger.info("begin sleep 15s to wait")
Thread.sleep(15000)
- sql "show variables like '%parallel_pipeline_task_num%';"
+ sql "show variables like 'workload_group';"
}
- assertEquals("parallel_pipeline_task_num", result1[0][0])
- assertEquals("33", result1[0][1])
+ assertEquals("workload_group", result1[0][0])
+ assertEquals("test_set_session_wg", result1[0][1])
// 2 create test_set_var_policy2 with higher priority
sql "create workload policy test_set_var_policy2
conditions(username='test_workload_sched_user') " +
- "actions(set_session_variable 'parallel_pipeline_task_num=22')
properties('priority'='10');"
+ "actions(set_session_variable
'workload_group=test_set_session_wg2') properties('priority'='10');"
def result2 = connect(user = 'test_workload_sched_user', password =
'12345', url = context.config.jdbcUrl) {
Thread.sleep(3000)
- sql "show variables like '%parallel_pipeline_task_num%';"
+ sql "show variables like 'workload_group';"
}
- assertEquals("parallel_pipeline_task_num", result2[0][0])
- assertEquals("22", result2[0][1])
+ assertEquals("workload_group", result2[0][0])
+ assertEquals("test_set_session_wg2", result2[0][1])
// 3 disable test_set_var_policy2
sql "alter workload policy test_set_var_policy2
properties('enabled'='false');"
def result3 = connect(user = 'test_workload_sched_user', password =
'12345', url = context.config.jdbcUrl) {
Thread.sleep(3000)
- sql "show variables like '%parallel_pipeline_task_num%';"
+ sql "show variables like 'workload_group';"
}
- assertEquals("parallel_pipeline_task_num", result3[0][0])
- assertEquals("33", result3[0][1])
-
- sql "ADMIN SET FRONTEND CONFIG ('workload_sched_policy_interval_ms' =
'10000');"
+ assertEquals("workload_group", result3[0][0])
+ assertEquals("test_set_session_wg", result3[0][1])
+ sql "drop workload group if exists test_set_session_wg;"
+ sql "drop workload group if exists test_set_session_wg2;"
sql "drop workload policy if exists test_set_var_policy;"
sql "drop workload policy if exists test_set_var_policy2;"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
