Author: szetszwo
Date: Fri Aug 1 14:15:57 2014
New Revision: 1615108
URL: http://svn.apache.org/r1615108
Log:
svn merge -c 1615107 from trunk for HDFS-6796. Improve the argument check
during balancer command line parsing.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props
changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
(props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1615107
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1615108&r1=1615107&r2=1615108&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Aug 1 14:15:57 2014
@@ -88,6 +88,9 @@ Release 2.6.0 - UNRELEASED
HDFS-6798. Add test case for incorrect data node condition during
balancing. (Benoy Antony via Arpit Agarwal)
+ HDFS-6796. Improve the argument check during balancer command line parsing.
+ (Benoy Antony via szetszwo)
+
OPTIMIZATIONS
HDFS-6690. Deduplicate xattr names in memory. (wang)
Propchange:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1615107
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java?rev=1615108&r1=1615107&r2=1615108&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
Fri Aug 1 14:15:57 2014
@@ -1762,9 +1762,9 @@ public class Balancer {
if (args != null) {
try {
for(int i = 0; i < args.length; i++) {
- checkArgument(args.length >= 2, "args = " +
Arrays.toString(args));
if ("-threshold".equalsIgnoreCase(args[i])) {
- i++;
+ checkArgument(++i < args.length,
+ "Threshold value is missing: args = " + Arrays.toString(args));
try {
threshold = Double.parseDouble(args[i]);
if (threshold < 1 || threshold > 100) {
@@ -1779,7 +1779,8 @@ public class Balancer {
throw e;
}
} else if ("-policy".equalsIgnoreCase(args[i])) {
- i++;
+ checkArgument(++i < args.length,
+ "Policy value is missing: args = " + Arrays.toString(args));
try {
policy = BalancingPolicy.parse(args[i]);
} catch(IllegalArgumentException e) {
@@ -1787,16 +1788,26 @@ public class Balancer {
throw e;
}
} else if ("-exclude".equalsIgnoreCase(args[i])) {
- i++;
+ checkArgument(++i < args.length,
+ "List of nodes to exclude | -f <filename> is missing: args =
"
+ + Arrays.toString(args));
if ("-f".equalsIgnoreCase(args[i])) {
- nodesTobeExcluded = Util.getHostListFromFile(args[++i]);
+ checkArgument(++i < args.length,
+ "File containing nodes to exclude is not specified: args =
"
+ + Arrays.toString(args));
+ nodesTobeExcluded = Util.getHostListFromFile(args[i]);
} else {
nodesTobeExcluded = Util.parseHostList(args[i]);
}
} else if ("-include".equalsIgnoreCase(args[i])) {
- i++;
+ checkArgument(++i < args.length,
+ "List of nodes to include | -f <filename> is missing: args = "
+ + Arrays.toString(args));
if ("-f".equalsIgnoreCase(args[i])) {
- nodesTobeIncluded = Util.getHostListFromFile(args[++i]);
+ checkArgument(++i < args.length,
+ "File containing nodes to include is not specified: args =
"
+ + Arrays.toString(args));
+ nodesTobeIncluded = Util.getHostListFromFile(args[i]);
} else {
nodesTobeIncluded = Util.parseHostList(args[i]);
}
@@ -1805,12 +1816,8 @@ public class Balancer {
+ Arrays.toString(args));
}
}
- if (!nodesTobeExcluded.isEmpty() && !nodesTobeIncluded.isEmpty()) {
- System.err.println(
- "-exclude and -include options cannot be specified together.");
- throw new IllegalArgumentException(
- "-exclude and -include options cannot be specified together.");
- }
+ checkArgument(nodesTobeExcluded.isEmpty() ||
nodesTobeIncluded.isEmpty(),
+ "-exclude and -include options cannot be specified together.");
} catch(RuntimeException e) {
printUsage(System.err);
throw e;
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java?rev=1615108&r1=1615107&r2=1615108&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java
Fri Aug 1 14:15:57 2014
@@ -867,13 +867,42 @@ public class TestBalancer {
} catch (IllegalArgumentException e) {
}
- parameters = new String[] { "-threshold 1 -policy" };
+ parameters = new String[] {"-threshold", "1", "-policy"};
try {
Balancer.Cli.parse(parameters);
fail(reason);
} catch (IllegalArgumentException e) {
}
+ parameters = new String[] {"-threshold", "1", "-include"};
+ try {
+ Balancer.Cli.parse(parameters);
+ fail(reason);
+ } catch (IllegalArgumentException e) {
+
+ }
+ parameters = new String[] {"-threshold", "1", "-exclude"};
+ try {
+ Balancer.Cli.parse(parameters);
+ fail(reason);
+ } catch (IllegalArgumentException e) {
+
+ }
+ parameters = new String[] {"-include", "-f"};
+ try {
+ Balancer.Cli.parse(parameters);
+ fail(reason);
+ } catch (IllegalArgumentException e) {
+
+ }
+ parameters = new String[] {"-exclude", "-f"};
+ try {
+ Balancer.Cli.parse(parameters);
+ fail(reason);
+ } catch (IllegalArgumentException e) {
+
+ }
+
parameters = new String[] {"-include", "testnode1", "-exclude",
"testnode2"};
try {
Balancer.Cli.parse(parameters);
