Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge HDFS-2722 (harsh) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226880 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2012-01-03 17:20:20 +00:00
parent e0c776dda9
commit 4f2b026450
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
View File

@ -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);

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -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)