Browse Source

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

Co-authored-by: xiecao <haolong.zhl@alibaba-inc.com>
3.2.0-release
QuantumXiecao 2 years ago committed by GitHub
parent
commit
7586710d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java

7
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. * 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 * @param command command
*/ */
private void generateCgroupCommand(List<String> command) { private void generateCgroupCommand(List<String> command) {
@ -175,12 +175,13 @@ public abstract class AbstractCommandExecutor {
command.add(String.format("CPUQuota=%s%%", taskRequest.getCpuQuota())); command.add(String.format("CPUQuota=%s%%", taskRequest.getCpuQuota()));
} }
// use `man systemd.resource-control` to find available parameter
if (memoryMax == -1) { if (memoryMax == -1) {
command.add("-p"); command.add("-p");
command.add(String.format("MemoryMax=%s", "infinity")); command.add(String.format("MemoryLimit=%s", "infinity"));
} else { } else {
command.add("-p"); 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())); command.add(String.format("--uid=%s", taskRequest.getTenantCode()));

Loading…
Cancel
Save