Skip to content

HDFS-17213. RBF: In RouterAdmin class, "if else" is not as elegant as "switch case" in the admin command parameters section. #6134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

HDFS-17213. RBF: In RouterAdmin class, "if else" is not as elegant as "switch case" in the admin command parameters section. #6134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 54 additions & 53 deletions ...ct/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/tools/federation/RouterAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,59 +161,60 @@ private static String getUsage(String cmd) {
}
return usage.toString();
}
if (cmd.equals("-add")) {
return "\t[-add <source> <nameservice1, nameservice2, ...> <destination> "
+ "[-readonly] [-faulttolerant] "
+ "[-order HASH|LOCAL|RANDOM|HASH_ALL|SPACE] "
+ "-owner <owner> -group <group> -mode <mode>]";
} else if (cmd.equals(ADD_ALL_COMMAND)) {
return "\t[" + ADD_ALL_COMMAND + " "
+ "<source1> <nameservice1,nameservice2,...> <destination1> "
+ "[-readonly] [-faulttolerant] " + "[-order HASH|LOCAL|RANDOM|HASH_ALL|SPACE] "
+ "-owner <owner1> -group <group1> -mode <mode1>"
+ " , "
+ "<source2> <nameservice1,nameservice2,...> <destination2> "
+ "[-readonly] [-faulttolerant] " + "[-order HASH|LOCAL|RANDOM|HASH_ALL|SPACE] "
+ "-owner <owner2> -group <group2> -mode <mode2>"
+ " , ...]";
} else if (cmd.equals("-update")) {
return "\t[-update <source>"
+ " [<nameservice1, nameservice2, ...> <destination>] "
+ "[-readonly true|false] [-faulttolerant true|false] "
+ "[-order HASH|LOCAL|RANDOM|HASH_ALL|SPACE] "
+ "-owner <owner> -group <group> -mode <mode>]";
} else if (cmd.equals("-rm")) {
return "\t[-rm <source>]";
} else if (cmd.equals("-ls")) {
return "\t[-ls [-d] <path>]";
} else if (cmd.equals("-getDestination")) {
return "\t[-getDestination <path>]";
} else if (cmd.equals("-setQuota")) {
return "\t[-setQuota <path> -nsQuota <nsQuota> -ssQuota "
+ "<quota in bytes or quota size string>]";
} else if (cmd.equals("-setStorageTypeQuota")) {
return "\t[-setStorageTypeQuota <path> -storageType <storage type> "
+ "<quota in bytes or quota size string>]";
} else if (cmd.equals("-clrQuota")) {
return "\t[-clrQuota <path>]";
} else if (cmd.equals("-clrStorageTypeQuota")) {
return "\t[-clrStorageTypeQuota <path>]";
} else if (cmd.equals("-safemode")) {
return "\t[-safemode enter | leave | get]";
} else if (cmd.equals("-nameservice")) {
return "\t[-nameservice enable | disable <nameservice>]";
} else if (cmd.equals("-getDisabledNameservices")) {
return "\t[-getDisabledNameservices]";
} else if (cmd.equals("-refresh")) {
return "\t[-refresh]";
} else if (cmd.equals("-refreshRouterArgs")) {
return "\t[-refreshRouterArgs <host:ipc_port> <key> [arg1..argn]]";
} else if (cmd.equals("-refreshSuperUserGroupsConfiguration")) {
return "\t[-refreshSuperUserGroupsConfiguration]";
} else if (cmd.equals("-refreshCallQueue")) {
return "\t[-refreshCallQueue]";
} else if (cmd.equals(DUMP_COMMAND)) {
return "\t[" + DUMP_COMMAND + "]";
switch (cmd) {
case "-add":
return "\t[-add <source> <nameservice1, nameservice2, ...> <destination> "
+ "[-readonly] [-faulttolerant] "
+ "[-order HASH|LOCAL|RANDOM|HASH_ALL|SPACE] "
+ "-owner <owner> -group <group> -mode <mode>]";
case ADD_ALL_COMMAND:
return "\t[" + ADD_ALL_COMMAND + " "
+ "<source1> <nameservice1,nameservice2,...> <destination1> "
+ "[-readonly] [-faulttolerant] " + "[-order HASH|LOCAL|RANDOM|HASH_ALL|SPACE] "
+ "-owner <owner1> -group <group1> -mode <mode1>"
+ " , "
+ "<source2> <nameservice1,nameservice2,...> <destination2> "
+ "[-readonly] [-faulttolerant] " + "[-order HASH|LOCAL|RANDOM|HASH_ALL|SPACE] "
+ "-owner <owner2> -group <group2> -mode <mode2>"
+ " , ...]";
case "-update":
return "\t[-update <source>"
+ " [<nameservice1, nameservice2, ...> <destination>] "
+ "[-readonly true|false] [-faulttolerant true|false] "
+ "[-order HASH|LOCAL|RANDOM|HASH_ALL|SPACE] "
+ "-owner <owner> -group <group> -mode <mode>]";
case "-rm":
return "\t[-rm <source>]";
case "-ls":
return "\t[-ls [-d] <path>]";
case "-getDestination":
return "\t[-getDestination <path>]";
case "-setQuota":
return "\t[-setQuota <path> -nsQuota <nsQuota> -ssQuota "
+ "<quota in bytes or quota size string>]";
case "-setStorageTypeQuota":
return "\t[-setStorageTypeQuota <path> -storageType <storage type> "
+ "<quota in bytes or quota size string>]";
case "-clrQuota":
return "\t[-clrQuota <path>]";
case "-clrStorageTypeQuota":
return "\t[-clrStorageTypeQuota <path>]";
case "-safemode":
return "\t[-safemode enter | leave | get]";
case "-nameservice":
return "\t[-nameservice enable | disable <nameservice>]";
case "-getDisabledNameservices":
return "\t[-getDisabledNameservices]";
case "-refresh":
return "\t[-refresh]";
case "-refreshRouterArgs":
return "\t[-refreshRouterArgs <host:ipc_port> <key> [arg1..argn]]";
case "-refreshSuperUserGroupsConfiguration":
return "\t[-refreshSuperUserGroupsConfiguration]";
case "-refreshCallQueue":
return "\t[-refreshCallQueue]";
case DUMP_COMMAND:
return "\t[" + DUMP_COMMAND + "]";
}
return getUsage(null);
}
Expand Down
36 changes: 36 additions & 0 deletions ...rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1925,6 +1925,42 @@ public void testAddMultipleMountPointsFailure() throws Exception {
err.toString().contains("Cannot add mount points: [/testAddMultiMountPoints-01"));
}

@Test
public void testGetUsage() throws Exception {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this test is pretty irrelevant in the context, you are checking the exit codes here, where you didn't even touch them, there should be an existing test I believe which tests the help output

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, thanks for pointing it out

System.setOut(new PrintStream(out));
System.setErr(new PrintStream(err));

assertEquals(-1, ToolRunner.run(admin, new String[]{}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-helloworld"}));

assertEquals(-1, ToolRunner.run(admin, new String[]{"-add", "-err"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-addAll", "-err"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-update", "-err"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-rm"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-ls", "/a", "b", "/c"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-getDestination"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-setQuota", "-err"}));
assertEquals(-1, ToolRunner.run(admin,
new String[]{"-setStorageTypeQuota", "-err"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-clrQuota", "-err"}));
assertEquals(-1, ToolRunner.run(admin,
new String[]{"-clrStorageTypeQuota", "-err"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-safemode", "-err"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-nameservice", "-err"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-refreshRouterArgs"}));
assertEquals(-1, ToolRunner.run(admin,
new String[]{"-refreshSuperUserGroupsConfiguration", "-err"}));
assertEquals(-1, ToolRunner.run(admin,
new String[]{"-refreshCallQueue", "-err"}));
assertEquals(-1, ToolRunner.run(admin, new String[]{"-dumpState", "-err"}));
assertEquals(-1, ToolRunner.run(admin,
new String[]{"-getDisabledNameservices", "-err"}));

assertEquals(0, ToolRunner.run(admin, new String[]{"-refresh"}));
assertEquals(0, ToolRunner.run(admin, new String[]{"-ls", "/"}));
assertEquals(0, ToolRunner.run(admin, new String[]{"-getDestination", "/"}));
}

private void addMountTable(String src, String nsId, String dst)
throws Exception {
String[] argv = new String[] {"-add", src, nsId, dst};
Expand Down