From a03bd2c73de079d55a0b472b1254ff3a3d7e6481 Mon Sep 17 00:00:00 2001 From: amaliujia Date: Tue, 1 Sep 2020 16:06:22 -0700 Subject: [PATCH 1/5] HDDS-4189. Change `ozone admin om getserviceroles` to `ozone admin om status` --- .../dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot | 2 +- hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot | 2 +- .../hadoop/ozone/admin/om/GetServiceRolesSubcommand.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot b/hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot index 66804f9b512e..1334078f96a3 100644 --- a/hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot +++ b/hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot @@ -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 status -id=omServiceIdDefault 0 Should Contain ${result} This command works only on OzoneManager HA cluster. diff --git a/hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot b/hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot index 9261a4b440e2..1fa0857a634e 100644 --- a/hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot +++ b/hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot @@ -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 status --service-id=omservice LOG ${result} Should Contain ${result} LEADER 1 Should Contain ${result} FOLLOWER 2 diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java index cff773cd825f..0c44ad8b0b29 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java @@ -30,10 +30,10 @@ import java.util.concurrent.Callable; /** - * Handler of om get-service-roles command. + * Handler of om status command. */ @CommandLine.Command( - name = "getserviceroles", + name = "status", description = "List all OMs and their respective Ratis server roles", mixinStandardHelpOptions = true, versionProvider = HddsVersionProvider.class) From e69d921a213c7a70e0d4d372ae94074e58ea9cb7 Mon Sep 17 00:00:00 2001 From: Rui Wang Date: Tue, 1 Sep 2020 20:32:44 -0700 Subject: [PATCH 2/5] fixup! Keep getserviceroles as alias Co-authored-by: Doroszlai, Attila <6454655+adoroszlai@users.noreply.github.com> --- .../apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java index 0c44ad8b0b29..471cdaf7458d 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java @@ -33,7 +33,7 @@ * Handler of om status command. */ @CommandLine.Command( - name = "status", + name = "status", aliases = "getserviceroles", description = "List all OMs and their respective Ratis server roles", mixinStandardHelpOptions = true, versionProvider = HddsVersionProvider.class) From 8f85c6cbc220c136fbb3d0c8092c93ac2ea7bfd0 Mon Sep 17 00:00:00 2001 From: amaliujia Date: Wed, 2 Sep 2020 16:56:07 -0700 Subject: [PATCH 3/5] fixup! use `roles` as the command name --- .../dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot | 2 +- hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot | 2 +- .../hadoop/ozone/admin/om/GetServiceRolesSubcommand.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot b/hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot index 1334078f96a3..0c688865193b 100644 --- a/hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot +++ b/hadoop-ozone/dist/src/main/smoketest/om-ratis/testOMAdminCmd.robot @@ -22,5 +22,5 @@ Test Timeout 5 minutes *** Test Cases *** Check om admin command - ${result} = Execute and checkrc ozone admin om status -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. diff --git a/hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot b/hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot index 1fa0857a634e..0c08bb1bace4 100644 --- a/hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot +++ b/hadoop-ozone/dist/src/main/smoketest/omha/testOMHA.robot @@ -92,7 +92,7 @@ Put Multiple Keys END Get OM Leader Node - ${result} = Execute ozone admin om status --service-id=omservice + ${result} = Execute ozone admin om roles --service-id=omservice LOG ${result} Should Contain ${result} LEADER 1 Should Contain ${result} FOLLOWER 2 diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java index 471cdaf7458d..482e46306f30 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/om/GetServiceRolesSubcommand.java @@ -30,10 +30,10 @@ import java.util.concurrent.Callable; /** - * Handler of om status command. + * Handler of om roles command. */ @CommandLine.Command( - name = "status", aliases = "getserviceroles", + name = "roles", aliases = "getserviceroles", description = "List all OMs and their respective Ratis server roles", mixinStandardHelpOptions = true, versionProvider = HddsVersionProvider.class) From 98b403b012e5031f497211d25b2d58ecddcb2e7a Mon Sep 17 00:00:00 2001 From: amaliujia Date: Wed, 2 Sep 2020 21:09:56 -0700 Subject: [PATCH 4/5] trigger new CI check From e63a6e8ba5ce2ef44a8deb2a2507d84400b4026c Mon Sep 17 00:00:00 2001 From: amaliujia Date: Wed, 2 Sep 2020 23:27:09 -0700 Subject: [PATCH 5/5] trigger new CI check