Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Closes OOZIE-21 forked subwf not return status to the parent wf job

  • Loading branch information...
commit 24f32a2d3baaea951614f7810724f0e1da58790c 1 parent 0785bea
Mona Chitnis authored Angelo Kaichen Huang committed
View
4 core/src/main/java/org/apache/oozie/command/wf/SignalXCommand.java
@@ -227,7 +227,7 @@ protected Void execute() throws CommandException {
// output message for Kill node
if (wfAction != null) { // wfAction could be a no-op job
NodeDef nodeDef = workflowInstance.getNodeDef(wfAction.getExecutionPath());
- if (nodeDef instanceof KillNodeDef) {
+ if (nodeDef != null && nodeDef instanceof KillNodeDef) {
boolean isRetry = false;
boolean isUserRetry = false;
ActionExecutorContext context = new ActionXCommand.ActionExecutorContext(wfJob, wfAction, isRetry,
@@ -301,7 +301,7 @@ protected Void execute() throws CommandException {
"Updated the workflow status to " + wfJob.getId() + " status =" + wfJob.getStatusStr());
if (wfJob.getStatus() != WorkflowJob.Status.RUNNING && wfJob.getStatus() != WorkflowJob.Status.SUSPENDED) {
// update coordinator action
- new CoordActionUpdateXCommand(wfJob).call();
+ new CoordActionUpdateXCommand(wfJob).call(); //Note: Called even if wf is not necessarily instantiated by coordinator
new WfEndXCommand(wfJob).call(); //To delete the WF temp dir
}
LOG.debug("ENDED SignalCommand for jobid=" + jobId + ", actionId=" + actionId);
View
10 core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowInstance.java
@@ -315,12 +315,12 @@ public NodeDef getNodeDef(String executionPath) {
NodeDef nodeDef = null;
if (nodeJob == null) {
log.error("invalid execution path [{0}]", executionPath);
- } else {
- nodeDef = def.getNode(nodeJob.nodeName);
}
-
- if (nodeDef == null) {
- log.error("invalid transition [{0}]", nodeJob.nodeName);
+ else {
+ nodeDef = def.getNode(nodeJob.nodeName);
+ if (nodeDef == null) {
+ log.error("invalid transition [{0}]", nodeJob.nodeName);
+ }
}
return nodeDef;
}
View
1  release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 3.1.0 release
+OOZIE-21 Fixed bug forked subwf not returning status to the parent wf job
OOZIE-28 update coordinator name to coord job at loadstate of coord-submit to avoid exception of bundle-status-update
OOZIE-22 (Apache) Add support PostgreSQL
OOZIE-10 add user-retry in workflow action
Please sign in to comment.
Something went wrong with that request. Please try again.