From 026a285d52f2d387ffea10c32ea2e22035be757a Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Sat, 2 Jun 2012 18:50:50 +0000 Subject: [PATCH] MAPREDUCE-4307. TeraInputFormat calls FileSystem.getDefaultBlockSize() without a Path - Failure when using ViewFileSystem. Contributed by Ahmed Radwan git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345552 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/examples/terasort/TeraInputFormat.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 4cd444086c5..a67f61b06a3 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -39,6 +39,9 @@ Release 2.0.1-alpha - UNRELEASED MAPREDUCE-3493. Add the default mapreduce.shuffle.port property to mapred-default.xml (Madhukara Phatak via harsh) + MAPREDUCE-4307. TeraInputFormat calls FileSystem.getDefaultBlockSize() + without a Path - Failure when using ViewFileSystem. (Ahmed Radwan via eli) + Release 2.0.0-alpha - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraInputFormat.java index 4ef0033012f..f957ad9e4f6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/terasort/TeraInputFormat.java @@ -212,7 +212,7 @@ public class TeraInputFormat extends FileInputFormat { } FileSystem outFs = partFile.getFileSystem(conf); DataOutputStream writer = outFs.create(partFile, true, 64*1024, (short) 10, - outFs.getDefaultBlockSize()); + outFs.getDefaultBlockSize(partFile)); for (int i = 0; i < samples; i++) { try { samplerReader[i].join();