hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject svn commit: r1389995 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobTracker.java src/mapred/org/apache/hadoop/mapred/MRConstants.java
Date Tue, 25 Sep 2012 17:11:59 GMT
Author: acmurthy
Date: Tue Sep 25 17:11:58 2012
New Revision: 1389995

URL: http://svn.apache.org/viewvc?rev=1389995&view=rev
Log:
Merge -c 1366285 from branch-1 to branch-1.1 to fix MAPREDUCE-1906. Lower minimum heartbeat
interval between tasktracker and JobTracker for smaller clusters.

Modified:
    hadoop/common/branches/branch-1.1/CHANGES.txt
    hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
    hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/MRConstants.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=1389995&r1=1389994&r2=1389995&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Tue Sep 25 17:11:58 2012
@@ -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

Modified: hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=1389995&r1=1389994&r2=1389995&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
(original)
+++ hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
Tue Sep 25 17:11:58 2012
@@ -3462,7 +3462,7 @@ public class JobTracker implements MRCon
     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;

Modified: hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/MRConstants.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/MRConstants.java?rev=1389995&r1=1389994&r2=1389995&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/MRConstants.java
(original)
+++ hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/MRConstants.java
Tue Sep 25 17:11:58 2012
@@ -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;
 



Mime
View raw message