Skip to content

[Improvement-18388][TASK]Killed shell tasks may be displayed as FAILURE #18407

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

Open
HomminLee wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[Improvement-18388][TASK]Killed shell tasks may be displayed as FAILURE #18407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
122044d
[Fix-18388]Killed shell tasks may be displayed as FAILURE
HomminLee Jul 10, 2026
0954e69
[Fix-18388]add tests
HomminLee Jul 10, 2026
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
5 changes: 3 additions & 2 deletions ...pi/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.EXIT_CODE_FAILURE;
import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.EXIT_CODE_HARD_KILL;
import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.EXIT_CODE_KILL;
import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.EXIT_CODE_SIGINT_KILL;

import org.apache.dolphinscheduler.common.thread.ThreadUtils;
import org.apache.dolphinscheduler.common.utils.OSUtils;
Expand Down Expand Up @@ -151,8 +152,8 @@ public TaskResponse run(IShellInterceptorBuilder iShellInterceptorBuilder,
result.setExitStatusCode(EXIT_CODE_FAILURE);
}
int exitCode = this.process.exitValue();
String exitLogMessage = (EXIT_CODE_KILL == exitCode || EXIT_CODE_HARD_KILL == exitCode) ? "process has killed."
: "process has exited.";
boolean isCancelled = EXIT_CODE_KILL == exitCode || EXIT_CODE_HARD_KILL == exitCode || EXIT_CODE_SIGINT_KILL == exitCode;
String exitLogMessage = isCancelled ? "process has killed." : "process has exited.";
log.info("{} execute path:{}, processId:{} ,exitStatusCode:{} ,processWaitForStatus:{} ,processExitValue:{}",
exitLogMessage, taskRequest.getExecutePath(), processId, result.getExitStatusCode(), status, exitCode);
return result;
Expand Down
4 changes: 3 additions & 1 deletion ...uler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ public TaskExecutionStatus getExitStatus() {
if (exitStatusCode == TaskConstants.EXIT_CODE_SUCCESS) {
return TaskExecutionStatus.SUCCESS;
}
if (exitStatusCode == TaskConstants.EXIT_CODE_KILL || exitStatusCode == TaskConstants.EXIT_CODE_HARD_KILL) {
if (exitStatusCode == TaskConstants.EXIT_CODE_KILL
|| exitStatusCode == TaskConstants.EXIT_CODE_HARD_KILL
|| exitStatusCode == TaskConstants.EXIT_CODE_SIGINT_KILL) {
return TaskExecutionStatus.KILL;
}
return TaskExecutionStatus.FAILURE;
Expand Down
1 change: 1 addition & 0 deletions ...ler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ private TaskConstants() {

public static final int EXIT_CODE_KILL = 137;
public static final int EXIT_CODE_HARD_KILL = 143;
public static final int EXIT_CODE_SIGINT_KILL = 130;
public static final String PID = "pid";

public static final String QUESTION = "?";
Expand Down
44 changes: 44 additions & 0 deletions ...-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/AbstractTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

package org.apache.dolphinscheduler.plugin.task.api;

import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.SubWorkflowParameters;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand All @@ -38,4 +42,44 @@ public void testFindFlinkJobId() {
Assertions.assertEquals(jobId, str.substring(6));
}

@Test
public void testGetExitStatus() {
AbstractTask task = new TestTask();

task.setExitStatusCode(TaskConstants.EXIT_CODE_SUCCESS);
Assertions.assertEquals(TaskExecutionStatus.SUCCESS, task.getExitStatus());

task.setExitStatusCode(TaskConstants.EXIT_CODE_KILL);
Assertions.assertEquals(TaskExecutionStatus.KILL, task.getExitStatus());

task.setExitStatusCode(TaskConstants.EXIT_CODE_HARD_KILL);
Assertions.assertEquals(TaskExecutionStatus.KILL, task.getExitStatus());

task.setExitStatusCode(TaskConstants.EXIT_CODE_SIGINT_KILL);
Assertions.assertEquals(TaskExecutionStatus.KILL, task.getExitStatus());

task.setExitStatusCode(TaskConstants.EXIT_CODE_FAILURE);
Assertions.assertEquals(TaskExecutionStatus.FAILURE, task.getExitStatus());
}

private static final class TestTask extends AbstractTask {

private TestTask() {
super(new TaskExecutionContext());
}

@Override
public void handle(TaskCallBack taskCallBack) {
}

@Override
public void cancel() {
}

@Override
public AbstractParameters getParameters() {
return new SubWorkflowParameters();
}
}

}
Loading