Author: acmurthy
Date: Thu Nov 22 02:46:37 2007
New Revision: 597372
URL: http://svn.apache.org/viewvc?rev=597372&view=rev
Log:
Reverting HADOOP-1281
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskInProgress.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=597372&r1=597371&r2=597372&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Thu Nov 22 02:46:37 2007
@@ -135,10 +135,6 @@
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)
Modified:
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskInProgress.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskInProgress.java?rev=597372&r1=597371&r2=597372&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskInProgress.java
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskInProgress.java
Thu Nov 22 02:46:37 2007
@@ -330,7 +330,8 @@
(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 {
