Repository: oozie Updated Branches: refs/heads/master 98ac2ae8b -> 02a81df17
OOZIE-2093 TestSubmitXCommand.testProtoConfStorage fails against Hadoop 2 (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/02a81df1 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/02a81df1 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/02a81df1 Branch: refs/heads/master Commit: 02a81df174ba97ff9cc7aae5bfb4daa74677d107 Parents: 98ac2ae Author: Robert Kanter <rkan...@cloudera.com> Authored: Fri Dec 19 11:51:02 2014 -0800 Committer: Robert Kanter <rkan...@cloudera.com> Committed: Fri Dec 19 11:51:02 2014 -0800 ---------------------------------------------------------------------- .../apache/oozie/command/wf/TestSubmitXCommand.java | 15 ++++++++++++--- release-log.txt | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/02a81df1/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java index 42fa198..73464c8 100644 --- a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java @@ -265,8 +265,12 @@ public class TestSubmitXCommand extends XDataTestCase { }); WorkflowJobBean wf = WorkflowJobQueryExecutor.getInstance().get(WorkflowJobQuery.GET_WORKFLOW, jobId); XConfiguration protoConf = new XConfiguration(new StringReader(wf.getProtoActionConf())); - //username, libpath, apppath - assertEquals(protoConf.size(), 2); + // Hadoop 2 adds "mapreduce.job.user.name" in addition to "user.name" + if (protoConf.get("mapreduce.job.user.name") != null) { + assertEquals(3, protoConf.size()); + } else { + assertEquals(2, protoConf.size()); + } assertNull(protoConf.get(WorkflowAppService.APP_LIB_PATH_LIST)); new File(getTestCaseDir() + "/lib").mkdirs(); @@ -284,7 +288,12 @@ public class TestSubmitXCommand extends XDataTestCase { }); wf = WorkflowJobQueryExecutor.getInstance().get(WorkflowJobQuery.GET_WORKFLOW, jobId1); protoConf = new XConfiguration(new StringReader(wf.getProtoActionConf())); - assertEquals(protoConf.size(), 3); + // Hadoop 2 adds "mapreduce.job.user.name" in addition to "user.name" + if (protoConf.get("mapreduce.job.user.name") != null) { + assertEquals(4, protoConf.size()); + } else { + assertEquals(3, protoConf.size()); + } assertNotNull(protoConf.get(WorkflowAppService.APP_LIB_PATH_LIST)); } http://git-wip-us.apache.org/repos/asf/oozie/blob/02a81df1/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 86301d0..0bbb90f 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2093 TestSubmitXCommand.testProtoConfStorage fails against Hadoop 2 (rkanter) OOZIE-2028 Coord action rerun with -failed option should rerun existing workflow with RERUN_FAIL_NODES=true (jaydeepvishwakarma via shwethags) OOZIE-2029 Workflow re-run with RERUN_FAIL_NODES=true should re-run only the failed nodes of the sub-workflow (jaydeepvishwakarma via shwethags) OOZIE-2035 NotificationXCommand should support proxy (puru)
