Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge -r 1327232:1327233 from trunk. FIXES: MAPREDUCE-4160 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327234 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-04-17 19:23:01 +00:00
parent ab8ea1db58
commit 7fec5b7d94
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -246,6 +246,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4156. ant build fails compiling JobInProgress (tgraves) MAPREDUCE-4156. ant build fails compiling JobInProgress (tgraves)
MAPREDUCE-4160. some mrv1 ant tests fail with timeout - due to 4156
(tgraves)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java
View File

@ -2710,7 +2710,7 @@ public class JobInProgress {
} }
TaskFinishedEvent tfe = new TaskFinishedEvent(tip.getTIPId(), TaskFinishedEvent tfe = new TaskFinishedEvent(tip.getTIPId(),
null, tip.getExecFinishTime(), taskType, statusAttemptID, tip.getExecFinishTime(), taskType,
TaskStatus.State.SUCCEEDED.toString(), TaskStatus.State.SUCCEEDED.toString(),
new org.apache.hadoop.mapreduce.Counters(status.getCounters())); new org.apache.hadoop.mapreduce.Counters(status.getCounters()));