Repository: hadoop Updated Branches: refs/heads/branch-2 85a7da089 -> 2e059ff4e
MAPREDUCE-7108. TestFileOutputCommitter fails on Windows. (Zuoming Zhang via gera) (cherry picked from commit 04b74eddc67888142879ed114d21348e8a4aad78) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2e059ff4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2e059ff4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2e059ff4 Branch: refs/heads/branch-2 Commit: 2e059ff4e6c71884520f8685213d86c18460ad98 Parents: 85a7da0 Author: Gera Shegalov <g...@apache.org> Authored: Tue Jun 12 11:21:51 2018 -0700 Committer: Gera Shegalov <g...@apache.org> Committed: Tue Jun 12 12:43:20 2018 -0700 ---------------------------------------------------------------------- .../lib/output/TestFileOutputCommitter.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e059ff4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java index 42cb6ee..253326c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java @@ -39,6 +39,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.RawLocalFileSystem; +import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.MapFile; import org.apache.hadoop.io.NullWritable; @@ -511,16 +512,15 @@ public class TestFileOutputCommitter extends TestCase { // Ensure getReaders call works and also ignores // hidden filenames (_ or . prefixes) + MapFile.Reader[] readers = {}; try { - MapFileOutputFormat.getReaders(outDir, conf); - } catch (Exception e) { - fail("Fail to read from MapFileOutputFormat: " + e); - e.printStackTrace(); + readers = MapFileOutputFormat.getReaders(outDir, conf); + // validate output + validateMapFileOutputContent(FileSystem.get(job.getConfiguration()), outDir); + } finally { + IOUtils.cleanupWithLogger(null, readers); + FileUtil.fullyDelete(new File(outDir.toString())); } - - // validate output - validateMapFileOutputContent(FileSystem.get(job.getConfiguration()), outDir); - FileUtil.fullyDelete(new File(outDir.toString())); } public void testMapFileOutputCommitterV1() throws Exception { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
