Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56938D894 for ; Fri, 30 Nov 2012 20:47:48 +0000 (UTC) Received: (qmail 27940 invoked by uid 500); 30 Nov 2012 20:47:48 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 27887 invoked by uid 500); 30 Nov 2012 20:47:48 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 27880 invoked by uid 99); 30 Nov 2012 20:47:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2012 20:47:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Nov 2012 20:47:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EB3CF238896F for ; Fri, 30 Nov 2012 20:47:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: common-commits@hadoop.apache.org From: vinodkv@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121130204726.EB3CF238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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