hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
Subject svn commit: r1415849 - in /hadoop/common/branches/branch-1.1: CHANGES.txt src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Date Fri, 30 Nov 2012 20:47:25 GMT
Author: vinodkv
Date: Fri Nov 30 20:47:24 2012
New Revision: 1415849

URL: http://svn.apache.org/viewvc?rev=1415849&view=rev
Log:
MAPREDUCE-4478. Fixed a bug in TaskTracker's heartbeat to keep it under control. (Liyin Liang
via vinodkv)
svn merge --ignore-ancestry -c 1415848 ../branch-1

Modified:
    hadoop/common/branches/branch-1.1/CHANGES.txt
    hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/TaskTracker.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=1415849&r1=1415848&r2=1415849&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Fri Nov 30 20:47:24 2012
@@ -88,6 +88,9 @@ Release 1.1.1 - 2012.11.18
     HADOOP-8745. Incorrect version numbers in hadoop-core POM.
     (Matthias Friedrich via eli)
 
+    MAPREDUCE-4478. Fixed a bug in TaskTracker's heartbeat to keep it under
+    control. (Liyin Liang via vinodkv)
+
 Release 1.1.0 - 2012.09.28
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=1415849&r1=1415848&r2=1415849&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
(original)
+++ hadoop/common/branches/branch-1.1/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Fri Nov 30 20:47:24 2012
@@ -1716,6 +1716,11 @@ public class TaskTracker implements MRCo
         // accelerate to account for multiple finished tasks up-front
         long remaining = 
           (lastHeartbeat + getHeartbeatInterval(finishedCount.get())) - now;
+        
+        if (remaining <= 0) {
+          finishedCount.set(0);
+        }
+          
         while (remaining > 0) {
           // sleeps for the wait time or 
           // until there are *enough* empty slots to schedule tasks



Mime
View raw message