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

rgw: fix wrong debug related to user ACLs in rgw_build_bucket_policies() #14369

Merged
merged 1 commit into from Nov 20, 2018
Merged

rgw: fix wrong debug related to user ACLs in rgw_build_bucket_policies() #14369

merged 1 commit into from Nov 20, 2018

Conversation

rzarzynski
Copy link
Contributor

Fixes: http://tracker.ceph.com/issues/19514
Signed-off-by: Radoslaw Zarzynski rzarzynski@mirantis.com

cbodley
cbodley reviewed Apr 6, 2017
View reviewed changes
src/rgw/rgw_op.cc Outdated
@@ -492,7 +492,7 @@ int rgw_build_bucket_policies(RGWRados* store, struct req_state* s)
map<string, bufferlist> uattrs;

ret = rgw_get_user_attrs_by_uid(store, acct_acl_user.uid, uattrs);
if (!ret) {
if (! ret) {
Copy link
Contributor

Choose a reason for hiding this comment

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

re: CodingStyle, the google style guide says:

// No spaces separating unary operators and their arguments.
x = -5;
++x;
if (x && !y)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, fixing right now.

@rzarzynski
Copy link
Contributor Author

jenkins test this please

@cbodley
Copy link
Contributor

cbodley commented Jul 14, 2017

@rzarzynski rebase please

@cbodley
Copy link
Contributor

cbodley commented Feb 15, 2018

@rzarzynski can you please rebase? the conflict looks relevent to this change in error handling

@yuriw
Copy link
Contributor

yuriw commented Jul 4, 2018

@rzarzynski pls fix/rebase

--- pr 14369 --- pulling https://github.com/rzarzynski/ceph.git branch wip-rgw-19514
remote: Counting objects: 5, done.
remote: Total 5 (delta 3), reused 3 (delta 3), pack-reused 1
Unpacking objects: 100% (5/5), done.
From https://github.com/rzarzynski/ceph

  • branch wip-rgw-19514 -> FETCH_HEAD
    Auto-merging src/rgw/rgw_op.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_op.cc
    Adding qa/suites/upgrade/kraken-x/stress-split/objectstore/filestore-xfs.yaml
    Adding qa/suites/upgrade/kraken-x/stress-split/objectstore/bluestore.yaml
    Adding qa/suites/upgrade/kraken-x/stress-split/objectstore/.qa
    Adding qa/suites/rgw/verify/frontend
    Adding qa/suites/rbd/mirror/cluster
    Adding qa/suites/rbd/mirror/base
    Adding qa/suites/ceph-deploy/basic/distros/ubuntu_latest.yaml
    Adding qa/suites/ceph-deploy/basic/distros/centos_latest.yaml
    Adding qa/suites/ceph-deploy/basic/distros/.qa
    Adding qa/suites/ceph-deploy/basic/config_options/.qa
    Adding qa/suites/ceph-deploy/basic/ceph-deploy-overrides/.qa
    warning: inexact rename detection was skipped due to too many files.
    warning: you may want to set your merge.renamelimit variable to at least 2624 and retry the command.
    Automatic merge failed; fix conflicts and then commit the result.
    Traceback (most recent call last):
    File "/home/yuriw/wip_master/src/script/build-integration-branch", line 62, in
    assert not r
    AssertionError

@rzarzynski
rgw: fix wrong debug related to user ACLs in rgw_build_bucket_policie…
21c76f9 
…s().

Fixes: http://tracker.ceph.com/issues/19514
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
@rzarzynski
Copy link
Contributor Author

jenkins retest this please (docs failure because of network issues)

@stale
Copy link

stale bot commented Nov 15, 2018

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.
If you are a maintainer or core committer, please follow-up on this issue to identify what steps should be taken by the author to move this proposed change forward.
If you are the author of this pull request, thank you for your proposed contribution. If you believe this change is still appropriate, please ensure that any feedback has been addressed and ask for a code review.

@stale stale bot added the stale label Nov 15, 2018
@stale stale bot removed the stale label Nov 15, 2018
@yuriw
Copy link
Contributor

yuriw commented Nov 15, 2018

wip-yuri4-testing-2018-11-15-2120

@yuriw yuriw merged commit 1b9f625 into ceph:master Nov 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adamemerson adamemerson adamemerson approved these changes

@cbodley cbodley cbodley approved these changes

Assignees
No one assigned
Labels
bug-fix needs-qa rgw wip-yuri4-testing
Projects
None yet
Milestone
No milestone
6 participants
@rzarzynski @cbodley @yuriw @adamemerson @mattbenjamin @liewegas