From b988ba01cd54f7c6640635ab1ef96304e598ec47 Mon Sep 17 00:00:00 2001 From: Siddharth Seth Date: Thu, 5 Jan 2012 18:48:46 +0000 Subject: [PATCH] merge MAPREDUCE-3615 from trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227742 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../jobhistory/TaskAttemptUnsuccessfulCompletionEvent.java | 2 +- .../src/java/org/apache/hadoop/mapred/JobInProgress.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 9a7e02c7c50..299feb37418 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -355,6 +355,8 @@ Release 0.23.1 - Unreleased MAPREDUCE-3572. Moved AM event dispatcher to a separate thread for performance reasons. (vinodkv via acmurthy) + MAPREDUCE-3615. Fix some ant test failures. (Thomas Graves via sseth) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/TaskAttemptUnsuccessfulCompletionEvent.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/TaskAttemptUnsuccessfulCompletionEvent.java index 066f0af6466..d2b9354b423 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/TaskAttemptUnsuccessfulCompletionEvent.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/TaskAttemptUnsuccessfulCompletionEvent.java @@ -103,7 +103,7 @@ public class TaskAttemptUnsuccessfulCompletionEvent implements HistoryEvent { (TaskAttemptID id, TaskType taskType, String status, long finishTime, String hostname, String error) { - this(id, taskType, status, finishTime, hostname, -1, null, error, null); + this(id, taskType, status, finishTime, hostname, -1, "", error, null); } TaskAttemptUnsuccessfulCompletionEvent() {} 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 791b92c82f7..1bac8de3fe4 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 @@ -3210,7 +3210,7 @@ private void failedTask(TaskInProgress tip, TaskAttemptID taskid, (taskid, taskType, taskStatus.getRunState().toString(), finishTime, - taskTrackerHostName, -1, null, diagInfo, + taskTrackerHostName, -1, "", diagInfo, splits.burst()); jobHistory.logEvent(tue, taskid.getJobID());