You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by as...@apache.org on 2016/04/22 20:59:01 UTC
[38/50] [abbrv] hadoop git commit: HDFS-10309 Balancer doesn't honor
dfs.blocksize value defined with suffix k(kilo), m(mega),
g(giga). Contributed by Amit Anand
HDFS-10309 Balancer doesn't honor dfs.blocksize value defined with suffix k(kilo), m(mega), g(giga). Contributed by Amit Anand
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/14ab7a81
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/14ab7a81
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/14ab7a81
Branch: refs/heads/yarn-2877
Commit: 14ab7a81e2519935ff28ad40519649599e204732
Parents: bbce1d5
Author: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Authored: Thu Apr 21 15:41:50 2016 -0700
Committer: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Committed: Thu Apr 21 15:41:50 2016 -0700
----------------------------------------------------------------------
.../hadoop/hdfs/server/balancer/Balancer.java | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/14ab7a81/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
index 3169faf..0b9017a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
@@ -235,6 +235,15 @@ public class Balancer {
return v;
}
+ static long getLongBytes(Configuration conf, String key, long defaultValue) {
+ final long v = conf.getLongBytes(key, defaultValue);
+ LOG.info(key + " = " + v + " (default=" + defaultValue + ")");
+ if (v <= 0) {
+ throw new HadoopIllegalArgumentException(key + " = " + v + " <= " + 0);
+ }
+ return v;
+ }
+
static int getInt(Configuration conf, String key, int defaultValue) {
final int v = conf.getInt(key, defaultValue);
LOG.info(key + " = " + v + " (default=" + defaultValue + ")");
@@ -266,10 +275,10 @@ public class Balancer {
DFSConfigKeys.DFS_DATANODE_BALANCE_MAX_NUM_CONCURRENT_MOVES_KEY,
DFSConfigKeys.DFS_DATANODE_BALANCE_MAX_NUM_CONCURRENT_MOVES_DEFAULT);
- final long getBlocksSize = getLong(conf,
+ final long getBlocksSize = getLongBytes(conf,
DFSConfigKeys.DFS_BALANCER_GETBLOCKS_SIZE_KEY,
DFSConfigKeys.DFS_BALANCER_GETBLOCKS_SIZE_DEFAULT);
- final long getBlocksMinBlockSize = getLong(conf,
+ final long getBlocksMinBlockSize = getLongBytes(conf,
DFSConfigKeys.DFS_BALANCER_GETBLOCKS_MIN_BLOCK_SIZE_KEY,
DFSConfigKeys.DFS_BALANCER_GETBLOCKS_MIN_BLOCK_SIZE_DEFAULT);
@@ -284,10 +293,10 @@ public class Balancer {
this.sourceNodes = p.getSourceNodes();
this.runDuringUpgrade = p.getRunDuringUpgrade();
- this.maxSizeToMove = getLong(conf,
+ this.maxSizeToMove = getLongBytes(conf,
DFSConfigKeys.DFS_BALANCER_MAX_SIZE_TO_MOVE_KEY,
DFSConfigKeys.DFS_BALANCER_MAX_SIZE_TO_MOVE_DEFAULT);
- this.defaultBlockSize = getLong(conf,
+ this.defaultBlockSize = getLongBytes(conf,
DFSConfigKeys.DFS_BLOCK_SIZE_KEY,
DFSConfigKeys.DFS_BLOCK_SIZE_DEFAULT);
}