Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D24A6C720 for ; Thu, 20 Mar 2014 03:26:12 +0000 (UTC) Received: (qmail 35851 invoked by uid 500); 20 Mar 2014 03:26:11 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 35807 invoked by uid 500); 20 Mar 2014 03:26:10 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 35800 invoked by uid 99); 20 Mar 2014 03:26:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Mar 2014 03:26:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Mar 2014 03:26:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D4E612388A4A; Thu, 20 Mar 2014 03:25:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1579523 - /hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Date: Thu, 20 Mar 2014 03:25:46 -0000 To: commits@hbase.apache.org From: liangxie@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140320032546.D4E612388A4A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: liangxie Date: Thu Mar 20 03:25:46 2014 New Revision: 1579523 URL: http://svn.apache.org/r1579523 Log: HBASE-10782 Hadoop2 MR tests fail occasionally because of mapreduce.jobhistory.address is no set in job conf (Shaohui Liu) Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1579523&r1=1579522&r2=1579523&view=diff ============================================================================== --- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original) +++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Thu Mar 20 03:25:46 2014 @@ -1515,6 +1515,10 @@ public class HBaseTestingUtility { if (rmAdress != null) { conf.set("yarn.resourcemanager.address", rmAdress); } + String historyAddress = jobConf.get("mapreduce.jobhistory.address"); + if (historyAddress != null) { + conf.set("mapreduce.jobhistory.address", historyAddress); + } String schedulerAdress = mrClusterJobConf.get("yarn.resourcemanager.scheduler.address"); if (schedulerAdress != null) {