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

MAPREDUCE-2913. svn merge -c r1179319 --ignore-ancestry ../../trunk/ 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179326 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2011-10-05 17:10:38 +00:00
parent 90674a233a
commit a9f2a60872
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1494,6 +1494,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3056. Changed the default staging directory to not include MAPREDUCE-3056. Changed the default staging directory to not include
user.name to prevent issues with non-secure mode. (Devaraj K via vinodkv) user.name to prevent issues with non-secure mode. (Devaraj K via vinodkv)
MAPREDUCE-2913. Fixed TestMRJobs.testFailingMapper to assert the correct
TaskCompletionEventStatus. (Jonathan Eagles via vinodkv)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
View File

@ -273,9 +273,9 @@ public class TestMRJobs {
TaskCompletionEvent[] events = job.getTaskCompletionEvents(0, 2); TaskCompletionEvent[] events = job.getTaskCompletionEvents(0, 2);
Assert.assertEquals(TaskCompletionEvent.Status.FAILED, Assert.assertEquals(TaskCompletionEvent.Status.FAILED,
events[0].getStatus().FAILED); events[0].getStatus());
Assert.assertEquals(TaskCompletionEvent.Status.FAILED, Assert.assertEquals(TaskCompletionEvent.Status.TIPFAILED,
events[1].getStatus().FAILED); events[1].getStatus());
Assert.assertEquals(JobStatus.State.FAILED, job.getJobState()); Assert.assertEquals(JobStatus.State.FAILED, job.getJobState());
verifyFailingMapperCounters(job); verifyFailingMapperCounters(job);