Repository: oozie Updated Branches: refs/heads/master 1dabb80b1 -> cdaa66bd7
OOZIE-2434 inconsistent coord action status and workflow job status Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/cdaa66bd Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/cdaa66bd Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/cdaa66bd Branch: refs/heads/master Commit: cdaa66bd7ecc10ab94b0a1bbb8bb2367d11f32b4 Parents: 1dabb80 Author: Purshotam Shah <[email protected]> Authored: Mon Jan 25 12:07:02 2016 -0800 Committer: Purshotam Shah <[email protected]> Committed: Mon Jan 25 12:07:02 2016 -0800 ---------------------------------------------------------------------- .../action/oozie/SubWorkflowActionExecutor.java | 38 ++++++++++---------- release-log.txt | 1 + 2 files changed, 21 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/cdaa66bd/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java b/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java index 6bf3598..20e4caf 100644 --- a/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/oozie/SubWorkflowActionExecutor.java @@ -18,36 +18,36 @@ package org.apache.oozie.action.oozie; -import org.apache.oozie.action.hadoop.OozieJobInfo; -import org.apache.oozie.client.OozieClientException; -import org.apache.oozie.action.ActionExecutor; -import org.apache.oozie.action.ActionExecutorException; +import java.io.IOException; +import java.io.StringReader; +import java.util.HashSet; +import java.util.Set; + +import org.apache.hadoop.conf.Configuration; import org.apache.oozie.DagEngine; import org.apache.oozie.LocalOozieClient; import org.apache.oozie.WorkflowJobBean; -import org.apache.oozie.command.wf.ActionStartXCommand; -import org.apache.oozie.service.ConfigurationService; -import org.apache.oozie.service.DagEngineService; -import org.apache.oozie.client.WorkflowAction; +import org.apache.oozie.action.ActionExecutor; +import org.apache.oozie.action.ActionExecutorException; +import org.apache.oozie.action.hadoop.OozieJobInfo; import org.apache.oozie.client.OozieClient; +import org.apache.oozie.client.OozieClientException; +import org.apache.oozie.client.WorkflowAction; import org.apache.oozie.client.WorkflowJob; import org.apache.oozie.command.CommandException; +import org.apache.oozie.command.wf.ActionStartXCommand; +import org.apache.oozie.service.ConfigurationService; +import org.apache.oozie.service.DagEngineService; +import org.apache.oozie.service.Services; import org.apache.oozie.util.ConfigUtils; import org.apache.oozie.util.JobUtils; import org.apache.oozie.util.PropertiesUtils; -import org.apache.oozie.util.XmlUtils; import org.apache.oozie.util.XConfiguration; import org.apache.oozie.util.XLog; -import org.apache.oozie.service.Services; -import org.apache.hadoop.conf.Configuration; +import org.apache.oozie.util.XmlUtils; import org.jdom.Element; import org.jdom.Namespace; -import java.io.StringReader; -import java.io.IOException; -import java.util.Set; -import java.util.HashSet; - public class SubWorkflowActionExecutor extends ActionExecutor { public static final String ACTION_TYPE = "sub-workflow"; public static final String LOCAL = "local"; @@ -286,8 +286,10 @@ public class SubWorkflowActionExecutor extends ActionExecutor { try { String subWorkflowId = action.getExternalId(); String oozieUri = action.getTrackerUri(); - OozieClient oozieClient = getWorkflowClient(context, oozieUri); - oozieClient.kill(subWorkflowId); + if (subWorkflowId != null && oozieUri != null) { + OozieClient oozieClient = getWorkflowClient(context, oozieUri); + oozieClient.kill(subWorkflowId); + } context.setEndData(WorkflowAction.Status.KILLED, getActionSignal(WorkflowAction.Status.KILLED)); } catch (Exception ex) { http://git-wip-us.apache.org/repos/asf/oozie/blob/cdaa66bd/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 7bd2ce7..d35b2c2 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2434 inconsistent coord action status and workflow job status (satishsaley via puru) OOZIE-2438 Oozie client "jobs -filter" diagnostic message clarification (satishsaley via puru) OOZIE-2165 Job log fetching can fail in Oozie HA mode when using doAs impersonation (satishsaley via puru) OOZIE-2430 Add root logger for hive,sqoop action (satishsaley via puru)
