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

HDFS-5434. Merging r1560217 from trunk to branch-2 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560218 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-01-21 23:20:55 +00:00
parent dd5de5a756
commit 01444ee9e1
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,6 +205,9 @@ Release 2.4.0 - UNRELEASED
HDFS-5784. Reserve space in edit log header and fsimage header for feature HDFS-5784. Reserve space in edit log header and fsimage header for feature
flag section. (Colin Patrick McCabe) flag section. (Colin Patrick McCabe)
HDFS-5434. Change block placement policy constructors from package private
to protected. (Buddy Taylor via Arpit Agarwal)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-5239. Allow FSNamesystem lock fairness to be configurable (daryn) HDFS-5239. Allow FSNamesystem lock fairness to be configurable (daryn)

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
View File

@ -79,7 +79,7 @@ public class BlockPlacementPolicyDefault extends BlockPlacementPolicy {
*/ */
protected int tolerateHeartbeatMultiplier; protected int tolerateHeartbeatMultiplier;
BlockPlacementPolicyDefault(Configuration conf, FSClusterStats stats, protected BlockPlacementPolicyDefault(Configuration conf, FSClusterStats stats,
NetworkTopology clusterMap) { NetworkTopology clusterMap) {
initialize(conf, stats, clusterMap); initialize(conf, stats, clusterMap);
} }

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyWithNodeGroup.java
View File

@ -46,12 +46,12 @@ import org.apache.hadoop.net.NodeBase;
*/ */
public class BlockPlacementPolicyWithNodeGroup extends BlockPlacementPolicyDefault { public class BlockPlacementPolicyWithNodeGroup extends BlockPlacementPolicyDefault {
BlockPlacementPolicyWithNodeGroup(Configuration conf, FSClusterStats stats, protected BlockPlacementPolicyWithNodeGroup(Configuration conf, FSClusterStats stats,
NetworkTopology clusterMap) { NetworkTopology clusterMap) {
initialize(conf, stats, clusterMap); initialize(conf, stats, clusterMap);
} }
BlockPlacementPolicyWithNodeGroup() { protected BlockPlacementPolicyWithNodeGroup() {
} }
public void initialize(Configuration conf, FSClusterStats stats, public void initialize(Configuration conf, FSClusterStats stats,