You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pb...@apache.org on 2017/05/19 12:08:37 UTC
oozie git commit: Fixing failing tests
Repository: oozie
Updated Branches:
refs/heads/oya be32cda04 -> 095c1a43e
Fixing failing tests
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/095c1a43
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/095c1a43
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/095c1a43
Branch: refs/heads/oya
Commit: 095c1a43eae212cbc338c1358e144d6d9ebb85f5
Parents: be32cda
Author: Peter Bacsko <pb...@cloudera.com>
Authored: Fri May 19 14:08:30 2017 +0200
Committer: Peter Bacsko <pb...@cloudera.com>
Committed: Fri May 19 14:08:30 2017 +0200
----------------------------------------------------------------------
.../action/hadoop/MapReduceActionExecutor.java | 3 +-
.../action/hadoop/TestJavaActionExecutor.java | 65 --------------------
.../apache/oozie/util/TestClasspathUtils.java | 5 +-
3 files changed, 3 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/095c1a43/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
index ca7c7f2..634a1cb 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
@@ -117,7 +117,6 @@ public class MapReduceActionExecutor extends JavaActionExecutor {
throws ActionExecutorException {
super.setupLauncherConf(conf, actionXml, appPath, context);
conf.setBoolean("mapreduce.job.complete.cancel.delegation.tokens", false);
- injectConfigClass(conf, actionXml);
return conf;
}
@@ -141,6 +140,8 @@ public class MapReduceActionExecutor extends JavaActionExecutor {
Configuration setupActionConf(Configuration actionConf, Context context, Element actionXml, Path appPath)
throws ActionExecutorException {
boolean regularMR = false;
+
+ injectConfigClass(actionConf, actionXml);
Namespace ns = actionXml.getNamespace();
if (actionXml.getChild("streaming", ns) != null) {
Element streamingXml = actionXml.getChild("streaming", ns);
http://git-wip-us.apache.org/repos/asf/oozie/blob/095c1a43/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 f14f060..749050f 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
@@ -1759,71 +1759,6 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
assertEquals("v2b", conf.get("p2"));
}
- public void testUpdateConfForJavaTmpDir() throws Exception {
-
- //Test UpdateCOnfForJavaTmpDir for launcherConf
- String actionXml1 = "<java>"
- + "<job-tracker>"
- + getJobTrackerUri()
- + "</job-tracker>"
- + "<name-node>"
- + getNameNodeUri()
- + "</name-node>"
- + "<configuration>"
- + "<property><name>oozie.launcher.yarn.app.mapreduce.am.command-opts</name>"
- + "<value>-Xmx1024m -Djava.net.preferIPv4Stack=true -Djava.io.tmpdir=./usr</value></property>"
- + "<property><name>oozie.launcher.mapred.child.java.opts</name>"
- + "<value>-Xmx2048m -Djava.net.preferIPv4Stack=true</value></property>"
- + "<property><name>oozie.launcher.mapreduce.reduce.java.opts</name>"
- + "<value>-Xmx2560m -XX:NewRatio=8 -Djava.io.tmpdir=./usr</value></property>"
- + "</configuration>" + "<main-class>MAIN-CLASS</main-class>" + "</java>";
- JavaActionExecutor ae = new JavaActionExecutor();
- WorkflowJobBean wfBean = addRecordToWfJobTable("test1", actionXml1);
- WorkflowActionBean action = (WorkflowActionBean) wfBean.getActions().get(0);
- action.setType(ae.getType());
- action.setConf(actionXml1);
-
- Context context = new Context(wfBean, action);
- Element actionXmlconf = XmlUtils.parseXml(action.getConf());
-
- Configuration actionConf = ae.createBaseHadoopConf(context, actionXmlconf);
- Configuration conf = ae.createLauncherConf(getFileSystem(), context, action, actionXmlconf, actionConf);
-
- assertEquals("-Xmx2048m -Djava.net.preferIPv4Stack=true",
- conf.get(JavaActionExecutor.HADOOP_CHILD_JAVA_OPTS));
- assertEquals("-Xmx2048m -Djava.net.preferIPv4Stack=true",
- conf.get(JavaActionExecutor.HADOOP_MAP_JAVA_OPTS));
- assertEquals("-Xmx2560m -XX:NewRatio=8 -Djava.io.tmpdir=./usr", conf.get(JavaActionExecutor.HADOOP_REDUCE_JAVA_OPTS));
- assertEquals("-Xmx1024m -Djava.net.preferIPv4Stack=true -Djava.io.tmpdir=./usr",
- conf.get(JavaActionExecutor.YARN_AM_COMMAND_OPTS).trim());
-
- //Test UpdateConfForJavaTmpDIr for actionConf
- String actionXml = "<java>"
- + "<job-tracker>"
- + getJobTrackerUri()
- + "</job-tracker>"
- + "<name-node>"
- + getNameNodeUri()
- + "</name-node>"
- + "<configuration>"
- + "<property><name>mapreduce.map.java.opts</name>"
- + "<value>-Xmx1024m -Djava.io.tmpdir=./usr</value></property>"
- + "<property><name>mapreduce.reduce.java.opts</name>"
- + "<value>-Xmx2560m -XX:NewRatio=8</value></property>"
- + "</configuration>" + "<main-class>MAIN-CLASS</main-class>" + "</java>";
- Element eActionXml = XmlUtils.parseXml(actionXml);
- Context context2 = createContext(actionXml, null);
- Path appPath2 = getAppPath();
- JavaActionExecutor ae2 = new JavaActionExecutor();
- Configuration jobConf = ae2.createBaseHadoopConf(context2, eActionXml);
- ae2.setupActionConf(jobConf, context2, eActionXml, appPath2);
-
- assertEquals("-Xmx200m", jobConf.get(JavaActionExecutor.HADOOP_CHILD_JAVA_OPTS));
- assertEquals("-Xmx1024m -Djava.io.tmpdir=./usr", jobConf.get(JavaActionExecutor.HADOOP_MAP_JAVA_OPTS));
- assertEquals("-Xmx2560m -XX:NewRatio=8", jobConf.get(JavaActionExecutor.HADOOP_REDUCE_JAVA_OPTS));
- assertEquals("-Xmx1024m -Djava.io.tmpdir=./tmp", jobConf.get(JavaActionExecutor.YARN_AM_COMMAND_OPTS));
- }
-
public void testUpdateConfForTimeLineServiceEnabled() throws Exception {
Element actionXml = XmlUtils
.parseXml("<java>"
http://git-wip-us.apache.org/repos/asf/oozie/blob/095c1a43/core/src/test/java/org/apache/oozie/util/TestClasspathUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/util/TestClasspathUtils.java b/core/src/test/java/org/apache/oozie/util/TestClasspathUtils.java
index 3a7215b..2e732cb 100644
--- a/core/src/test/java/org/apache/oozie/util/TestClasspathUtils.java
+++ b/core/src/test/java/org/apache/oozie/util/TestClasspathUtils.java
@@ -69,7 +69,7 @@ public class TestClasspathUtils extends XFsTestCase {
assertEquals(2, env.size());
assertTrue(env.containsKey("CLASSPATH"));
String[] paths = env.get("CLASSPATH").split(":");
- assertEquals(12, paths.length);
+ assertEquals(9, paths.length);
Arrays.sort(paths);
assertEquals("$HADOOP_COMMON_HOME/share/hadoop/common/*", paths[0]);
assertEquals("$HADOOP_COMMON_HOME/share/hadoop/common/lib/*", paths[1]);
@@ -80,9 +80,6 @@ public class TestClasspathUtils extends XFsTestCase {
assertEquals("$HADOOP_YARN_HOME/share/hadoop/yarn/lib/*", paths[6]);
assertEquals("$PWD", paths[7]);
assertEquals("$PWD/*", paths[8]);
- assertEquals("job.jar/classes/", paths[9]);
- assertEquals("job.jar/job.jar", paths[10]);
- assertEquals("job.jar/lib/*", paths[11]);
assertTrue(env.containsKey("$PWD"));
paths = env.get("$PWD").split(":");