Author: bobby
Date: Fri Apr 13 13:47:57 2012
New Revision: 1325768
URL: http://svn.apache.org/viewvc?rev=1325768&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-0.23/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java?rev=1325768&r1=1325767&r2=1325768&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
Fri Apr 13 13:47:57 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);
}