Author: liangxie
Date: Thu Mar 20 03:25:00 2014
New Revision: 1579520

URL: http://svn.apache.org/r1579520
Log:
HBASE-10782 Hadoop2 MR tests fail occasionally because of 
mapreduce.jobhistory.address is no set in job conf (Shaohui Liu)

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=1579520&r1=1579519&r2=1579520&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
 Thu Mar 20 03:25:00 2014
@@ -2203,6 +2203,10 @@ public class HBaseTestingUtility extends
     if (rmAddress != null) {
       conf.set("yarn.resourcemanager.address", rmAddress);
     }
+    String historyAddress = jobConf.get("mapreduce.jobhistory.address");
+    if (historyAddress != null) {
+      conf.set("mapreduce.jobhistory.address", historyAddress);
+    }
     String schedulerAddress =
       jobConf.get("yarn.resourcemanager.scheduler.address");
     if (schedulerAddress != null) {


Reply via email to