Author: harsh
Date: Tue Jan 3 17:20:20 2012
New Revision: 1226880
URL: http://svn.apache.org/viewvc?rev=1226880&view=rev
Log:
merge HDFS-2722 (harsh)
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java?rev=1226880&r1=1226879&r2=1226880&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
Tue Jan 3 17:20:20 2012
@@ -273,10 +273,10 @@ public class FSOperations {
@Override
public Void execute(FileSystem fs) throws IOException {
if (replication == -1) {
- replication = (short) fs.getConf().getInt("dfs.replication", 3);
+ replication = fs.getDefaultReplication();
}
if (blockSize == -1) {
- blockSize = fs.getConf().getInt("dfs.block.size", 67108864);
+ blockSize = fs.getDefaultBlockSize();
}
FsPermission fsPermission = getPermission(permission);
int bufferSize = fs.getConf().getInt("httpfs.buffer.size", 4096);
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1226880&r1=1226879&r2=1226880&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Tue Jan 3 17:20:20 2012
@@ -63,6 +63,8 @@ Release 0.23.1 - UNRELEASED
HDFS-2574. Remove references to some deprecated properties in conf
templates and defaults files. (Joe Crobak via harsh)
+ HDFS-2722. HttpFs should not be using an int for block size. (harsh)
+
OPTIMIZATIONS
HDFS-2130. Switch default checksum to CRC32C. (todd)
