Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 231F9DE2F for ; Wed, 5 Dec 2012 22:28:03 +0000 (UTC) Received: (qmail 24573 invoked by uid 500); 5 Dec 2012 22:28:02 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 24519 invoked by uid 500); 5 Dec 2012 22:28:02 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 24512 invoked by uid 99); 5 Dec 2012 22:28:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2012 22:28:02 +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; Wed, 05 Dec 2012 22:28:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7613823889BF for ; Wed, 5 Dec 2012 22:27:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1417675 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java Date: Wed, 05 Dec 2012 22:27:38 -0000 To: common-commits@hadoop.apache.org From: sseth@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121205222739.7613823889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sseth Date: Wed Dec 5 22:27:38 2012 New Revision: 1417675 URL: http://svn.apache.org/viewvc?rev=1417675&view=rev Log: MAPREDUCE-4697. Fixed a failing unit test - TestMapredHeartbeat. (Contributed by Gopal V) Modified: hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java Modified: hadoop/common/branches/branch-1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1417675&r1=1417674&r2=1417675&view=diff ============================================================================== --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Wed Dec 5 22:27:38 2012 @@ -357,6 +357,9 @@ Release 1.1.2 - Unreleased MAPREDUCE-4696. Fixed a failing unit test - TestMRServerPorts (Gopal V via sseth) + MAPREDUCE-4697. Fixed a failing unit test - TestMapredHeartbeat. + (Gopal V via sseth) + Release 1.1.1 - 2012.11.18 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java?rev=1417675&r1=1417674&r2=1417675&view=diff ============================================================================== --- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java (original) +++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java Wed Dec 5 22:27:38 2012 @@ -58,7 +58,8 @@ public class TestMapredHeartbeat extends // test configured heartbeat interval is capped with min value taskTrackers = 5; - conf.setInt(JobTracker.JT_HEARTBEATS_IN_SECOND, 10); + conf.setInt(JobTracker.JT_HEARTBEATS_IN_SECOND, + (int)Math.ceil((taskTrackers * 1000.0) / MRConstants.HEARTBEAT_INTERVAL_MIN) ); mr = new MiniMRCluster(taskTrackers, "file:///", 3, null, null, conf); jc = new JobClient(mr.createJobConf());