Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix][Shell] Fix the issue where execution is not successful in source limit mode #15568

Closed
wants to merge 2 commits into from
Closed

[Fix][Shell] Fix the issue where execution is not successful in source limit mode #15568

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6248cda
[fix][task-api]:Fix the issue where execution is not successful in re…
JohnZp Feb 5, 2024
000c249
Merge branch 'dev' into fix_command_build
rickchengx Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...a/org/apache/dolphinscheduler/plugin/task/api/shell/BaseLinuxShellInterceptorBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ private Path shellAbsolutePath() {
}

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)) {
Comment on lines +128 to +129
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (PropertyUtils.getBoolean(AbstractCommandExecutorConstants.TASK_RESOURCE_LIMIT_STATE, false)
&& (memoryQuota != -1 || cpuQuota != -1)) {
if (PropertyUtils.getBoolean(AbstractCommandExecutorConstants.TASK_RESOURCE_LIMIT_STATE, false)) {

I do not suggest adding the quota judge here.

return bootstrapCommandInResourceLimitMode();
}
List<String> bootstrapCommand = new ArrayList<>();
Expand Down Expand Up @@ -164,13 +165,15 @@ private List<String> bootstrapCommandInResourceLimitMode() {
// 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"));
Comment on lines +168 to +169
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to add a new adaptor implementation for the specific system.

} else {
bootstrapCommand.add("-p");
bootstrapCommand.add(String.format("MemoryLimit=%sM", memoryQuota));
}

bootstrapCommand.add(String.format("--uid=%s", runUser));
bootstrapCommand.add(shellAbsolutePath().toString());
return bootstrapCommand;
}
}
Loading