Repository: oozie Updated Branches: refs/heads/master 25a8b99d5 -> 84eb49364
OOZIE-3004 Forked action retry info is not working Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/84eb4936 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/84eb4936 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/84eb4936 Branch: refs/heads/master Commit: 84eb493642d35b8bb1e7527ef51b6ecfa40dd592 Parents: 25a8b99 Author: puru <[email protected]> Authored: Sat Jul 22 17:19:54 2017 -0700 Committer: puru <[email protected]> Committed: Sat Jul 22 17:19:54 2017 -0700 ---------------------------------------------------------------------- .../apache/oozie/command/wf/ActionXCommand.java | 2 +- .../wf/TestWorkflowActionRetryInfoXCommand.java | 56 +++++++++++++++++--- release-log.txt | 3 +- 3 files changed, 53 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/84eb4936/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java index 432b077..29ccd32 100644 --- a/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java @@ -559,7 +559,7 @@ public abstract class ActionXCommand<T> extends WorkflowXCommand<T> { } public void setVar(String name, String value) { - if (value != null) { + if (value == null) { contextVariableMap.remove(name); } else { http://git-wip-us.apache.org/repos/asf/oozie/blob/84eb4936/core/src/test/java/org/apache/oozie/command/wf/TestWorkflowActionRetryInfoXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestWorkflowActionRetryInfoXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestWorkflowActionRetryInfoXCommand.java index 1a5f354..3e49f43 100644 --- a/core/src/test/java/org/apache/oozie/command/wf/TestWorkflowActionRetryInfoXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/wf/TestWorkflowActionRetryInfoXCommand.java @@ -58,11 +58,8 @@ public class TestWorkflowActionRetryInfoXCommand extends XDataTestCase { } public void testRetryConsoleUrl() throws Exception { - Configuration conf = new XConfiguration(); - File workflowUri = new File(getTestCaseDir(), "workflow.xml"); - //@formatter:off - String appXml = "<workflow-app xmlns=\"uri:oozie:workflow:0.3\" name=\"wf-fork\">" + String wfXml = "<workflow-app xmlns=\"uri:oozie:workflow:0.3\" name=\"wf-fork\">" + "<start to=\"action1\"/>" +"<action name=\"action1\" retry-max=\"2\" retry-interval=\"0\">" + "<test xmlns=\"uri:test\">" @@ -81,7 +78,55 @@ public class TestWorkflowActionRetryInfoXCommand extends XDataTestCase { + "<end name=\"end\"/>" + "</workflow-app>"; //@Formatter:on - writeToFile(appXml, workflowUri); + validateRetryConsoleUrl(wfXml); + } + + public void testRetryConsoleUrlForked() throws Exception { + //@formatter:off + String wfXml = "<workflow-app xmlns=\"uri:oozie:workflow:0.3\" name=\"wf-fork\">" + + "<start to=\"fork1\"/>" + + "<fork name=\"fork1\">" + + "<path start=\"action1\"/>" + + "<path start=\"action2\"/>" + + "</fork>" + +"<action name=\"action1\" retry-max=\"2\" retry-interval=\"0\">" + + "<test xmlns=\"uri:test\">" + + "<signal-value>${wf:conf('signal-value')}</signal-value>" + + "<external-status>${wf:conf('external-status')}</external-status> " + + "<external-childIds>${wf:conf('external-status')}</external-childIds> " + + "<error>${wf:conf('error')}</error>" + + "<avoid-set-execution-data>${wf:conf('avoid-set-execution-data')}</avoid-set-execution-data>" + + "<avoid-set-end-data>${wf:conf('avoid-set-end-data')}</avoid-set-end-data>" + + "<running-mode>async-error</running-mode>" + + "</test>" + + "<ok to=\"join\"/>" + + "<error to=\"kill\"/>" + + "</action>" + +"<action name=\"action2\" retry-max=\"2\" retry-interval=\"0\">" + + "<test xmlns=\"uri:test\">" + + "<signal-value>${wf:conf('signal-value')}</signal-value>" + + "<external-status>${wf:conf('external-status')}</external-status> " + + "<external-childIds>${wf:conf('external-status')}</external-childIds> " + + "<error>${wf:conf('error')}</error>" + + "<avoid-set-execution-data>${wf:conf('avoid-set-execution-data')}</avoid-set-execution-data>" + + "<avoid-set-end-data>${wf:conf('avoid-set-end-data')}</avoid-set-end-data>" + + "<running-mode>async-error</running-mode>" + + "</test>" + + "<ok to=\"join\"/>" + + "<error to=\"kill\"/>" + + "</action>" + + "<join name=\"join\" to=\"end\"/>" + + "<kill name=\"kill\"><message>killed</message></kill>" + + "<end name=\"end\"/>" + + "</workflow-app>"; + //@Formatter:on + validateRetryConsoleUrl(wfXml); + } + + public void validateRetryConsoleUrl(String wfXml) throws Exception { + Configuration conf = new XConfiguration(); + File workflowUri = new File(getTestCaseDir(), "workflow.xml"); + writeToFile(wfXml, workflowUri); conf.set(OozieClient.APP_PATH, workflowUri.toURI().toString()); conf.set(OozieClient.USER_NAME, getTestUser()); conf.set("external-status", "error"); @@ -134,5 +179,4 @@ public class TestWorkflowActionRetryInfoXCommand extends XDataTestCase { JsonUtils.formatDateRfc822(action.getEndTime())); } - } http://git-wip-us.apache.org/repos/asf/oozie/blob/84eb4936/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 05f53bc..c18f89e 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,7 +1,8 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3004 Forked action retry info is not working (puru) OOZIE-2601 Ability to use local paths for the sharelib -OOZIE-2987 Coord action missing dependencies should show URI template with unresolved dependencies +OOZIE-2987 Coord action missing dependencies should show URI template with unresolved dependencies (puru) OOZIE-2004 Improve Oozie version info output (Artem Ervits via gezapeti) OOZIE-2854 Oozie should handle transient database problems (andras.piros via gezapeti) OOZIE-2371 Add docs for state transitions for WF Action states (daniel.becker via gezapeti)
