Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 1bde06aca -> a445f8b67


HDFS-8001 RpcProgramNfs3 : wrong parsing of dfs.blocksize. Contributed by Remi 
Catherinot

(cherry picked from commit 4d14816c269f110445e1ad3e03ac53b0c1cdb58b)
(cherry picked from commit 27970b3f46674ef7824a4478141d968ef2c16ebb)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a445f8b6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a445f8b6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a445f8b6

Branch: refs/heads/branch-2.7
Commit: a445f8b675e1bba3bfdac6ae36b8a89eaffd212a
Parents: 1bde06a
Author: Brandon Li <[email protected]>
Authored: Wed Apr 1 17:20:24 2015 -0700
Committer: Brandon Li <[email protected]>
Committed: Wed Apr 1 17:30:00 2015 -0700

----------------------------------------------------------------------
 .../main/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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a445f8b6/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
----------------------------------------------------------------------
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 268abba..161f3e9 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,

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a445f8b6/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 53896be..b4e2778 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

Reply via email to