Return-Path: Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org Received: (qmail 64268 invoked from network); 8 Jan 2009 05:53:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Jan 2009 05:53:45 -0000 Received: (qmail 8860 invoked by uid 500); 8 Jan 2009 05:53:44 -0000 Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org Received: (qmail 8827 invoked by uid 500); 8 Jan 2009 05:53:44 -0000 Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: core-dev@hadoop.apache.org Delivered-To: mailing list core-commits@hadoop.apache.org Received: (qmail 8818 invoked by uid 99); 8 Jan 2009 05:53:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Jan 2009 21:53:44 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 08 Jan 2009 05:53:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ADD32238896F; Wed, 7 Jan 2009 21:53:21 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r732615 - in /hadoop/core/branches/branch-0.19: CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobTracker.java Date: Thu, 08 Jan 2009 05:53:21 -0000 To: core-commits@hadoop.apache.org From: ddas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090108055321.ADD32238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ddas Date: Wed Jan 7 21:53:21 2009 New Revision: 732615 URL: http://svn.apache.org/viewvc?rev=732615&view=rev Log: Merge -r 732613:732614 from trunk onto 0.19 branch. Fixes HADOOP-4966. Modified: hadoop/core/branches/branch-0.19/CHANGES.txt hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java Modified: hadoop/core/branches/branch-0.19/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=732615&r1=732614&r2=732615&view=diff ============================================================================== --- hadoop/core/branches/branch-0.19/CHANGES.txt (original) +++ hadoop/core/branches/branch-0.19/CHANGES.txt Wed Jan 7 21:53:21 2009 @@ -38,6 +38,9 @@ HADOOP-4847. Moves the loading of OutputCommitter to the Task. (Amareshwari Sriramadasu via ddas) + HADOOP-4966. Marks completed setup tasks for removal. + (Amareshwari Sriramadasu via ddas) + Release 0.19.0 - 2008-11-18 INCOMPATIBLE CHANGES Modified: hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=732615&r1=732614&r2=732615&view=diff ============================================================================== --- hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original) +++ hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobTracker.java Wed Jan 7 21:53:21 2009 @@ -1440,6 +1440,16 @@ * @param job the completed job */ void markCompletedJob(JobInProgress job) { + for (TaskInProgress tip : job.getSetupTasks()) { + for (TaskStatus taskStatus : tip.getTaskStatuses()) { + if (taskStatus.getRunState() != TaskStatus.State.RUNNING && + taskStatus.getRunState() != TaskStatus.State.COMMIT_PENDING && + taskStatus.getRunState() != TaskStatus.State.UNASSIGNED) { + markCompletedTaskAttempt(taskStatus.getTaskTracker(), + taskStatus.getTaskID()); + } + } + } for (TaskInProgress tip : job.getMapTasks()) { for (TaskStatus taskStatus : tip.getTaskStatuses()) { if (taskStatus.getRunState() != TaskStatus.State.RUNNING &&