Author: rkanter
Date: Fri Dec 6 17:46:51 2013
New Revision: 1548612
URL: http://svn.apache.org/r1548612
Log:
OOZIE-1634 TestJavaActionExecutor#testUpdateConfForUberMode fails against
Hadoop 2 (rkanter)
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
oozie/trunk/release-log.txt
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=1548612&r1=1548611&r2=1548612&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
Fri Dec 6 17:46:51 2013
@@ -1588,8 +1588,15 @@ public class TestJavaActionExecutor exte
assertEquals("2560",
launcherConf.get(JavaActionExecutor.YARN_AM_RESOURCE_MB));
// heap size in child.opts (2048 + 512)
int heapSize =
ae.extractHeapSizeMB(launcherConf.get(JavaActionExecutor.YARN_AM_COMMAND_OPTS));
- assertEquals("-Xmx2048m -Djava.net.preferIPv4Stack=true -Xmx2560m",
-
launcherConf.get(JavaActionExecutor.YARN_AM_COMMAND_OPTS).trim());
+ // There's an extra parameter (-Xmx1024m) in here when using YARN
that's not here when using MR1
+ if (createJobConf().get("yarn.resourcemanager.address") != null) {
+ assertEquals("-Xmx1024m -Xmx2048m -Djava.net.preferIPv4Stack=true
-Xmx2560m",
+
launcherConf.get(JavaActionExecutor.YARN_AM_COMMAND_OPTS).trim());
+ }
+ else {
+ assertEquals("-Xmx2048m -Djava.net.preferIPv4Stack=true -Xmx2560m",
+
launcherConf.get(JavaActionExecutor.YARN_AM_COMMAND_OPTS).trim());
+ }
// env
assertEquals("A=foo",
launcherConf.get(JavaActionExecutor.YARN_AM_ENV));
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1548612&r1=1548611&r2=1548612&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Dec 6 17:46:51 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1634 TestJavaActionExecutor#testUpdateConfForUberMode fails against
Hadoop 2 (rkanter)
OOZIE-1633 Test failures related to sharelib when running against Hadoop 2
(rkanter)
OOZIE-1598 enable html email in email action (puru via ryota)
OOZIE-1631 Tools module should have a direct dependency on mockito (rkanter)
