big-data/hadoop
big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

HDFS-10571. TestDiskBalancerCommand#testPlanNode failed with IllegalArgumentException. Contributed by Xiaobing Zhou.

Browse Source
This commit is contained in:
Anu Engineer 2016-06-23 14:48:40 -07:00 committed by Arpit Agarwal
parent 8a6e354122
commit b2584bee45
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/diskbalancer/command/TestDiskBalancerCommand.java
View File

@ -280,7 +280,7 @@ public class TestDiskBalancerCommand {
final String cmdLine = String final String cmdLine = String
.format( .format(
"hdfs diskbalancer %s", planArg); "hdfs diskbalancer %s", planArg);
runCommand(cmdLine); runCommand(cmdLine, cluster);
} }
/* Test that illegal arguments are handled correctly*/ /* Test that illegal arguments are handled correctly*/
@ -335,12 +335,12 @@ public class TestDiskBalancerCommand {
runCommand(cmdLine); runCommand(cmdLine);
} }
private List<String> runCommand(final String cmdLine) throws Exception { private List<String> runCommandInternal(final String cmdLine) throws
Exception {
String[] cmds = StringUtils.split(cmdLine, ' '); String[] cmds = StringUtils.split(cmdLine, ' ');
org.apache.hadoop.hdfs.tools.DiskBalancer db = org.apache.hadoop.hdfs.tools.DiskBalancer db =
new org.apache.hadoop.hdfs.tools.DiskBalancer(conf); new org.apache.hadoop.hdfs.tools.DiskBalancer(conf);
FileSystem.setDefaultUri(conf, clusterJson);
ByteArrayOutputStream bufOut = new ByteArrayOutputStream(); ByteArrayOutputStream bufOut = new ByteArrayOutputStream();
PrintStream out = new PrintStream(bufOut); PrintStream out = new PrintStream(bufOut);
db.run(cmds, out); db.run(cmds, out);
@ -353,6 +353,17 @@ public class TestDiskBalancerCommand {
return outputs; return outputs;
} }
private List<String> runCommand(final String cmdLine) throws Exception {
FileSystem.setDefaultUri(conf, clusterJson);
return runCommandInternal(cmdLine);
}
private List<String> runCommand(final String cmdLine,
MiniDFSCluster miniCluster) throws Exception {
FileSystem.setDefaultUri(conf, miniCluster.getURI());
return runCommandInternal(cmdLine);
}
/** /**
* Making sure that we can query the node without having done a submit. * Making sure that we can query the node without having done a submit.
* @throws Exception * @throws Exception