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.

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

rgw: fix radosgw-admin retcode #15257

Merged
merged 2 commits into from
Jun 8, 2017
Merged

Conversation

shashalu
Copy link
Contributor

fix "radosgw-admin user rm" and "radosgw-admin bucket stats" retcode

Signed-off-by: Shasha Lu lu.shasha@eisoo.com

should check RGWBucketAdminOp::info retcode

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
@@ -4491,7 +4491,8 @@ int main(int argc, const char **argv)
case OPT_USER_RM:
ret = user.remove(user_op, &err_msg);
if (ret == -ENOENT) {
cerr << err_msg << std::endl;
cerr << "could not remove user: " << err_msg << std::endl;
return -ret;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we just remove the special case for -ENOENT here, and let if (ret < 0) handle this below?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks , already removed.

when user.remove got negative retcode should return

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
@shashalu
Copy link
Contributor Author

ping @cbodley

Copy link
Contributor

@cbodley cbodley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, i'll include this in my next teuthology run

@cbodley
Copy link
Contributor

cbodley commented Jun 8, 2017

@cbodley cbodley merged commit 734083b into ceph:master Jun 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants