hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1428304 - in /hadoop/common/branches/branch-1: CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobTracker.java
Date Thu, 03 Jan 2013 11:49:56 GMT
Author: tucu
Date: Thu Jan  3 11:49:55 2013
New Revision: 1428304

URL: http://svn.apache.org/viewvc?rev=1428304&view=rev
Log:
MAPREDUCE-2217. The expire launching task should cover the UNASSIGNED task. (schen and kkambatl
via tucu)

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1428304&r1=1428303&r2=1428304&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Jan  3 11:49:55 2013
@@ -379,6 +379,9 @@ Release 1.2.0 - unreleased
     HADOOP-9175. TestWritableName fails with Open JDK 7. (Arpit Agarwal via
     suresh)
 
+    MAPREDUCE-2217. The expire launching task should cover the UNASSIGNED task. 
+    (schen and kkambatl via tucu)
+
 Release 1.1.2 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=1428304&r1=1428303&r2=1428304&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapred/JobTracker.java Thu
Jan  3 11:49:55 2013
@@ -4311,8 +4311,10 @@ public class JobTracker implements MRCon
       report.setTaskTracker(trackerName);
       TaskAttemptID taskId = report.getTaskID();
       
-      // expire it
-      expireLaunchingTasks.removeTask(taskId);
+      // don't expire the task if it is not unassigned
+      if (report.getRunState() != TaskStatus.State.UNASSIGNED) {
+        expireLaunchingTasks.removeTask(taskId);
+      }
       
       JobInProgress job = getJob(taskId.getJobID());
       if (job == null) {



Mime
View raw message