Merge -r 732613:732614 from trunk onto 0.20 branch. Fixes HADOOP-4966.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@732616 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -544,6 +544,9 @@ Release 0.19.1 - Unreleased
     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

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

@@ -1722,6 +1722,16 @@ public class JobTracker implements MRConstants, InterTrackerProtocol,
    * @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 &&