Repository: oozie Updated Branches: refs/heads/master 14d040dc3 -> 27096f42b
OOZIE-1733 Fix test failures caused by OOZIE-1722 (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/27096f42 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/27096f42 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/27096f42 Branch: refs/heads/master Commit: 27096f42b711ffac4374e87c931ca5f6ee0b15a6 Parents: 14d040d Author: Robert Kanter <[email protected]> Authored: Mon Mar 10 09:41:13 2014 -0700 Committer: Robert Kanter <[email protected]> Committed: Mon Mar 10 09:41:13 2014 -0700 ---------------------------------------------------------------------- .../oozie/action/hadoop/LauncherMainTester.java | 8 +++-- .../action/hadoop/TestJavaActionExecutor.java | 32 ++++++++++++++++++-- .../oozie/action/hadoop/TestLauncher.java | 25 ++++++++++++++- .../oozie/action/hadoop/TestMapReduceMain.java | 2 ++ release-log.txt | 1 + .../oozie/action/hadoop/TestHiveMain.java | 3 ++ .../apache/oozie/action/hadoop/TestPigMain.java | 3 +- .../oozie/action/hadoop/TestStreamingMain.java | 3 ++ 8 files changed, 71 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/27096f42/core/src/test/java/org/apache/oozie/action/hadoop/LauncherMainTester.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/LauncherMainTester.java b/core/src/test/java/org/apache/oozie/action/hadoop/LauncherMainTester.java index fe80c9c..d7ff886 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/LauncherMainTester.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/LauncherMainTester.java @@ -19,6 +19,7 @@ package org.apache.oozie.action.hadoop; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.OutputStream; import java.util.Properties; @@ -29,8 +30,11 @@ public class LauncherMainTester { System.out.println("Hello World!"); } if (args.length == 1) { - if (args[0].equals("ex")) { - throw new Throwable("throwing exception"); + if (args[0].equals("throwable")) { + throw new Throwable("throwing throwable"); + } + if (args[0].equals("exception")) { + throw new IOException("throwing exception"); } if (args[0].equals("exit0")) { System.exit(0); http://git-wip-us.apache.org/repos/asf/oozie/blob/27096f42/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java index c8b8caf..6d4d7a4 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java @@ -509,12 +509,40 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase { assertEquals(WorkflowAction.Status.ERROR, context.getAction().getStatus()); } - public void testExceptionSubmitError() throws Exception { + public void testExceptionSubmitException() throws Exception { String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>" + getNameNodeUri() + "</name-node>" + "<main-class>" + LauncherMainTester.class.getName() + "</main-class>" + - "<arg>ex</arg>" + + "<arg>exception</arg>" + + "</java>"; + + Context context = createContext(actionXml, null); + final RunningJob runningJob = submitAction(context); + waitFor(60 * 1000, new Predicate() { + @Override + public boolean evaluate() throws Exception { + return runningJob.isComplete(); + } + }); + assertTrue(runningJob.isSuccessful()); + assertFalse(LauncherMapperHelper.isMainSuccessful(runningJob)); + ActionExecutor ae = new JavaActionExecutor(); + ae.check(context, context.getAction()); + assertTrue(ae.isCompleted(context.getAction().getExternalStatus())); + assertEquals("FAILED/KILLED", context.getAction().getExternalStatus()); + assertNull(context.getAction().getData()); + + ae.end(context, context.getAction()); + assertEquals(WorkflowAction.Status.ERROR, context.getAction().getStatus()); + } + + public void testExceptionSubmitThrowable() throws Exception { + String actionXml = "<java>" + + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + + "<name-node>" + getNameNodeUri() + "</name-node>" + + "<main-class>" + LauncherMainTester.class.getName() + "</main-class>" + + "<arg>throwable</arg>" + "</java>"; Context context = createContext(actionXml, null); http://git-wip-us.apache.org/repos/asf/oozie/blob/27096f42/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java index 67eda7e..bbaca14 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java @@ -176,7 +176,30 @@ public class TestLauncher extends XFsTestCase { public void testException() throws Exception { Path actionDir = getFsTestCaseDir(); FileSystem fs = getFileSystem(); - final RunningJob runningJob = _test("ex"); + final RunningJob runningJob = _test("exception"); + waitFor(2000, new Predicate() { + @Override + public boolean evaluate() throws Exception { + return runningJob.isComplete(); + } + }); + assertTrue(runningJob.isSuccessful()); + + Configuration conf = new XConfiguration(); + conf.set("user.name", getTestUser()); + Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, conf); + assertTrue(fs.exists(LauncherMapperHelper.getActionDataSequenceFilePath(actionDir))); + assertTrue(LauncherMapperHelper.isMainDone(runningJob)); + assertFalse(LauncherMapperHelper.isMainSuccessful(runningJob)); + assertFalse(LauncherMapperHelper.hasOutputData(actionData)); + assertFalse(LauncherMapperHelper.hasIdSwap(actionData)); + assertTrue(LauncherMapperHelper.isMainDone(runningJob)); + } + + public void testThrowable() throws Exception { + Path actionDir = getFsTestCaseDir(); + FileSystem fs = getFileSystem(); + final RunningJob runningJob = _test("throwable"); waitFor(2000, new Predicate() { @Override public boolean evaluate() throws Exception { http://git-wip-us.apache.org/repos/asf/oozie/blob/27096f42/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java index 81c9cdb..8e34d18 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java @@ -54,6 +54,8 @@ public class TestMapReduceMain extends MainTestCase { jobConf.set("user.name", getTestUser()); jobConf.set("hadoop.job.ugi", getTestUser() + "," + getTestGroup()); + jobConf.set("mapreduce.job.tags", "" + System.currentTimeMillis()); + setSystemProperty("oozie.job.launch.time", "" + System.currentTimeMillis()); File actionXml = new File(getTestCaseDir(), "action.xml"); OutputStream os = new FileOutputStream(actionXml); http://git-wip-us.apache.org/repos/asf/oozie/blob/27096f42/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index b0527c9..cf13acd 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1733 Fix test failures caused by OOZIE-1722 (rkanter) OOZIE-1223 too many extjs cookies can cause the web UI to stop responding (puru via rkanter) OOZIE-1722 When an ApplicationMaster restarts, it restarts the launcher job (rkanter) OOZIE-1727 Upgrade hadoop-minikdc (puru via rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/27096f42/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java ---------------------------------------------------------------------- diff --git a/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java b/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java index a938ed8..2511019 100644 --- a/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java +++ b/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java @@ -94,6 +94,9 @@ public class TestHiveMain extends MainTestCase { jobConf.set("javax.jdo.option.ConnectionUserName", "sa"); jobConf.set("javax.jdo.option.ConnectionPassword", " "); + jobConf.set("mapreduce.job.tags", "" + System.currentTimeMillis()); + setSystemProperty("oozie.job.launch.time", "" + System.currentTimeMillis()); + SharelibUtils.addToDistributedCache("hive", fs, getFsTestCaseDir(), jobConf); HiveActionExecutor.setHiveScript(jobConf, script.toString(), new String[]{"IN=" + inputDir.toUri().getPath(), http://git-wip-us.apache.org/repos/asf/oozie/blob/27096f42/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java ---------------------------------------------------------------------- diff --git a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java index 1c72d12..040240b 100644 --- a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java +++ b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java @@ -79,7 +79,8 @@ public class TestPigMain extends PigTestCase { // option to specify whether stats should be stored or not jobConf.set("oozie.action.external.stats.write", Boolean.toString(writeStats)); - + jobConf.set("mapreduce.job.tags", "" + System.currentTimeMillis()); + setSystemProperty("oozie.job.launch.time", "" + System.currentTimeMillis()); SharelibUtils.addToDistributedCache("pig", fs, getFsTestCaseDir(), jobConf); http://git-wip-us.apache.org/repos/asf/oozie/blob/27096f42/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java ---------------------------------------------------------------------- diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java index 919543b..cd1a8f3 100644 --- a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java +++ b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java @@ -50,6 +50,9 @@ public class TestStreamingMain extends MainTestCase { jobConf.set("user.name", getTestUser()); jobConf.set("hadoop.job.ugi", getTestUser() + "," + getTestGroup()); + jobConf.set("mapreduce.job.tags", "" + System.currentTimeMillis()); + setSystemProperty("oozie.job.launch.time", "" + System.currentTimeMillis()); + SharelibUtils.addToDistributedCache("streaming", fs, getFsTestCaseDir(), jobConf); MapReduceActionExecutor.setStreaming(jobConf, "cat", "wc", null, null, null);
