Skip to content

[Fix-17436][Workflow]Task timeout kill throw exception #17437

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

Merged
SbloodyS merged 12 commits into from
Sep 9, 2025
Merged

[Fix-17436][Workflow]Task timeout kill throw exception #17437

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1975953
add string blank check
Aug 21, 2025
3b1eed1
remove redundant cancelApplication
Aug 21, 2025
3493cd8
Merge branch 'dev' into Fix-17436
njnu-seafish Aug 25, 2025
5fbab09
Merge branch 'apache:dev' into Fix-17436
njnu-seafish Sep 1, 2025
6ecde23
do with NumberFormatException
Sep 1, 2025
19850fa
add string blank check
Aug 21, 2025
6c8e8ab
remove redundant cancelApplication
Aug 21, 2025
48d28cc
do with NumberFormatException
Sep 1, 2025
2f72344
Merge branch 'Fix-17436' of github.com:njnu-seafish/dolphinscheduler …
Sep 4, 2025
eb542cf
refactor getPidList function
Sep 4, 2025
8daca27
Merge branch 'dev' into Fix-17436
njnu-seafish Sep 5, 2025
aabdc61
Merge branch 'dev' into Fix-17436
SbloodyS Sep 9, 2025
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
9 changes: 5 additions & 4 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 @@ -20,6 +20,7 @@
import static org.apache.dolphinscheduler.common.constants.Constants.EMPTY_STRING;
import static org.apache.dolphinscheduler.common.constants.Constants.SLEEP_TIME_MILLIS;
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 org.apache.dolphinscheduler.common.thread.ThreadUtils;
Expand Down Expand Up @@ -190,13 +191,13 @@ public TaskResponse run(IShellInterceptorBuilder iShellInterceptorBuilder,
result.setExitStatusCode(this.process.exitValue());

} else {
log.error("process has failure, the task timeout configuration value is:{}, ready to kill ...",
taskRequest.getTaskTimeout());
log.error("process has failure due to timeout kill, timeout value is:{}, timeoutStrategy is:{}",
taskRequest.getTaskTimeout(), taskRequest.getTaskTimeoutStrategy());
result.setExitStatusCode(EXIT_CODE_FAILURE);
cancelApplication();
}
int exitCode = this.process.exitValue();
String exitLogMessage = EXIT_CODE_KILL == exitCode ? "process has killed." : "process has exited.";
String exitLogMessage = (EXIT_CODE_KILL == exitCode || EXIT_CODE_HARD_KILL == exitCode) ? "process has killed."
: "process has exited.";
Comment on lines +199 to +200
Copy link
Copy Markdown
Member

@ruanwenjun ruanwenjun Sep 3, 2025

Choose a reason for hiding this comment

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

It's better to check from status in taskExecutionContext rather then check from the exit code, we don't care about the exit, only kill from ds then we think it's kill.

Copy link
Copy Markdown
Contributor Author

@njnu-seafish njnu-seafish Sep 4, 2025

Choose a reason for hiding this comment

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

It's better to check from status in taskExecutionContext rather then check from the exit code, we don't care about the exit, only kill from ds then we think it's kill.

Here it simply outputs the final execution status of the process, indicating whether it exited normally or was killed.

Copy link
Copy Markdown
Member

@ruanwenjun ruanwenjun Sep 4, 2025

Choose a reason for hiding this comment

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

OK

log.info("{} execute path:{}, processId:{} ,exitStatusCode:{} ,processWaitForStatus:{} ,processExitValue:{}",
exitLogMessage, taskRequest.getExecutePath(), processId, result.getExitStatusCode(), status, exitCode);
return result;
Expand Down
5 changes: 3 additions & 2 deletions ...ask-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/ProcessUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,14 @@
// Get all child processes
String pids = getPidsStr(processId);
String[] pidArray = PID_PATTERN.split(pids);
if (pidArray.length == 0) {
if (StringUtils.isBlank(pids) || pidArray.length == 0) {
Copy link
Copy Markdown
Member

@ruanwenjun ruanwenjun Sep 3, 2025

Choose a reason for hiding this comment

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

ifStringUtils.isEmpty(pids) then we don't need to execute line 117.

log.warn("No valid PIDs found for process: {}", processId);
return true;
}

// Convert PID string to list of integers
List<Integer> pidList = Arrays.stream(pidArray).map(Integer::parseInt).collect(Collectors.toList());
List<Integer> pidList = Arrays.stream(pidArray).filter(StringUtils::isNotBlank).map(Integer::parseInt)
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed
.collect(Collectors.toList());

// 1. Try to terminate gracefully (SIGINT)
boolean gracefulKillSuccess = sendKillSignal("SIGINT", pidList, request.getTenantCode());
Expand Down
Loading