hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r650154 - in /hadoop/core/branches/branch-0.17: CHANGES.txt src/java/org/apache/hadoop/mapred/TaskTracker.java
Date Mon, 21 Apr 2008 14:18:14 GMT
Author: ddas
Date: Mon Apr 21 07:18:05 2008
New Revision: 650154

URL: http://svn.apache.org/viewvc?rev=650154&view=rev
Log:
Merge -r 650151:650152 from trunk to 0.17 branch. Fixes HADOOP-3279.

Modified:
    hadoop/core/branches/branch-0.17/CHANGES.txt
    hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/TaskTracker.java

Modified: hadoop/core/branches/branch-0.17/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/CHANGES.txt?rev=650154&r1=650153&r2=650154&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.17/CHANGES.txt Mon Apr 21 07:18:05 2008
@@ -567,6 +567,10 @@
     HADOOP-3237. Fixes TestDFSShell.testErrOutPut on Windows platform.
     (Mahadev Konar via dhruba)
 
+    HADOOP-3279. TaskTracker checks for SUCCEEDED task status in addition to 
+    COMMIT_PENDING status when it fails maps due to lost map.
+    (Devaraj Das)
+
 Release 0.16.3 - 2008-04-16
 
   BUG FIXES

Modified: hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=650154&r1=650153&r2=650154&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/TaskTracker.java Mon
Apr 21 07:18:05 2008
@@ -1847,10 +1847,8 @@
      */
     private synchronized void mapOutputLost(String failure
                                            ) throws IOException {
-      //The check for COMMIT_PENDING should actually be a check for SUCCESS
-      //however for that, we have to introduce another Action type from the
-      //JT to the TT (SuccessTaskAction in the lines of KillTaskAction).
-      if (taskStatus.getRunState() == TaskStatus.State.COMMIT_PENDING) {
+      if (taskStatus.getRunState() == TaskStatus.State.COMMIT_PENDING || 
+          taskStatus.getRunState() == TaskStatus.State.SUCCEEDED) {
         // change status to failure
         LOG.info("Reporting output lost:"+task.getTaskId());
         taskStatus.setRunState(TaskStatus.State.FAILED);



Mime
View raw message