diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 76e4e18b8a3..4758afb3715 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -246,6 +246,9 @@ Release 0.23.3 - UNRELEASED 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 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java b/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java index 9efb8d460c4..ee96db8e7c6 100644 --- a/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java +++ b/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java @@ -2710,7 +2710,7 @@ public synchronized boolean completedTask(TaskInProgress tip, } TaskFinishedEvent tfe = new TaskFinishedEvent(tip.getTIPId(), - null, tip.getExecFinishTime(), taskType, + statusAttemptID, tip.getExecFinishTime(), taskType, TaskStatus.State.SUCCEEDED.toString(), new org.apache.hadoop.mapreduce.Counters(status.getCounters()));