Author: sseth
Date: Fri Jul 27 04:42:15 2012
New Revision: 1366285
URL: http://svn.apache.org/viewvc?rev=1366285&view=rev
Log:
MAPREDUCE-1906. Lower minimum heartbeat interval between tasktracker and
JobTracker for smaller clusters. (Contributed by Todd Lipcon, backport by
Brandon Li)
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/MRConstants.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1366285&r1=1366284&r2=1366285&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Fri Jul 27 04:42:15 2012
@@ -51,7 +51,12 @@ Release 1.2.0 - unreleased
HDFS-496. Backport: Use PureJavaCrc32 in HDFS. (Brandon Li via szetszwo)
- MAPREDUCE-782. Use PureJavaCrc32 in mapreduce spills. (Todd Lipcon,
backport by Brandon Li via sseth)
+ MAPREDUCE-782. Use PureJavaCrc32 in mapreduce spills.
+ (Todd Lipcon, backport by Brandon Li via sseth)
+
+ MAPREDUCE-1906. Lower minimum heartbeat interval between tasktracker and
+ JobTracker for smaller clusters. (Todd Lipcon, backport by
+ Brandon Li via sseth)
OPTIMIZATIONS
Modified:
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=1366285&r1=1366284&r2=1366285&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
(original)
+++
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
Fri Jul 27 04:42:15 2012
@@ -3142,7 +3142,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/src/mapred/org/apache/hadoop/mapred/MRConstants.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/MRConstants.java?rev=1366285&r1=1366284&r2=1366285&view=diff
==============================================================================
---
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/MRConstants.java
(original)
+++
hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/MRConstants.java
Fri Jul 27 04:42:15 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;
