svn commit: r1487904 - in /oozie/trunk: core/src/test/java/org/apache/oozie/test/XTestCase.java release-log.txt

[rk...@apache.org]

Author: rkanter
Date: Thu May 30 16:08:50 2013
New Revision: 1487904

URL: http://svn.apache.org/r1487904
Log:
OOZIE-1395 Using Yarn's CapacityScheduler causes some tests to time out (rkanter)

Modified:
    oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
    oozie/trunk/release-log.txt

Modified: oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1487904&r1=1487903&r2=1487904&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/test/XTestCase.java Thu May 30 16:08:50 2013
@@ -780,9 +780,11 @@ public abstract class XTestCase extends 
             UserGroupInformation.createUserForTesting(getTestUser3(), new String[] { "users" } );
             conf.set("hadoop.tmp.dir", "target/test-data"+"/minicluster");
 
-            // Scheduler properties required for YARN to work
+            // Scheduler properties required for YARN CapacityScheduler to work
             conf.set("yarn.scheduler.capacity.root.queues", "default");
             conf.set("yarn.scheduler.capacity.root.default.capacity", "100");
+            // Required to prevent deadlocks with YARN CapacityScheduler
+            conf.set("yarn.scheduler.capacity.maximum-am-resource-percent", "0.5");
 
             try {
                 dfsCluster = new MiniDFSCluster(conf, dataNodes, true, null);

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1487904&r1=1487903&r2=1487904&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Thu May 30 16:08:50 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1395 Using Yarn's CapacityScheduler causes some tests to time out (rkanter)
 OOZIE-1373 Oozie compilation fails with jdk7 (tucu, rohini via rohini)
 OOZIE-1296 SLA JMS Event Listener for publishing notifications related to SLA information (ryota via mona)
 OOZIE-1361 Remove SLACalculatorBean and add columns to SummaryBean indicating events processed and sla processed (mona)