Author: ddas
Date: Tue Dec 30 04:09:40 2008
New Revision: 730113
URL: http://svn.apache.org/viewvc?rev=730113&view=rev
Log:
Merge -r 730109:730110 from trunk onto 0.20 branch. Fixes HADOOP-4956.
Modified:
hadoop/core/branches/branch-0.20/CHANGES.txt
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=730113&r1=730112&r2=730113&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Tue Dec 30 04:09:40 2008
@@ -497,6 +497,9 @@
HADOOP-4896. HDFS Fsck does not load HDFS configuration. (Raghu Angadi)
+ HADOOP-4956. Creates TaskStatus for failed tasks with an empty Counters
+ object instead of null. (ddas)
+
Release 0.19.1 - Unreleased
IMPROVEMENTS
Modified:
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=730113&r1=730112&r2=730113&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
(original)
+++
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
Tue Dec 30 04:09:40 2008
@@ -2340,7 +2340,7 @@
reason,
reason,
trackerName, phase,
- null);
+ new Counters());
status.setFinishTime(System.currentTimeMillis());
updateTaskStatus(tip, status, metrics);
JobHistory.Task.logFailed(tip.getTIPId(),
