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

Merge 000c249401 into d6714bb77a

This commit is contained in:
seckiller 2024-06-11 10:52:17 +08:00 committed by GitHub
parent d6714bb77a 000c249401
commit 31389f96d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 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/shell/BaseLinuxShellInterceptorBuilder.java
View File

@ -125,7 +125,8 @@ public abstract class BaseLinuxShellInterceptorBuilder<T extends BaseLinuxShellI
}
private List<String> bootstrapCommandInSudoMode() {
if (PropertyUtils.getBoolean(AbstractCommandExecutorConstants.TASK_RESOURCE_LIMIT_STATE, false)) {
if (PropertyUtils.getBoolean(AbstractCommandExecutorConstants.TASK_RESOURCE_LIMIT_STATE, false)
&& (memoryQuota != -1 || cpuQuota != -1)) {
return bootstrapCommandInResourceLimitMode();
}
List<String> bootstrapCommand = new ArrayList<>();
@ -164,13 +165,15 @@ public abstract class BaseLinuxShellInterceptorBuilder<T extends BaseLinuxShellI
// use `man systemd.resource-control` to find available parameter
if (memoryQuota == -1) {
bootstrapCommand.add("-p");
bootstrapCommand.add(String.format("MemoryLimit=%s", "infinity"));
// Some systems do not support infinity. Consider replacing it with a very large value.
bootstrapCommand.add(String.format("MemoryLimit=%s", "104857600M"));
} else {
bootstrapCommand.add("-p");
bootstrapCommand.add(String.format("MemoryLimit=%sM", memoryQuota));
}
bootstrapCommand.add(String.format("--uid=%s", runUser));
bootstrapCommand.add(shellAbsolutePath().toString());
return bootstrapCommand;
}
}