Alter workload group queue prop sync for regression test (apache#30869)

924060929 · Feb 8, 2024 · 6e97f2d · 6e97f2d
1 parent 89a44aa
commit 6e97f2d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 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
@@ -1694,6 +1694,10 @@ public class Config extends ConfigBase {
     @ConfField(mutable = true)
     public static boolean enable_query_queue = true;
 
+    // used for regression test
+    @ConfField(mutable = true)
+    public static boolean enable_alter_queue_prop_sync = false;
+
     @ConfField(mutable = true)
     public static long query_queue_update_interval_ms = 5000;
 

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
@@ -333,6 +333,10 @@ public void alterWorkloadGroup(AlterWorkloadGroupStmt stmt) throws DdlException
             checkGlobalUnlock(newWorkloadGroup, currentWorkloadGroup);
             nameToWorkloadGroup.put(workloadGroupName, newWorkloadGroup);
             idToWorkloadGroup.put(newWorkloadGroup.getId(), newWorkloadGroup);
+            // NOTE: used for regression test query queue
+            if (Config.enable_alter_queue_prop_sync) {
+                resetQueryQueueProp();
+            }
             Env.getCurrentEnv().getEditLog().logAlterWorkloadGroup(newWorkloadGroup);
         } finally {
             writeUnlock();

diff --git a/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy b/regression-test/suites/workload_manager_p0/test_curd_wlg.groovy
@@ -278,11 +278,10 @@ suite("test_crud_wlg") {
     }
 
     // test query queue limit
-    sql "ADMIN SET FRONTEND CONFIG ('query_queue_update_interval_ms' = '500');"
+    sql "ADMIN SET FRONTEND CONFIG ('enable_alter_queue_prop_sync' = 'true');"
     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' );"
-    Thread.sleep(5000);
     test {
         sql "select /*+SET_VAR(parallel_fragment_exec_instance_num=1)*/ * from ${table_name};"
 
@@ -305,17 +304,14 @@ suite("test_crud_wlg") {
 
     sql "alter workload group test_group properties ( 'max_queue_size'='1' );"
     sql "alter workload group test_group properties ( 'queue_timeout'='500' );"
-    Thread.sleep(5000);
     test {
         sql "select /*+SET_VAR(parallel_fragment_exec_instance_num=1)*/ * from ${table_name};"
 
         exception "query wait timeout"
     }
 
     sql "alter workload group test_group properties ( 'max_concurrency'='10' );"
-    Thread.sleep(5000);
     sql "select 1;"
     sql "set workload_group=normal;"
     sql "drop workload group test_group;"
-    sql "ADMIN SET FRONTEND CONFIG ('query_queue_update_interval_ms' = '5000');"
 }