Author: virag
Date: Thu May 23 18:20:45 2013
New Revision: 1485803
URL: http://svn.apache.org/r1485803
Log:
OOZIE-1384 Make Uber Mode not the default (rkanter via virag)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
oozie/trunk/core/src/main/resources/oozie-default.xml
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
oozie/trunk/release-log.txt
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java?rev=1485803&r1=1485802&r2=1485803&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
Thu May 23 18:20:45 2013
@@ -254,7 +254,7 @@ public class JavaActionExecutor extends
void injectLauncherUseUberMode(Configuration launcherConf) {
// Set Uber Mode for the launcher (YARN only, ignored by MR1) if not
set by action conf and not disabled in oozie-site
if (launcherConf.get(HADOOP_YARN_UBER_MODE) == null) {
- if
(getOozieConf().getBoolean("oozie.action.launcher.mapreduce.job.ubertask.enable",
true)) {
+ if
(getOozieConf().getBoolean("oozie.action.launcher.mapreduce.job.ubertask.enable",
false)) {
launcherConf.setBoolean(HADOOP_YARN_UBER_MODE, true);
}
}
Modified: oozie/trunk/core/src/main/resources/oozie-default.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/resources/oozie-default.xml?rev=1485803&r1=1485802&r2=1485803&view=diff
==============================================================================
--- oozie/trunk/core/src/main/resources/oozie-default.xml (original)
+++ oozie/trunk/core/src/main/resources/oozie-default.xml Thu May 23 18:20:45
2013
@@ -1430,7 +1430,7 @@
<property>
<name>oozie.action.launcher.mapreduce.job.ubertask.enable</name>
- <value>true</value>
+ <value>false</value>
<description>
Enables Uber Mode for the launcher job in YARN/Hadoop 2 (no effect
in Hadoop 1).
Setting oozie.launcher.mapreduce.job.ubertask.enable in a an
action's configuration section overrides this for that
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java?rev=1485803&r1=1485802&r2=1485803&view=diff
==============================================================================
---
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
(original)
+++
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
Thu May 23 18:20:45 2013
@@ -1442,6 +1442,10 @@ public class TestJavaActionExecutor exte
}
public void testInjectLauncherUseUberMode() throws Exception {
+ // TODO: Delete these two lines once uber mode is set back to the
default (OOZIE-1385)
+
assertFalse(Services.get().getConf().getBoolean("oozie.action.launcher.mapreduce.job.ubertask.enable",
true));
+
Services.get().getConf().setBoolean("oozie.action.launcher.mapreduce.job.ubertask.enable",
true);
+
// default -- should set to true
JavaActionExecutor jae = new JavaActionExecutor();
Configuration conf = new Configuration(false);
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1485803&r1=1485802&r2=1485803&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Thu May 23 18:20:45 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1384 Make Uber Mode not the default (rkanter via virag)
OOZIE-1386 NPE in XOozieClient if fs.default.name is not defined but
fs.defaultFS is (wypoon via rkanter)
OOZIE-1387 Proxysubmission from the Oozie client doesn't allow the mapreduce
API (rkanter)
OOZIE-1244 SLA Support in Oozie (mona)
