Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 96097 invoked from network); 4 Mar 2011 04:25:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 04:25:10 -0000 Received: (qmail 97718 invoked by uid 500); 4 Mar 2011 04:25:09 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 97677 invoked by uid 500); 4 Mar 2011 04:25:09 -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 97670 invoked by uid 99); 4 Mar 2011 04:25:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 04:25:09 +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, 04 Mar 2011 04:25:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9F9712388C02; Fri, 4 Mar 2011 04:24:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1077529 - /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Date: Fri, 04 Mar 2011 04:24:46 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304042446.9F9712388C02@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Fri Mar 4 04:24:46 2011 New Revision: 1077529 URL: http://svn.apache.org/viewvc?rev=1077529&view=rev Log: commit efd1c8cf0571e8c7ca0308ccc1ee2c721b73977d Author: Arun C Murthy Date: Fri Jul 2 22:55:32 2010 -0700 MAPREDUCE-1682. Fix speculative execution to ensure tasks are not scheduled after job failure. +++ b/YAHOO-CHANGES.txt + MAPREDUCE-1682. Fix speculative execution to ensure tasks are not + scheduled after job failure. (acmurthy) + Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Modified: hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=1077529&r1=1077528&r2=1077529&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Fri Mar 4 04:24:46 2011 @@ -2000,7 +2000,7 @@ public class JobInProgress { while (iter.hasNext()) { TaskInProgress tip = iter.next(); // should never be true! (since we delete completed/failed tasks) - if (!tip.isRunning()) { + if (!tip.isRunning() || !tip.isRunnable()) { iter.remove(); continue; }