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

[worker] fix kill remote shell task and print exception log #15569 #15628

Closed
wants to merge 7 commits into from
Closed

[worker] fix kill remote shell task and print exception log #15569 #15628

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e83e57
fix kill remote shell task and print exception log
alei1206 Feb 25, 2024
5a1e095
Merge branch 'dev' into Fix-15569
qingwli Feb 28, 2024
ca388d9
Merge branch 'dev' into Fix-15569
rickchengx Mar 6, 2024
c3f17fe
revert to this logic
alei1206 Mar 10, 2024
47903ec
Merge branch 'apache:dev' into Fix-15569
alei1206 Mar 10, 2024
2f14950
Merge branch 'Fix-15569' of github.com:alei1206/dolphinscheduler into…
alei1206 Mar 10, 2024
22639fa
Merge branch 'dev' into Fix-15569
rickchengx Mar 12, 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
1 change: 0 additions & 1 deletion ...ll/src/main/java/org/apache/dolphinscheduler/plugin/task/remoteshell/RemoteShellTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ public void init() {
taskId = TASK_ID_PREFIX + taskExecutionContext.getTaskInstanceId();
}
setAppIds(taskId);
taskExecutionContext.setAppIds(taskId);
Copy link
Contributor

@rickchengx rickchengx Mar 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I don't think it's appropriate to delete the appId directly here. I suggest modifying the logic of ProcessUtils. Currently, it seems that the appId is considered to be only yarn app id, but in fact there are other external application ids, such as remote shell.

cc @Radeity @caishunfeng @SbloodyS

dolphinscheduler/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils/ProcessUtils.java

Lines 187 to 193 in 738da1c

if (CollectionUtils.isEmpty(appIds)) {
log.info("The appId is empty");
return;
}
ApplicationManager applicationManager = applicationManagerMap.get(ResourceManagerType.YARN);
applicationManager.killApplication(new YarnApplicationManagerContext(executePath, tenantCode, appIds));
}


initRemoteExecutor();
}
Expand Down
Loading