Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-8528 [hadoop2] TestMultiTableInputFormat always hadoop with YARN-129 applied (with Gary Helmling) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1482561 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Hsieh 2013-05-14 20:27:11 +00:00
parent 98330fa720
commit d1c5b7cbd2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
View File

@ -1683,10 +1683,13 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
conf.get("mapred.local.dir")); //Hadoop MiniMR overwrites this while it should not conf.get("mapred.local.dir")); //Hadoop MiniMR overwrites this while it should not
LOG.info("Mini mapreduce cluster started"); 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")); conf.set("mapred.job.tracker", jobConf.get("mapred.job.tracker"));
// this for mrv2 support; mr1 ignores this // this for mrv2 support; mr1 ignores this
conf.set("mapreduce.framework.name", "yarn"); conf.set("mapreduce.framework.name", "yarn");
conf.setBoolean("yarn.is.minicluster", true);
String rmAddress = jobConf.get("yarn.resourcemanager.address"); String rmAddress = jobConf.get("yarn.resourcemanager.address");
if (rmAddress != null) { if (rmAddress != null) {
conf.set("yarn.resourcemanager.address", rmAddress); conf.set("yarn.resourcemanager.address", rmAddress);