From aaa9441eecd3d30f6d42bd966e14b5d0f6d8b959 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 1 Apr 2021 19:58:41 +0800 Subject: [PATCH] rgw/rgw_admin: s/realm delete/realm rm/ it was an oversight of fa5398d31f9467b58a8b4eda55d1b5e2bbdb6500 Signed-off-by: Kefu Chai --- PendingReleaseNotes | 3 +++ doc/radosgw/multisite.rst | 6 +++--- src/rgw/rgw_admin.cc | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index cd4c12bbe7393..dce4ea0926f94 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -9,6 +9,9 @@ that were storing state in RADOS omap, especially without striping which limits scalability. +* RGW: `radosgw-admin realm delete` is now renamed to `radosgw-admin realm rm`. This + is consistent with the help message. + >=16.0.0 -------- * mgr-pg_autoscaler: Autoscaler will now start out by scaling each diff --git a/doc/radosgw/multisite.rst b/doc/radosgw/multisite.rst index fc859594568f7..34ec72130ba92 100644 --- a/doc/radosgw/multisite.rst +++ b/doc/radosgw/multisite.rst @@ -770,17 +770,17 @@ realm. Alternatively, to change which realm is the default, execute: Delete a Realm ~~~~~~~~~~~~~~ -To delete a realm, execute ``realm delete`` and specify the realm name. +To delete a realm, execute ``realm rm`` and specify the realm name. :: - # radosgw-admin realm delete --rgw-realm={realm-name} + # radosgw-admin realm rm --rgw-realm={realm-name} For example: :: - # radosgw-admin realm delete --rgw-realm=movies + # radosgw-admin realm rm --rgw-realm=movies Get a Realm ~~~~~~~~~~~ diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 3cf4ad3e6a162..1970966afd269 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -931,7 +931,7 @@ static SimpleCmd::Commands all_cmds = { { "datalog autotrim", OPT::DATALOG_AUTOTRIM }, { "datalog trim", OPT::DATALOG_TRIM }, { "realm create", OPT::REALM_CREATE }, - { "realm delete", OPT::REALM_DELETE }, + { "realm rm", OPT::REALM_DELETE }, { "realm get", OPT::REALM_GET }, { "realm get default", OPT::REALM_GET_DEFAULT }, { "realm get-default", OPT::REALM_GET_DEFAULT }, -- 2.39.5