Reverting HADOOP-1281

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@597372 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -135,10 +135,6 @@ Trunk (unreleased changes)
     HADOOP-2078. An zero size file may have no blocks associated with it.
     (Konstantin Shvachko via dhruba)
 
-    HADOOP-1281. Kill map-tasks when the parent TaskInProgress has been 
-    completed by another (possibly speculative) map-task. This ensures that 
-    map-slots are not needlessly held-up. (acmurthy)
-
     HADOOP-2212. ChecksumFileSystem.getSumBufferSize might throw 
     java.lang.ArithmeticException. The fix is to initialize bytesPerChecksum
     to 0.  (Michael Bieniosek via ddas)

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

@@ -330,7 +330,8 @@ class TaskInProgress {
         (job.getStatus().getRunState() != JobStatus.RUNNING)) {
       tasksReportedClosed.add(taskid);
       return true;
-    } else if (isComplete() && !tasksReportedClosed.contains(taskid)) {
+    } else if (!isMapTask() && isComplete() && 
+               !tasksReportedClosed.contains(taskid)){
       tasksReportedClosed.add(taskid);
       return true; 
     } else {