HADOOP-4963. svn merge -c 746878 from branch-0.20 to branch-0.19
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.19@896727 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index d1d9d01..7096889 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,12 @@
Hadoop Change Log
+Release 0.19.3 - Unreleased
+
+ BUG FIXES
+
+ HADOOP-4963. Logs saying org.apache.hadoop.util.DiskChecker$DiskErrorException
+ in TaskTracker are not relevant ((Amareshwari Sriramadasu via ddas)
+
Release 0.19.2 - 2009-06-30
BUG FIXES
diff --git a/src/mapred/org/apache/hadoop/mapred/TaskTracker.java b/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
index 529ca1e..d85484b 100644
--- a/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
+++ b/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
@@ -1514,6 +1514,11 @@
if(tip == null)
return -1;
+ if (!tip.getTask().isMapTask() ||
+ tip.getRunState() != TaskStatus.State.SUCCEEDED) {
+ return -1;
+ }
+
MapOutputFile mapOutputFile = new MapOutputFile();
mapOutputFile.setJobId(taskId.getJobID());
mapOutputFile.setConf(conf);
