Author: tucu
Date: Fri May 11 19:50:13 2012
New Revision: 1337346
URL: http://svn.apache.org/viewvc?rev=1337346&view=rev
Log:
OOZIE-834 Testcases for MapReduceMain, StreamingMain, PigMain, HiveMain fail
with Hadoop 2 (tucu)
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPipesMain.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
incubator/oozie/trunk/release-log.txt
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java?rev=1337346&r1=1337345&r2=1337346&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveMain.java
Fri May 11 19:50:13 2012
@@ -80,7 +80,7 @@ public class TestHiveMain extends MainTe
w.close();
XConfiguration jobConf = new XConfiguration();
- jobConf.set("mapreduce.framework.name", "yarn");
+ XConfiguration.copy(createJobConf(), jobConf);
jobConf.set("oozie.hive.log.level", "DEBUG");
@@ -89,8 +89,6 @@ public class TestHiveMain extends MainTe
jobConf.setInt("mapred.map.tasks", 1);
jobConf.setInt("mapred.map.max.attempts", 1);
jobConf.setInt("mapred.reduce.max.attempts", 1);
- jobConf.set("mapred.job.tracker", getJobTrackerUri());
- jobConf.set("fs.default.name", getNameNodeUri());
jobConf.set("javax.jdo.option.ConnectionURL", "jdbc:derby:" +
getTestCaseDir() + "/db;create=true");
jobConf.set("javax.jdo.option.ConnectionDriverName",
"org.apache.derby.jdbc.EmbeddedDriver");
jobConf.set("javax.jdo.option.ConnectionUserName", "sa");
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java?rev=1337346&r1=1337345&r2=1337346&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
Fri May 11 19:50:13 2012
@@ -44,15 +44,13 @@ public class TestMapReduceMain extends M
Path outputDir = new Path(getFsTestCaseDir(), "output");
XConfiguration jobConf = new XConfiguration();
+ XConfiguration.copy(createJobConf(), jobConf);
- jobConf.set("mapreduce.framework.name", "yarn");
jobConf.setInt("mapred.map.tasks", 1);
jobConf.setInt("mapred.map.max.attempts", 1);
jobConf.setInt("mapred.reduce.max.attempts", 1);
- jobConf.set("mapred.job.tracker", getJobTrackerUri());
- jobConf.set("fs.default.name", getNameNodeUri());
jobConf.set("mapred.input.dir", inputDir.toString());
jobConf.set("mapred.output.dir", outputDir.toString());
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java?rev=1337346&r1=1337345&r2=1337346&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
Fri May 11 19:50:13 2012
@@ -67,16 +67,13 @@ public class TestPigMain extends PigTest
Path outputDir = new Path(getFsTestCaseDir(), "output");
XConfiguration jobConf = new XConfiguration();
+ XConfiguration.copy(createJobConf(), jobConf);
jobConf.set("user.name", getTestUser());
jobConf.set("group.name", getTestGroup());
jobConf.setInt("mapred.map.tasks", 1);
jobConf.setInt("mapred.map.max.attempts", 1);
jobConf.setInt("mapred.reduce.max.attempts", 1);
- jobConf.set("mapred.job.tracker", getJobTrackerUri());
- jobConf.set("fs.default.name", getNameNodeUri());
-
- jobConf.set("mapreduce.framework.name", "yarn");
// option to specify whether stats should be stored or not
jobConf.set("oozie.action.external.stats.write",
Boolean.toString(writeStats));
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPipesMain.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPipesMain.java?rev=1337346&r1=1337345&r2=1337346&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPipesMain.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPipesMain.java
Fri May 11 19:50:13 2012
@@ -76,6 +76,7 @@ public class TestPipesMain extends MainT
XConfiguration jobConf = new XConfiguration();
+ XConfiguration.copy(createJobConf(), jobConf);
jobConf.set("user.name", getTestUser());
@@ -83,10 +84,6 @@ public class TestPipesMain extends MainT
jobConf.setInt("mapred.map.max.attempts", 1);
jobConf.setInt("mapred.reduce.max.attempts", 1);
- jobConf.set("mapred.job.tracker", getJobTrackerUri());
- jobConf.set("fs.default.name", getNameNodeUri());
- jobConf.set("mapreduce.framework.name", "yarn");
-
jobConf.set("mapred.input.dir", inputDir.toString());
jobConf.set("mapred.output.dir", outputDir.toString());
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java?rev=1337346&r1=1337345&r2=1337346&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java
Fri May 11 19:50:13 2012
@@ -44,13 +44,11 @@ public class TestStreamingMain extends M
Path outputDir = new Path(getFsTestCaseDir(), "output");
XConfiguration jobConf = new XConfiguration();
+ XConfiguration.copy(createJobConf(), jobConf);
jobConf.setInt("mapred.map.tasks", 1);
jobConf.setInt("mapred.map.max.attempts", 1);
jobConf.setInt("mapred.reduce.max.attempts", 1);
- jobConf.set("mapred.job.tracker", getJobTrackerUri());
- jobConf.set("fs.default.name", getNameNodeUri());
- jobConf.set("mapreduce.framework.name", "yarn");
jobConf.set("user.name", getTestUser());
jobConf.set("hadoop.job.ugi", getTestUser() + "," + getTestGroup());
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1337346&r1=1337345&r2=1337346&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
Fri May 11 19:50:13 2012
@@ -723,5 +723,22 @@ public abstract class XTestCase extends
}
}
+ /**
+ * Returns a jobconf preconfigured to talk with the test
cluster/minicluster.
+ * @return a jobconf preconfigured to talk with the test
cluster/minicluster.
+ */
+ protected JobConf createJobConf() {
+ JobConf jobConf;
+ if (mrCluster != null) {
+ jobConf = mrCluster.createJobConf();
+ }
+ else {
+ jobConf = new JobConf();
+ jobConf.set("mapred.job.tracker", getJobTrackerUri());
+ jobConf.set("fs.default.name", getNameNodeUri());
+ }
+ return jobConf;
+ }
+
}
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1337346&r1=1337345&r2=1337346&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Fri May 11 19:50:13 2012
@@ -1,5 +1,6 @@
-- Oozie trunk
+OOZIE-834 Testcases for MapReduceMain, StreamingMain, PigMain, HiveMain fail
with Hadoop 2 (tucu)
OOZIE-831 POMs cleanup/fixing of hadoop version and to be able to publish
oozie JARs to maven repo (tucu)
OOZIE-830 add support for multiple/configurable sharelibs for each action type
(tucu)
OOZIE-773 AuthorizationService should be able to use a group to identify
superusers (tucu)
