hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ss...@apache.org
Subject svn commit: r1417676 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java
Date Wed, 05 Dec 2012 22:28:38 GMT
Author: sseth
Date: Wed Dec  5 22:28:38 2012
New Revision: 1417676

URL: http://svn.apache.org/viewvc?rev=1417676&view=rev
Log:
merge MAPREDUCE-4697 from branch-1. Fixed a failing unit test - TestMapredHeartbeat. (Contributed
by Gopal V)

Modified:
    hadoop/common/branches/branch-1.1/CHANGES.txt
    hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1417676&r1=1417675&r2=1417676&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Wed Dec  5 22:28:38 2012
@@ -44,6 +44,9 @@ Release 1.1.2 - 2012.12.05
     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.1/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java?rev=1417676&r1=1417675&r2=1417676&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java
(original)
+++ hadoop/common/branches/branch-1.1/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java
Wed Dec  5 22:28: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());



Mime
View raw message