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

Merge -c 1180769 from trunk to branch-0.23 to fix MAPREDUCE-3153. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180770 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-10-10 03:11:20 +00:00
parent c4c9b7edc7
commit bcc1745434
2 changed files with 7 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

@ -1515,6 +1515,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-2876. Use a different config for ContainerAllocationExpirer. MAPREDUCE-2876. Use a different config for ContainerAllocationExpirer.
(Anupam Seth via acmurthy) (Anupam Seth via acmurthy)
MAPREDUCE-3153. Fix TestFileOutputCommitter which was broken by
MAPREDUCE-2702. (mahadev via acmurthy)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

7
hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
View File

@ -37,6 +37,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mapreduce.task.JobContextImpl; import org.apache.hadoop.mapreduce.task.JobContextImpl;
import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl;
public class TestFileOutputCommitter extends TestCase { public class TestFileOutputCommitter extends TestCase {
private static Path outDir = new Path(System.getProperty("test.build.data", private static Path outDir = new Path(System.getProperty("test.build.data",
"/tmp"), "output"); "/tmp"), "output");
@ -187,9 +188,9 @@ public class TestFileOutputCommitter extends TestCase {
assertNotNull(th); assertNotNull(th);
assertTrue(th instanceof IOException); assertTrue(th instanceof IOException);
assertTrue(th.getMessage().contains("fake delete failed")); assertTrue(th.getMessage().contains("fake delete failed"));
File jobTmpDir = new File(new Path(outDir, String filename = committer.getTaskAttemptBaseDirName(tContext);
FileOutputCommitter.TEMP_DIR_NAME).toString()); File jobTmpDir = new File(outDir.toString(), committer.getJobAttemptBaseDirName(jContext));
File taskTmpDir = new File(jobTmpDir, "_" + taskID); File taskTmpDir = new File(outDir.toString(), filename);
File expectedFile = new File(taskTmpDir, partFile); File expectedFile = new File(taskTmpDir, partFile);
assertTrue(expectedFile + " does not exists", expectedFile.exists()); assertTrue(expectedFile + " does not exists", expectedFile.exists());