From b89b6bd75f1c4d86778242c30d018aa13cb9af26 Mon Sep 17 00:00:00 2001 From: Thomas Graves Date: Tue, 17 Apr 2012 19:21:34 +0000 Subject: [PATCH] MAPREDUCE-4160. some mrv1 ant tests fail with timeout - due to 4156 (tgraves) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1327233 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/java/org/apache/hadoop/mapred/JobInProgress.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 3b63624de8..a879ce7305 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -347,6 +347,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 59256b40d7..736a30cbb2 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 @@ -2731,7 +2731,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()));