From 0d4572a9109da6ca578af7a931d63ba2ddd7c8b7 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Sep 2019 11:23:45 +0800 Subject: [PATCH] rgw: fixed "unrecognized arg" error when using "radosgw-admin zone rm". Signed-off-by: Hongang Chen Author: root Date: Mon Sep 2 11:23:45 2019 +0800 (cherry picked from commit 848f1de0d0b6c8aeacfa1c2840f54f6824d8cfb5) --- doc/radosgw/multisite.rst | 6 +++--- src/rgw/rgw_admin.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/radosgw/multisite.rst b/doc/radosgw/multisite.rst index 181718bd5849e..c973ee1ff5eb0 100644 --- a/doc/radosgw/multisite.rst +++ b/doc/radosgw/multisite.rst @@ -224,7 +224,7 @@ the default zone group first. # radosgw-admin zonegroup remove --rgw-zonegroup=default --rgw-zone=default # radosgw-admin period update --commit - # radosgw-admin zone delete --rgw-zone=default + # radosgw-admin zone rm --rgw-zone=default # radosgw-admin period update --commit # radosgw-admin zonegroup delete --rgw-zonegroup=default # radosgw-admin period update --commit @@ -412,7 +412,7 @@ Delete the default zone if needed. :: - # radosgw-admin zone delete --rgw-zone=default + # radosgw-admin zone rm --rgw-zone=default Finally, delete the default pools in your Ceph storage cluster if needed. @@ -1285,7 +1285,7 @@ Next, delete the zone. Execute the following: :: - # radosgw-admin zone delete --rgw-zone + # radosgw-admin zone rm --rgw-zone Finally, update the period: diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 81fd13ef55c3e..3a50426f5149d 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -825,7 +825,7 @@ static int get_cmd(const char *cmd, const char *prev_cmd, const char *prev_prev_ if (strcmp(cmd, "list") == 0) return OPT_ZONE_PLACEMENT_LIST; } else if (strcmp(prev_cmd, "zone") == 0) { - if (strcmp(cmd, "delete") == 0) + if (match_str(cmd, "rm", "delete")) return OPT_ZONE_DELETE; if (strcmp(cmd, "create") == 0) return OPT_ZONE_CREATE;