From c729de9aa0d0c0ba765fe49db891596473bd0383 Mon Sep 17 00:00:00 2001
From: liangxie <liangxie@unknown>
Date: Thu, 20 Mar 2014 03:25:00 +0000
Subject: [PATCH] HBASE-10782 Hadoop2 MR tests fail occasionally because of
 mapreduce.jobhistory.address is no set in job conf (Shaohui Liu)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1579520 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/hadoop/hbase/HBaseTestingUtility.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index 5e0225d7db3..6372ab14bfb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -2203,6 +2203,10 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility {
     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) {