Skip to content

HDDS-4189. Change ozone admin om getserviceroles to ozone admin om roles #1375

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

Merged
adoroszlai merged 5 commits into from
Sep 3, 2020
Merged

HDDS-4189. Change ozone admin om getserviceroles to ozone admin om roles #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a03bd2c
HDDS-4189. Change `ozone admin om getserviceroles` to `ozone admin om…
amaliujia Sep 1, 2020
e69d921
fixup! Keep getserviceroles as alias
amaliujia Sep 2, 2020
8f85c6c
fixup! use `roles` as the command name
amaliujia Sep 2, 2020
98b403b
trigger new CI check
amaliujia Sep 3, 2020
e63a6e8
trigger new CI check
amaliujia Sep 3, 2020
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
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ Test Timeout 5 minutes
*** Test Cases ***

Check om admin command
${result} = Execute and checkrc ozone admin om getserviceroles -id=omServiceIdDefault 0
${result} = Execute and checkrc ozone admin om roles -id=omServiceIdDefault 0
Should Contain ${result} This command works only on OzoneManager HA cluster.
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Put Multiple Keys
END

Get OM Leader Node
${result} = Execute ozone admin om getserviceroles --service-id=omservice
${result} = Execute ozone admin om roles --service-id=omservice
LOG ${result}
Should Contain ${result} LEADER 1
Should Contain ${result} FOLLOWER 2
Expand Down
4 changes: 2 additions & 2 deletions ...ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
import java.util.concurrent.Callable;

/**
* Handler of om get-service-roles command.
* Handler of om roles command.
*/
@CommandLine.Command(
name = "getserviceroles",
name = "roles", aliases = "getserviceroles",
description = "List all OMs and their respective Ratis server roles",
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
Expand Down