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

merge -r 1332664:1332665 from trunk. FIXES: MAPREDUCE-4212 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332667 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-05-01 14:11:31 +00:00
parent e29d76663c
commit 1a17df6b21
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,6 +321,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4206. Sorting by Last Health-Update on the RM nodes page sorts MAPREDUCE-4206. Sorting by Last Health-Update on the RM nodes page sorts
does not work correctly (Jonathon Eagles via tgraves) does not work correctly (Jonathon Eagles via tgraves)
MAPREDUCE-4212. TestJobClientGetJob sometimes fails
(Daryn Sharp via tgraves)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapred/TestJobClientGetJob.java
View File

@ -49,8 +49,9 @@ public class TestJobClientGetJob {
JobConf conf = new JobConf(); JobConf conf = new JobConf();
conf.set("mapreduce.framework.name", "local"); conf.set("mapreduce.framework.name", "local");
FileInputFormat.addInputPath(conf, createTempFile("in", "hello")); FileInputFormat.addInputPath(conf, createTempFile("in", "hello"));
FileOutputFormat.setOutputPath(conf, Path outputDir = new Path(TEST_ROOT_DIR, getClass().getSimpleName());
new Path(TEST_ROOT_DIR, getClass().getSimpleName())); outputDir.getFileSystem(conf).delete(outputDir, true);
FileOutputFormat.setOutputPath(conf, outputDir);
JobClient jc = new JobClient(conf); JobClient jc = new JobClient(conf);
RunningJob runningJob = jc.submitJob(conf); RunningJob runningJob = jc.submitJob(conf);
assertNotNull("Running job", runningJob); assertNotNull("Running job", runningJob);