Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 17187 invoked from network); 29 Aug 2007 21:37:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Aug 2007 21:37:13 -0000 Received: (qmail 89980 invoked by uid 500); 29 Aug 2007 21:37:08 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 89953 invoked by uid 500); 29 Aug 2007 21:37:08 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 89944 invoked by uid 99); 29 Aug 2007 21:37:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Aug 2007 14:37:08 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Aug 2007 21:37:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 253E11A9842; Wed, 29 Aug 2007 14:36:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r570940 - in /lucene/hadoop/branches/branch-0.14: CHANGES.txt src/java/org/apache/hadoop/mapred/JobTracker.java Date: Wed, 29 Aug 2007 21:36:51 -0000 To: hadoop-commits@lucene.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070829213652.253E11A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cutting Date: Wed Aug 29 14:36:51 2007 New Revision: 570940 URL: http://svn.apache.org/viewvc?rev=570940&view=rev Log: Merge -r 570936:570937 from trunk to 0.14 branch. Fixes: HADOOP-1798. Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/JobTracker.java Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/CHANGES.txt?rev=570940&r1=570939&r2=570940&view=diff ============================================================================== --- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original) +++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Wed Aug 29 14:36:51 2007 @@ -11,6 +11,9 @@ HADOOP-1790. Fix tasktracker to work correctly on multi-homed boxes. (Torsten Curdt via cutting) + HADOOP-1798. Fix jobtracker to correctly account for failed + tasks. (omalley via cutting) + Release 0.14.0 - 2007-08-17 Modified: lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/JobTracker.java URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/JobTracker.java?rev=570940&r1=570939&r2=570940&view=diff ============================================================================== --- lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/JobTracker.java (original) +++ lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/JobTracker.java Wed Aug 29 14:36:51 2007 @@ -1225,7 +1225,7 @@ // If not first contact, there should be some record of the tracker if (!seenBefore) { LOG.warn("Status from unknown Tracker : " + trackerName); - taskTrackers.remove(trackerName); + updateTaskTrackerStatus(trackerName, null); return false; } }