Skip to content
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

Jump to bottom

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

Merged
merged 1 commit into from Oct 8, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/radosgw/multisite.rst
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -1285,7 +1285,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:

Expand Down
2 changes: 1 addition & 1 deletion src/rgw/rgw_admin.cc
View file
Open in desktop
Expand Up @@ -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;
Expand Down