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

merge -r 1326794:1326795 from trunk. FIXES: MAPREDUCE-4156 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1326796 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-04-16 20:47:44 +00:00
parent 2ae5006128
commit 27cdd16a50
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,6 +240,8 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4144. Fix a NPE in the ResourceManager when handling node MAPREDUCE-4144. Fix a NPE in the ResourceManager when handling node
updates. (Jason Lowe via sseth) updates. (Jason Lowe via sseth)
MAPREDUCE-4156. ant build fails compiling JobInProgress (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(),
tip.getExecFinishTime(), taskType, null, 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()));

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

@ -97,7 +97,7 @@ public class TestJobHistoryParsing extends TestCase {
// Try to write one more event now, should not fail // Try to write one more event now, should not fail
TaskID tid = TaskID.forName("task_200809171136_0001_m_000002"); TaskID tid = TaskID.forName("task_200809171136_0001_m_000002");
TaskFinishedEvent tfe = TaskFinishedEvent tfe =
new TaskFinishedEvent(tid, 0, TaskType.MAP, "", null); new TaskFinishedEvent(tid, null, 0, TaskType.MAP, "", null);
boolean caughtException = false; boolean caughtException = false;
try { try {