You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by tg...@apache.org on 2012/04/16 22:47:45 UTC
svn commit: r1326796 - in
/hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt
src/java/org/apache/hadoop/mapred/JobInProgress.java
src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.java
Author: tgraves
Date: Mon Apr 16 20:47:44 2012
New Revision: 1326796
URL: http://svn.apache.org/viewvc?rev=1326796&view=rev
Log:
merge -r 1326794:1326795 from trunk. FIXES: MAPREDUCE-4156
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1326796&r1=1326795&r2=1326796&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon Apr 16 20:47:44 2012
@@ -240,6 +240,8 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4144. Fix a NPE in the ResourceManager when handling node
updates. (Jason Lowe via sseth)
+ MAPREDUCE-4156. ant build fails compiling JobInProgress (tgraves)
+
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java?rev=1326796&r1=1326795&r2=1326796&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java/org/apache/hadoop/mapred/JobInProgress.java Mon Apr 16 20:47:44 2012
@@ -2710,7 +2710,7 @@ public class JobInProgress {
}
TaskFinishedEvent tfe = new TaskFinishedEvent(tip.getTIPId(),
- tip.getExecFinishTime(), taskType,
+ null, tip.getExecFinishTime(), taskType,
TaskStatus.State.SUCCEEDED.toString(),
new org.apache.hadoop.mapreduce.Counters(status.getCounters()));
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.java?rev=1326796&r1=1326795&r2=1326796&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobHistoryParsing.java Mon Apr 16 20:47:44 2012
@@ -97,7 +97,7 @@ public class TestJobHistoryParsing exte
// Try to write one more event now, should not fail
TaskID tid = TaskID.forName("task_200809171136_0001_m_000002");
TaskFinishedEvent tfe =
- new TaskFinishedEvent(tid, 0, TaskType.MAP, "", null);
+ new TaskFinishedEvent(tid, null, 0, TaskType.MAP, "", null);
boolean caughtException = false;
try {