This is an automated email from the ASF dual-hosted git repository.
wangbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 9870817def6 add query queue regression test (#27613)
9870817def6 is described below
commit 9870817def6e5039dfd9f84a6bcf8cd6e5e41e1e
Author: wangbo <wan...@apache.org>
AuthorDate: Wed Nov 29 10:00:20 2023 +0800
add query queue regression test (#27613)
---
.../resource/workloadgroup/WorkloadGroupMgr.java | 2 +-
.../workload_manager_p0/test_curd_wlg.groovy | 26 ++++++++++++++++++++--
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
index 26b11f0cb85..290bfd548f6 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
@@ -183,7 +183,7 @@ public class WorkloadGroupMgr implements Writable,
GsonPostProcessable {
return;
}
Map<String, String> properties = Maps.newHashMap();
- properties.put(WorkloadGroup.CPU_SHARE, "10");
+ properties.put(WorkloadGroup.CPU_SHARE, "1024");
properties.put(WorkloadGroup.MEMORY_LIMIT, "30%");
properties.put(WorkloadGroup.ENABLE_MEMORY_OVERCOMMIT, "true");
defaultWorkloadGroup = WorkloadGroup.create(DEFAULT_GROUP_NAME,
properties);
diff --git a/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
b/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
index 7fda3064e11..debc4442760 100644
--- a/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
+++ b/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
@@ -46,13 +46,13 @@ suite("test_crud_wlg") {
sql "create workload group if not exists normal " +
"properties ( " +
- " 'cpu_share'='10', " +
+ " 'cpu_share'='1024', " +
" 'memory_limit'='50%', " +
" 'enable_memory_overcommit'='true' " +
");"
// reset normal group property
- sql "alter workload group normal properties ( 'cpu_share'='10' );"
+ sql "alter workload group normal properties ( 'cpu_share'='1024' );"
sql "alter workload group normal properties ( 'memory_limit'='50%' );"
sql "alter workload group normal properties (
'enable_memory_overcommit'='true' );"
sql "alter workload group normal properties (
'max_concurrency'='2147483647' );"
@@ -258,4 +258,26 @@ suite("test_crud_wlg") {
sql """ select 1; """
}
+ // test query queue limit
+ sql "set workload_group=test_group;"
+ sql "alter workload group test_group properties ( 'max_concurrency'='0' );"
+ sql "alter workload group test_group properties ( 'max_queue_size'='0' );"
+ try {
+ sql "select 1;"
+ } catch (Exception e) {
+ assertTrue(e.getMessage().contains("query waiting queue is full"));
+ }
+
+ sql "alter workload group test_group properties ( 'max_queue_size'='1' );"
+ sql "alter workload group test_group properties ( 'queue_timeout'='500' );"
+ try {
+ sql "select 1;"
+ } catch (Exception e) {
+ assertTrue(e.getMessage().contains("query wait timeout"));
+ }
+
+ sql "alter workload group test_group properties ( 'max_concurrency'='10'
);"
+ sql "select 1;"
+ sql "set workload_group=normal;"
+ sql "drop workload group test_group;"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
