You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:24:46 UTC

svn commit: r1077529 - /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java

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 <ac...@apache.org>
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;
       }