From ffc80a1e1d561273f507ef07e5c57e5413262718 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Thu, 3 Nov 2011 13:21:32 +0000 Subject: [PATCH] MAPREDUCE-3215. Reneabled and fixed bugs in the failing test TestNoJobSetupCleanup. Contributed by Hitesh Shah. svn merge -c r1197101 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1197102 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../hadoop/mapreduce/TestNoJobSetupCleanup.java | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index b6fc0183c94..3b057b23d81 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -19,6 +19,9 @@ Release 0.23.1 - Unreleased MAPREDUCE-3221. Reneabled the previously ignored test in TestSubmitJob and fixed bugs in it. (Devaraj K via vinodkv) + MAPREDUCE-3215. Reneabled and fixed bugs in the failing test + TestNoJobSetupCleanup. (Hitesh Shah via vinodkv) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java index 583572505ba..1116d4cda6b 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java +++ b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/TestNoJobSetupCleanup.java @@ -56,16 +56,15 @@ public class TestNoJobSetupCleanup extends HadoopTestCase { FileSystem fs = FileSystem.get(conf); assertTrue("Job output directory doesn't exit!", fs.exists(outDir)); - // TODO - /* - // Disabling check for now to address builds until we fix underlying issue - // output still in temporary as job commit only seems - // to be called during job cleanup - FileStatus[] list = fs.listStatus(outDir, new OutputFilter()); + // job commit done only in cleanup + // therefore output should still be in temp location + String tempWorkingPathStr = outDir + Path.SEPARATOR + "_temporary" + + Path.SEPARATOR + "0"; + Path tempWorkingPath = new Path(tempWorkingPathStr); + FileStatus[] list = fs.listStatus(tempWorkingPath, new OutputFilter()); int numPartFiles = numReds == 0 ? numMaps : numReds; assertTrue("Number of part-files is " + list.length + " and not " + numPartFiles, list.length == numPartFiles); - */ return job; }