This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new b119a5b1b74 [branch-3.0]disable workload group memory check limit by
default (#54344)
b119a5b1b74 is described below
commit b119a5b1b748135146e4520471cee9827a9f6523
Author: wangbo <[email protected]>
AuthorDate: Thu Aug 14 11:58:28 2025 +0800
[branch-3.0]disable workload group memory check limit by default (#54344)
---
.../main/java/org/apache/doris/common/Config.java | 2 +-
.../workload_manager_p0/test_curd_wlg.groovy | 46 ----------------------
2 files changed, 1 insertion(+), 47 deletions(-)
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
index f317f407139..1a33cc1d72f 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
@@ -1921,7 +1921,7 @@ public class Config extends ConfigBase {
public static boolean enable_workload_group = true;
@ConfField(mutable = true, varType = VariableAnnotation.EXPERIMENTAL)
- public static boolean enable_wg_memory_sum_limit = true;
+ public static boolean enable_wg_memory_sum_limit = false;
@ConfField(mutable = true)
public static boolean enable_query_queue = true;
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 e5e13d3df83..a6200133d23 100644
--- a/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
+++ b/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
@@ -138,13 +138,6 @@ suite("test_crud_wlg") {
sql "drop workload group test_drop_wg"
qt_show_del_wg_2 "select
name,cpu_share,memory_limit,enable_memory_overcommit,max_concurrency,max_queue_size,queue_timeout,cpu_hard_limit,scan_thread_num,tag
from information_schema.workload_groups where name in
('normal','test_group','test_drop_wg') order by name;"
- // test memory_limit
- test {
- sql "alter workload group test_group properties (
'memory_limit'='100%' );"
-
- exception "cannot be greater than"
- }
-
sql "alter workload group test_group properties ( 'memory_limit'='11%' );"
qt_mem_limit_1 """ select count(1) from ${table_name} """
qt_mem_limit_2 "select
name,cpu_share,memory_limit,enable_memory_overcommit,max_concurrency,max_queue_size,queue_timeout,cpu_hard_limit,scan_thread_num
from information_schema.workload_groups where name in ('normal','test_group')
order by name;"
@@ -233,30 +226,6 @@ suite("test_crud_wlg") {
exception "The allowed cpu_share value is -1 or a positive integer"
}
- // failed for mem_limit
- test {
- sql "create workload group if not exists test_group2 " +
- "properties ( " +
- " 'cpu_share'='10', " +
- " 'memory_limit'='200%', " +
- " 'enable_memory_overcommit'='true' " +
- ");"
-
- exception "cannot be greater than"
- }
-
- test {
- sql "create workload group if not exists test_group2 " +
- "properties ( " +
- " 'cpu_share'='10', " +
- " 'memory_limit'='99%', " +
- " 'enable_memory_overcommit'='true' " +
- ");"
-
- exception "cannot be greater than"
- }
-
-
// failed for mem_overcommit
test {
sql "create workload group if not exists test_group2 " +
@@ -504,31 +473,16 @@ suite("test_crud_wlg") {
// test workload group's tag property, memory_limit
sql "create workload group if not exists tag1_mem_wg1 properties (
'memory_limit'='50%', 'tag'='mem_tag1');"
- test {
- sql "create workload group if not exists tag1_mem_wg2 properties (
'memory_limit'='60%', 'tag'='mem_tag1');"
- exception "cannot be greater than 100.0%"
- }
-
sql "create workload group if not exists tag1_mem_wg2 properties
('memory_limit'='49%', 'tag'='mem_tag1');"
sql "create workload group if not exists tag1_mem_wg3 properties (
'memory_limit'='2%');"
- test {
- sql "alter workload group tag1_mem_wg3 properties ( 'tag'='mem_tag1'
);"
- exception "cannot be greater than 100.0%"
- }
-
sql "alter workload group tag1_mem_wg3 properties ( 'memory_limit'='1%' );"
sql "alter workload group tag1_mem_wg3 properties ( 'tag'='mem_tag1' );"
sql "create workload group tag1_mem_wg4
properties('memory_limit'='-1','tag'='mem_tag1');"
- test {
- sql "alter workload group tag1_mem_wg4 properties (
'memory_limit'='1%' );"
- exception "cannot be greater than 100.0%"
- }
-
qt_show_wg_tag "select name,MEMORY_LIMIT,CPU_HARD_LIMIT,TAG from
information_schema.workload_groups where name
in('tag1_wg1','tag1_wg2','tag2_wg1','tag1_wg3','tag1_mem_wg1','tag1_mem_wg2','tag1_mem_wg3')
order by tag,name;"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
