From c0d8bed629cacf0479cef0f42d41c2e0e436f467 Mon Sep 17 00:00:00 2001 From: suekyounglee Date: Thu, 2 Apr 2020 10:36:58 +0900 Subject: [PATCH 1/3] [OOZIE-3596] When the SSH action is killed, it must be changed to the kill command that can terminate the related subprocess. --- .../java/org/apache/oozie/action/ssh/SshActionExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java index 4e418cb661..e271f5c864 100644 --- a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java @@ -220,7 +220,7 @@ private String getActionErrorMessage(Context context, WorkflowAction action) thr @Override public void kill(Context context, WorkflowAction action) throws ActionExecutorException { LOG.info("Killing action"); - String command = "ssh " + action.getTrackerUri() + " kill -KILL " + action.getExternalId(); + String command = "ssh " + action.getTrackerUri() + " kill -- -$(ps -o pgid= " + action.getExternalId() + " | grep -o [0-9]*)"; int returnValue = getReturnValue(command); if (returnValue != 0) { throw new ActionExecutorException(ActionExecutorException.ErrorType.ERROR, "FAILED_TO_KILL", XLog.format( From f1397e0723f45c3f2fdca8660a91a7f03fce3040 Mon Sep 17 00:00:00 2001 From: suekyounglee Date: Thu, 2 Apr 2020 14:47:15 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[OOZIE-3596]=20When=20the=20SSH=20action=20?= =?UTF-8?q?is=20killed,=20it=20must=20be=20changed=20to=20the=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/apache/oozie/action/ssh/SshActionExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java index e271f5c864..abe3f22808 100644 --- a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java @@ -220,7 +220,7 @@ private String getActionErrorMessage(Context context, WorkflowAction action) thr @Override public void kill(Context context, WorkflowAction action) throws ActionExecutorException { LOG.info("Killing action"); - String command = "ssh " + action.getTrackerUri() + " kill -- -$(ps -o pgid= " + action.getExternalId() + " | grep -o [0-9]*)"; + String command = "ssh " + action.getTrackerUri() + " kill -- -$(ps -o pgid= " + action.getExternalId() + " | grep -o [0-9]*)"; int returnValue = getReturnValue(command); if (returnValue != 0) { throw new ActionExecutorException(ActionExecutorException.ErrorType.ERROR, "FAILED_TO_KILL", XLog.format( From c8ff53eb905556561501db446f738dff0583a5b6 Mon Sep 17 00:00:00 2001 From: suekyounglee Date: Thu, 2 Apr 2020 14:49:02 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[OOZIE-3596]=20When=20the=20SSH=20action=20?= =?UTF-8?q?is=20killed,=20it=20must=20be=20changed=20to=20the=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/apache/oozie/action/ssh/SshActionExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java index abe3f22808..4b85c3a6e1 100644 --- a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java @@ -220,7 +220,7 @@ private String getActionErrorMessage(Context context, WorkflowAction action) thr @Override public void kill(Context context, WorkflowAction action) throws ActionExecutorException { LOG.info("Killing action"); - String command = "ssh " + action.getTrackerUri() + " kill -- -$(ps -o pgid= " + action.getExternalId() + " | grep -o [0-9]*)"; + String command = "ssh " + action.getTrackerUri() + " kill -- -$(ps -o pgid= " + action.getExternalId() + " | grep -o [0-9]*)"; int returnValue = getReturnValue(command); if (returnValue != 0) { throw new ActionExecutorException(ActionExecutorException.ErrorType.ERROR, "FAILED_TO_KILL", XLog.format(