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: radosgw-admin dumps user info twice #5286

Merged
1 commit merged into from Jul 31, 2015
Merged

Conversation

smithfarm
Copy link
Contributor

… user info.

remove rgw_admin.cc OPT_SUBUSER_MODIFY, show_user_info code block.

switch (opt_cmd) {
...
case OPT_SUBUSER_MODIFY:
show_user_info(info, formatter);       //show first time (remove this)
break;
...
}

// output the result of a user operation
if (output_user_info) {
...
show_user_info(info, formatter);       //show second time
}

test fix:
before: after subuser modify print twice user info.
after changes, do the same procedure, print only once user info.

Signed-off-by: guce guce@h3c.com
(cherry picked from commit c604dd9)
@smithfarm smithfarm self-assigned this Jul 19, 2015
@smithfarm smithfarm added this to the hammer milestone Jul 19, 2015
@smithfarm smithfarm assigned theanalyst and unassigned smithfarm Jul 19, 2015
ghost pushed a commit that referenced this pull request Jul 19, 2015
Reviewed-by: Loic Dachary <ldachary@redhat.com>
@ghost
Copy link

ghost commented Jul 28, 2015

@yehudasa does this hammer backport looks good to merge ? It went through a rgw suite ( http://tracker.ceph.com/issues/11990#rgw ), only one job failed because of a radosgw-agent failure specific to Ubuntu 12.04 (but succeded on 14.04).

ghost pushed a commit that referenced this pull request Jul 29, 2015
ghost pushed a commit that referenced this pull request Jul 31, 2015
rgw: radosgw-admin dumps user info twice

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
@ghost ghost merged commit 5cbb6cf into ceph:hammer Jul 31, 2015
@smithfarm smithfarm deleted the wip-12400-hammer branch July 31, 2015 18:55
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants