Browse Source

svn merge -c 1345546 FIXES: MAPREDUCE-4307. TeraInputFormat calls FileSystem.getDefaultBlockSize() without a Path - Failure when using ViewFileSystem. (Ahmed Radwan via eli)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1356833 13f79535-47bb-0310-9956-ffa450edef68
Robert Joseph Evans 13 years ago
parent
commit
c4d70983c3

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -258,6 +258,9 @@ Release 0.23.3 - UNRELEASED
     MAPREDUCE-4250. hadoop-config.sh missing variable exports, causes Yarn 
     jobs to fail with ClassNotFoundException MRAppMaster. (phunt via tucu)
 
+    MAPREDUCE-4307. TeraInputFormat calls FileSystem.getDefaultBlockSize()
+    without a Path - Failure when using ViewFileSystem. (Ahmed Radwan via eli)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

+ 1 - 1
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<Text,Text> {
     }
     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();