From a445f8b675e1bba3bfdac6ae36b8a89eaffd212a Mon Sep 17 00:00:00 2001 From: Brandon Li Date: Wed, 1 Apr 2015 17:20:24 -0700 Subject: [PATCH] HDFS-8001 RpcProgramNfs3 : wrong parsing of dfs.blocksize. Contributed by Remi Catherinot (cherry picked from commit 4d14816c269f110445e1ad3e03ac53b0c1cdb58b) (cherry picked from commit 27970b3f46674ef7824a4478141d968ef2c16ebb) --- .../java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java index 268abbab986..161f3e91d4c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java @@ -187,7 +187,7 @@ public class RpcProgramNfs3 extends RpcProgram implements Nfs3Interface { clientCache = new DFSClientCache(config); replication = (short) config.getInt(DFSConfigKeys.DFS_REPLICATION_KEY, DFSConfigKeys.DFS_REPLICATION_DEFAULT); - blockSize = config.getLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, + blockSize = config.getLongBytes(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, DFSConfigKeys.DFS_BLOCK_SIZE_DEFAULT); bufferSize = config.getInt( CommonConfigurationKeysPublic.IO_FILE_BUFFER_SIZE_KEY, diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 53896be94d7..b4e2778e3ea 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -947,6 +947,9 @@ Release 2.7.0 - UNRELEASED HDFS-8036. Use snapshot path as source when using snapshot diff report in DistCp. (Jing Zhao via wheat9) + HDFS-8001 RpcProgramNfs3 : wrong parsing of dfs.blocksize + (Remi Catherinot via brandonli) + BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS HDFS-7720. Quota by Storage Type API, tools and ClientNameNode