You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pu...@apache.org on 2016/05/27 04:22:23 UTC
oozie git commit: OOZIE-2535 User can't disable uber mode
Repository: oozie
Updated Branches:
refs/heads/master b0ebf58e8 -> 3c50d5c32
OOZIE-2535 User can't disable uber mode
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/3c50d5c3
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/3c50d5c3
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/3c50d5c3
Branch: refs/heads/master
Commit: 3c50d5c32963bdee603ace70d15d1d3349833f5d
Parents: b0ebf58
Author: Purshotam Shah <pu...@yahoo-inc.com>
Authored: Thu May 26 21:22:12 2016 -0700
Committer: Purshotam Shah <pu...@yahoo-inc.com>
Committed: Thu May 26 21:22:12 2016 -0700
----------------------------------------------------------------------
.../oozie/action/hadoop/JavaActionExecutor.java | 2 +-
.../action/hadoop/TestJavaActionExecutor.java | 23 ++++++++++++++++++++
release-log.txt | 1 +
3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/3c50d5c3/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
index a081e66..6893bb8 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
@@ -259,7 +259,7 @@ public class JavaActionExecutor extends ActionExecutor {
injectLauncherProperties(actionDefaultConf, launcherConf);
// Inject <job-xml> and <configuration> for launcher
try {
- parseJobXmlAndConfiguration(context, actionXml, appPath, conf, true);
+ parseJobXmlAndConfiguration(context, actionXml, appPath, launcherConf, true);
} catch (HadoopAccessorException ex) {
throw convertException(ex);
} catch (URISyntaxException ex) {
http://git-wip-us.apache.org/repos/asf/oozie/blob/3c50d5c3/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 3dad557..057c9fb 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
@@ -2330,6 +2330,29 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
assertEquals("false", launcherConf.get(JavaActionExecutor.HADOOP_YARN_UBER_MODE));
}
+ public void testDisableUberForUserProperties() throws Exception {
+ Element actionXml1 = XmlUtils.parseXml("<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>"
+ + "<name-node>" + getNameNodeUri() + "</name-node>"
+ + "<configuration>"
+ + "<property><name>oozie.launcher.mapreduce.job.ubertask.enable</name>"
+ + "<value>false</value></property>"
+ + "</configuration>"
+ + "<main-class>MAIN-CLASS</main-class>" + "</java>");
+ JavaActionExecutor ae = new JavaActionExecutor();
+ XConfiguration protoConf = new XConfiguration();
+ protoConf.set(WorkflowAppService.HADOOP_USER, getTestUser());
+
+ WorkflowJobBean wf = createBaseWorkflow(protoConf, "action");
+ WorkflowActionBean action = (WorkflowActionBean) wf.getActions().get(0);
+ action.setType(ae.getType());
+
+ Context context = new Context(wf, action);
+ JobConf launcherConf = new JobConf();
+ launcherConf = ae.createLauncherConf(getFileSystem(), context, action, actionXml1, launcherConf);
+ // uber mode should be disabled since oozie.launcher.mapreduce.job.classloader=true
+ assertEquals("false", launcherConf.get(JavaActionExecutor.HADOOP_YARN_UBER_MODE));
+ }
+
public void testUpdateConfForTimeLineServiceEnabled() throws Exception {
Element actionXml = XmlUtils
.parseXml("<java>"
http://git-wip-us.apache.org/repos/asf/oozie/blob/3c50d5c3/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index fb2cbdb..1c8d11b 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2535 User can't disable uber mode (puru)
OOZIE-2482 Pyspark job fails with Oozie (satishsaley and gezapeti via rkanter)
OOZIE-2467 Oozie can shutdown itself on long GC pause (puru)
OOZIE-2537 SqoopMain does not set up log4j properly (pbacsko via rkanter)