database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

add query queue regression test (#27613)

Browse Source
This commit is contained in:
wangbo
2023-11-29 10:00:20 +08:00
committed by GitHub
parent b3111e47ff
commit 9870817def
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/resource/workloadgroup/WorkloadGroupMgr.java
View File

@ -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);

26
regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
View File

@ -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;"
}