You are viewing a plain text version of this content. The canonical link for it is here.

Posted to common-commits@hadoop.apache.org by bo...@apache.org on 2012/04/13 15:46:46 UTC

svn commit: r1325767 - /hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java

Author: bobby
Date: Fri Apr 13 13:46:45 2012
New Revision: 1325767

URL: http://svn.apache.org/viewvc?rev=1325767&view=rev
Log:
svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby)

Modified:
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java

Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java?rev=1325767&r1=1325766&r2=1325767&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java Fri Apr 13 13:46:45 2012
@@ -128,7 +128,7 @@ public class Task20LineHistoryEventEmitt
           return null;
         }
 
-        return new TaskFinishedEvent(taskID, Long.parseLong(finishTime),
+        return new TaskFinishedEvent(taskID, null, Long.parseLong(finishTime),
             that.originalTaskType, status, eventCounters);
       }