MAPREDUCE-2217. The expire launching task should cover the UNASSIGNED task. (schen and kkambatl via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1428304 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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

src/mapred/org/apache/hadoop/mapred/JobTracker.java

@@ -4311,8 +4311,10 @@ public class JobTracker implements MRConstants, InterTrackerProtocol,
       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) {