Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hbase.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1482561 -
 /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
Date: Tue, 14 May 2013 20:27:12 -0000
To: commits@hbase.apache.org
From: jmhsieh@apache.org
Message-Id: <20130514202712.3D2E223889F1@eris.apache.org>

Author: jmhsieh
Date: Tue May 14 20:27:11 2013
New Revision: 1482561

URL: http://svn.apache.org/r1482561
Log:
HBASE-8528 [hadoop2] TestMultiTableInputFormat always hadoop with YARN-129 applied (with Gary Helmling)

Modified:
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1482561&r1=1482560&r2=1482561&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Tue May 14 20:27:11 2013
@@ -1683,10 +1683,13 @@ public class HBaseTestingUtility extends
       conf.get("mapred.local.dir")); //Hadoop MiniMR overwrites this while it should not
     LOG.info("Mini mapreduce cluster started");
 
-    // Needed for TestImportTsv.
+    // In hadoop2, YARN/MR2 starts a mini cluster with its own conf instance and updates settings.
+    // Our HBase MR jobs need several of these settings in order to properly run.  So we copy the
+    // necessary config properties here.  YARN-129 required adding a few properties.
     conf.set("mapred.job.tracker", jobConf.get("mapred.job.tracker"));
     // this for mrv2 support; mr1 ignores this
     conf.set("mapreduce.framework.name", "yarn");
+    conf.setBoolean("yarn.is.minicluster", true);
     String rmAddress = jobConf.get("yarn.resourcemanager.address");
     if (rmAddress != null) {
       conf.set("yarn.resourcemanager.address", rmAddress);