Merge -c 1366285 from branch-1 to branch-1.1 to fix MAPREDUCE-1906. L…

…ower minimum heartbeat interval between tasktracker and JobTracker for smaller clusters. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.1@1389995 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 25, 2012 · 51fc461 · 51fc461
1 parent 886e00e
commit 51fc461
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -168,6 +168,10 @@ Release 1.1.0 - 2012.09.16
 
     MAPREDUCE-4511. Add IFile readahead (ahmed via tucu)
 
+    MAPREDUCE-1906. Lower minimum heartbeat interval between tasktracker and 
+    JobTracker for smaller clusters. (Todd Lipcon, backport by 
+    Brandon Li via sseth)
+
   BUG FIXES
 
     HDFS-3696. Set chunked streaming mode in WebHdfsFileSystem write operations

diff --git a/src/mapred/org/apache/hadoop/mapred/JobTracker.java b/src/mapred/org/apache/hadoop/mapred/JobTracker.java
@@ -3462,7 +3462,7 @@ public int getNextHeartbeatInterval() {
     int clusterSize = getClusterStatus().getTaskTrackers();
     int heartbeatInterval =  Math.max(
                                 (int)(1000 * HEARTBEATS_SCALING_FACTOR *
-                                      Math.ceil((double)clusterSize / 
+                                      ((double)clusterSize / 
                                                 NUM_HEARTBEATS_IN_SECOND)),
                                 HEARTBEAT_INTERVAL_MIN) ;
     return heartbeatInterval;

diff --git a/src/mapred/org/apache/hadoop/mapred/MRConstants.java b/src/mapred/org/apache/hadoop/mapred/MRConstants.java
@@ -25,7 +25,7 @@ interface MRConstants {
   //
   // Timeouts, constants
   //
-  public static final int HEARTBEAT_INTERVAL_MIN = 3 * 1000;
+  public static final int HEARTBEAT_INTERVAL_MIN = 300;
 
   public static final long COUNTER_UPDATE_INTERVAL = 60 * 1000;