[dolphinscheduler] branch dev updated: [fix-13625] Modify systemd-run from MemoryMax to MemoryLimit for more generality (#13627)

[zihaoxiang]

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

zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 7586710d49 [fix-13625] Modify systemd-run from MemoryMax to 
MemoryLimit for more generality (#13627)
7586710d49 is described below

commit 7586710d49ea86a22798a3f401a875e2f8669dbc
Author: QuantumXiecao <99702568+quantumxie...@users.noreply.github.com>
AuthorDate: Tue Feb 28 14:17:54 2023 +0800

    [fix-13625] Modify systemd-run from MemoryMax to MemoryLimit for more 
generality (#13627)
    
    Co-authored-by: xiecao <haolong....@alibaba-inc.com>
---
 .../dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
 
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
index c3e9b952ad..c80898744b 100644
--- 
a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
+++ 
b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
@@ -155,7 +155,7 @@ public abstract class AbstractCommandExecutor {
 
     /**
      * generate systemd command.
-     * eg: sudo systemd-run -q --scope -p CPUQuota=100% -p MemoryMax=200M 
--uid=root
+     * eg: sudo systemd-run -q --scope -p CPUQuota=100% -p MemoryLimit=200M 
--uid=root
      * @param command command
      */
     private void generateCgroupCommand(List<String> command) {
@@ -175,12 +175,13 @@ public abstract class AbstractCommandExecutor {
             command.add(String.format("CPUQuota=%s%%", 
taskRequest.getCpuQuota()));
         }
 
+        // use `man systemd.resource-control` to find available parameter
         if (memoryMax == -1) {
             command.add("-p");
-            command.add(String.format("MemoryMax=%s", "infinity"));
+            command.add(String.format("MemoryLimit=%s", "infinity"));
         } else {
             command.add("-p");
-            command.add(String.format("MemoryMax=%sM", 
taskRequest.getMemoryMax()));
+            command.add(String.format("MemoryLimit=%sM", 
taskRequest.getMemoryMax()));
         }
 
         command.add(String.format("--uid=%s", taskRequest.getTenantCode()));