From: root <root@devel.localdomain>
Date: Mon, 2 Sep 2019 03:23:45 +0000 (+0800)
Subject: rgw: fixed "unrecognized arg" error when using "radosgw-admin zone rm".
X-Git-Tag: v14.2.5~231^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9dda312747a75d6aa58acb16eeaa955e68db2ca;p=ceph.git

rgw: fixed "unrecognized arg" error when using "radosgw-admin zone rm".

Signed-off-by: Hongang Chen <c744402859@gmail.com>

Author:    root <root@devel.localdomain>
Date:      Mon Sep 2 11:23:45 2019 +0800
(cherry picked from commit 848f1de0d0b6c8aeacfa1c2840f54f6824d8cfb5)
---

diff --git a/doc/radosgw/multisite.rst b/doc/radosgw/multisite.rst
index 431c2da2b66..17132371ed4 100644
--- a/doc/radosgw/multisite.rst
+++ b/doc/radosgw/multisite.rst
@@ -229,7 +229,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
@@ -404,7 +404,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.
@@ -1277,7 +1277,7 @@ Next, delete the zone. Execute the following:
 
 ::
 
-    # radosgw-admin zone delete --rgw-zone<name>
+    # radosgw-admin zone rm --rgw-zone<name>
 
 Finally, update the period:
 
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index da50a90a6e4..6a11632cd54 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -872,7 +872,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;