Author: cos
Date: Thu Jan 7 01:19:24 2010
New Revision: 896727
URL: http://svn.apache.org/viewvc?rev=896727&view=rev
Log:
HADOOP-4963. svn merge -c 746878 from branch-0.20 to branch-0.19
Modified:
hadoop/common/branches/branch-0.19/ (props changed)
hadoop/common/branches/branch-0.19/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Propchange: hadoop/common/branches/branch-0.19/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 7 01:19:24 2010
@@ -1,2 +1,2 @@
-/hadoop/core/branches/branch-0.20:785053
-/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,709040,709303,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732777,733887,734870,736426,738697,740077,741703,741762,743745,743892,745180,746902-746903,752073,752609,752836,753112-753113,753346,755370,755938,757448,757849,758156,759398,785046
+/hadoop/core/branches/branch-0.20:746878,785053
+/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,709040,709303,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732613,732777,733887,734870,736426,738697,740077,741703,741762,743745,743892,745180,746902-746903,752073,752609,752836,753112-753113,753346,755370,755938,757448,757849,758156,759398,785046
Modified: hadoop/common/branches/branch-0.19/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.19/CHANGES.txt?rev=896727&r1=896726&r2=896727&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.19/CHANGES.txt Thu Jan 7 01:19:24 2010
@@ -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
Propchange: hadoop/common/branches/branch-0.19/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 7 01:19:24 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
-/hadoop/core/branches/branch-0.20/CHANGES.txt:752591,785053
-/hadoop/core/trunk/CHANGES.txt:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,708723,709040,709303,711717,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732777,733887,734870,735082,736426,738697,740077,741703,741762,743296,743745,743892,745180,746902-746903,752073,752590,752609,752836,753112-753113,753346,755370,755938,757448,757849,758156,759398,785046
+/hadoop/core/branches/branch-0.20/CHANGES.txt:746878,752591,785053
+/hadoop/core/trunk/CHANGES.txt:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712,704732,704748,704989,705391,705420,705430,705762,706350,706707,706719,706796,706802,707258,707262,708623,708641,708710,708723,709040,709303,711717,712881,713888,720602,723013,723460,723831,723918,724883,727117,727212,727217,727228,727869,732572,732613,732777,733887,734870,735082,736426,738697,740077,741703,741762,743296,743745,743892,745180,746902-746903,752073,752590,752609,752836,753112-753113,753346,755370,755938,757448,757849,758156,759398,785046
Modified:
hadoop/common/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=896727&r1=896726&r2=896727&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
(original)
+++
hadoop/common/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Thu Jan 7 01:19:24 2010
@@ -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);
