ruanwenjun commented on code in PR #15629:
URL:
https://github.com/apache/dolphinscheduler/pull/15629#discussion_r1508394745
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-remoteshell/src/main/java/org/apache/dolphinscheduler/plugin/task/remoteshell/RemoteExecutor.java:
##########
@@ -154,11 +162,58 @@ public void cleanData(String taskId) {
public void kill(String taskId) throws IOException {
String pid = getTaskPid(taskId);
- String killCommand = String.format(COMMAND.KILL_COMMAND, pid);
+
+ if (StringUtils.isEmpty(pid)) {
+ log.warn("query remote-shell task remote process id with empty");
+ return;
+ }
+ if (!NumberUtils.isParsable(pid)) {
+ log.error("query remote-shell task remote process id error, pid {}
can not parse to number", pid);
+ return;
+ }
+
+ // query all pid
+ String remotePidStr = getAllRemotePidStr(pid);
+ String killCommand = String.format(COMMAND.KILL_COMMAND, remotePidStr);
+ log.info("prepare to execute kill command in host: {}, kill cmd: {}",
sshConnectionParam.getHost(),
+ killCommand);
runRemote(killCommand);
cleanData(taskId);
}
+ protected String getAllRemotePidStr(String pid) {
+
+ String remoteProcessIdStr = "";
+ String cmd = String.format(PSTREE_COMMAND, pid);
+ log.info("query all process id cmd: {}", cmd);
+
+ try {
+ String rawPidStr = runRemote(cmd);
+ remoteProcessIdStr = parsePidStr(rawPidStr);
+ if (!remoteProcessIdStr.startsWith(pid)) {
+ log.error("query remote process id error, [{}] first pid not
equal [{}]", remoteProcessIdStr, pid);
+ remoteProcessIdStr = pid;
+ }
+ } catch (Exception e) {
+ log.error("query remote all process id error", e);
+ remoteProcessIdStr = pid;
+ }
+ return remoteProcessIdStr;
+ }
+
+ private String parsePidStr(String rawPidStr) {
+
+ log.info("prepare to parse pid, raw pid string: {}", rawPidStr);
+ ArrayList<String> allPidList = new ArrayList<>();
+ Matcher mat = pattern.matcher(rawPidStr);
+ if (null != mat) {
+ while (mat.find()) {
+ allPidList.add(mat.group(1));
+ }
+ }
+ return String.join(" ", allPidList).trim();
+ }
Review Comment:
it's better to move this into `ProcessUtils` ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
