natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix-13625] Modify systemd-run from MemoryMax to MemoryLimit for more generality (#13627) 

Co-authored-by: xiecao <haolong.zhl@alibaba-inc.com>
This commit is contained in:
QuantumXiecao 2023-02-28 14:17:54 +08:00 committed by GitHub
parent c1fd1cba1b
commit 7586710d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
View File

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