This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git


The following commit(s) were added to refs/heads/master by this push:
     new 4164d784f40 [fix]workload group do not have enable_cpu_hard_limit any 
more (#3245)
4164d784f40 is described below

commit 4164d784f40761197251bc48c9870eacf0a47a49
Author: yiguolei <[email protected]>
AuthorDate: Wed Dec 31 15:19:40 2025 +0800

    [fix]workload group do not have enable_cpu_hard_limit any more (#3245)
    
    ## Versions
    
    - [x] dev
    - [x] 4.x
    - [ ] 3.x
    - [ ] 2.1
    
    ## Languages
    
    - [ ] Chinese
    - [ ] English
    
    ## Docs Checklist
    
    - [ ] Checked by AI
    - [ ] Test Cases Built
    
    Co-authored-by: yiguolei <[email protected]>
---
 .../workload-management/workload-group.md          | 36 ++------------------
 .../workload-management/workload-group.md          | 38 ++--------------------
 2 files changed, 6 insertions(+), 68 deletions(-)

diff --git a/docs/admin-manual/workload-management/workload-group.md 
b/docs/admin-manual/workload-management/workload-group.md
index 579794a79d7..7c81bb128d5 100644
--- a/docs/admin-manual/workload-management/workload-group.md
+++ b/docs/admin-manual/workload-management/workload-group.md
@@ -273,30 +273,6 @@ Query OK, 0 rows affected (0.01 sec)
 
 More details can be found 
in[DROP-WORKLOAD-GROUP](../../sql-manual/sql-statements/cluster-management/compute-management/DROP-WORKLOAD-GROUP)
 
-## Explanation of Switching Between CPU Soft and Hard Limit Modes
-Currently, Doris does not support running both CPU soft and hard limits 
simultaneously. At any given time, a Doris cluster can only operate in either 
CPU soft limit or CPU hard limit mode.
-Users can switch between these two modes, and the switching method is as 
follows:
-
-1 If the current cluster configuration is set to the default CPU soft limit 
and you wish to change it to CPU hard limit, you need to modify the 
cpu_hard_limit parameter of the Workload Group to a valid value.
-```
-alter workload group test_group properties ( 'cpu_hard_limit'='20%' );
-```
-All Workload Groups in the cluster need to be modified, and the cumulative 
value of cpu_hard_limit for all Workload Groups cannot exceed 100%.
-
-Since CPU hard limits cannot automatically have a valid value, simply enabling 
the switch without modifying the property will prevent the CPU hard limit from 
taking effect.
-
-2 Enable the CPU hard limit on all FE nodes
-```
-1 Modify the configuration in the fe.conf file on the disk.
-experimental_enable_cpu_hard_limit = true
-
-
-2 Modify the configuration in memory.
-ADMIN SET FRONTEND CONFIG ("enable_cpu_hard_limit" = "true");
-```
-
-If the user wishes to switch from CPU hard limit back to CPU soft limit, they 
need to set the value of enable_cpu_hard_limit to false on all FE nodes.
-The CPU soft limit property cpu_share will default to a valid value of 1024 
(if it was not previously specified). Users can adjust the cpu_share value 
based on the priority of the group.
 
 ## Testing
 ### Memory hard limit
@@ -440,22 +416,16 @@ The dataset is clickbench, and the test SQL is q29.
 2. Modify the CPU hard limit of the currently used Workload Group to 10%.
 
     ```sql
-    alter workload group g2 properties('cpu_hard_limit'='10%');
-    ```
-
-3. Switch to CPU hard limit mode.
-
-    ```sql
-    ADMIN SET FRONTEND CONFIG ("enable_cpu_hard_limit" = "true");
+    alter workload group g2 properties('max_cpu_percent'='10%');
     ```
 
-4. Re-run the load test for queries, and you can see that the current process 
can only use 9 to 10 cores, which is about 10% of the total cores.
+3. Re-run the load test for queries, and you can see that the current process 
can only use 9 to 10 cores, which is about 10% of the total cores.
 
    ![use workload group cpu](/images/workload-management/use_wg_cpu_2.png)
 
 It is important to note that this test is best conducted using query 
workloads, as they are more likely to reflect the effect. If testing load, it 
may trigger Compaction, causing the actual observed values to be higher than 
the values configured in the Workload Group. Currently, Compaction workloads 
are not managed under the Workload Group.
 
-5. In addition to using Linux system commands, you can also observe the 
current CPU usage of the group through Doris's system tables, where the CPU 
usage is around 10%.
+4. In addition to using Linux system commands, you can also observe the 
current CPU usage of the group through Doris's system tables, where the CPU 
usage is around 10%.
 
     ```sql
     mysql [information_schema]>select CPU_USAGE_PERCENT from 
workload_group_resource_usage where WORKLOAD_GROUP_ID=11201;
diff --git 
a/versioned_docs/version-4.x/admin-manual/workload-management/workload-group.md 
b/versioned_docs/version-4.x/admin-manual/workload-management/workload-group.md
index 579794a79d7..c418987a4e7 100644
--- 
a/versioned_docs/version-4.x/admin-manual/workload-management/workload-group.md
+++ 
b/versioned_docs/version-4.x/admin-manual/workload-management/workload-group.md
@@ -273,31 +273,6 @@ Query OK, 0 rows affected (0.01 sec)
 
 More details can be found 
in[DROP-WORKLOAD-GROUP](../../sql-manual/sql-statements/cluster-management/compute-management/DROP-WORKLOAD-GROUP)
 
-## Explanation of Switching Between CPU Soft and Hard Limit Modes
-Currently, Doris does not support running both CPU soft and hard limits 
simultaneously. At any given time, a Doris cluster can only operate in either 
CPU soft limit or CPU hard limit mode.
-Users can switch between these two modes, and the switching method is as 
follows:
-
-1 If the current cluster configuration is set to the default CPU soft limit 
and you wish to change it to CPU hard limit, you need to modify the 
cpu_hard_limit parameter of the Workload Group to a valid value.
-```
-alter workload group test_group properties ( 'cpu_hard_limit'='20%' );
-```
-All Workload Groups in the cluster need to be modified, and the cumulative 
value of cpu_hard_limit for all Workload Groups cannot exceed 100%.
-
-Since CPU hard limits cannot automatically have a valid value, simply enabling 
the switch without modifying the property will prevent the CPU hard limit from 
taking effect.
-
-2 Enable the CPU hard limit on all FE nodes
-```
-1 Modify the configuration in the fe.conf file on the disk.
-experimental_enable_cpu_hard_limit = true
-
-
-2 Modify the configuration in memory.
-ADMIN SET FRONTEND CONFIG ("enable_cpu_hard_limit" = "true");
-```
-
-If the user wishes to switch from CPU hard limit back to CPU soft limit, they 
need to set the value of enable_cpu_hard_limit to false on all FE nodes.
-The CPU soft limit property cpu_share will default to a valid value of 1024 
(if it was not previously specified). Users can adjust the cpu_share value 
based on the priority of the group.
-
 ## Testing
 ### Memory hard limit
 Adhoc-type queries typically have unpredictable SQL inputs and uncertain 
memory usage, which poses the risk of a few queries consuming a large amount of 
memory.
@@ -440,22 +415,15 @@ The dataset is clickbench, and the test SQL is q29.
 2. Modify the CPU hard limit of the currently used Workload Group to 10%.
 
     ```sql
-    alter workload group g2 properties('cpu_hard_limit'='10%');
-    ```
-
-3. Switch to CPU hard limit mode.
-
-    ```sql
-    ADMIN SET FRONTEND CONFIG ("enable_cpu_hard_limit" = "true");
+    alter workload group g2 properties('max_cpu_percent'='10%');
     ```
-
-4. Re-run the load test for queries, and you can see that the current process 
can only use 9 to 10 cores, which is about 10% of the total cores.
+3. Re-run the load test for queries, and you can see that the current process 
can only use 9 to 10 cores, which is about 10% of the total cores.
 
    ![use workload group cpu](/images/workload-management/use_wg_cpu_2.png)
 
 It is important to note that this test is best conducted using query 
workloads, as they are more likely to reflect the effect. If testing load, it 
may trigger Compaction, causing the actual observed values to be higher than 
the values configured in the Workload Group. Currently, Compaction workloads 
are not managed under the Workload Group.
 
-5. In addition to using Linux system commands, you can also observe the 
current CPU usage of the group through Doris's system tables, where the CPU 
usage is around 10%.
+4. In addition to using Linux system commands, you can also observe the 
current CPU usage of the group through Doris's system tables, where the CPU 
usage is around 10%.
 
     ```sql
     mysql [information_schema]>select CPU_USAGE_PERCENT from 
workload_group_resource_usage where WORKLOAD_GROUP_ID=11201;


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to