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

jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone #15453

Merged
merged 3 commits into from Aug 25, 2017

Conversation

Projects
None yet
3 participants
@smithfarm
Contributor

smithfarm commented Jun 3, 2017

@smithfarm smithfarm self-assigned this Jun 3, 2017

@smithfarm smithfarm added this to the jewel milestone Jun 3, 2017

@smithfarm smithfarm changed the title from jewel: [multisite] operating bucket's acl&cors is not restricted on slave zone to jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone Jun 3, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Jun 3, 2017

Contributor

Needs #15260 once it's merged.

Contributor

smithfarm commented Jun 3, 2017

Needs #15260 once it's merged.

@smithfarm smithfarm added rgw and removed core labels Jun 3, 2017

@smithfarm smithfarm changed the title from jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone to [DNM] jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone Jun 19, 2017

Guo Zhandong and others added some commits Mar 22, 2017

rgw: enable to update acl of bucket created in slave zonegroup
Fixes: http://tracker.ceph.com/issues/16888

Signed-off-by: Guo Zhandong <guozhandong@cmss.chinamobile.com>
(cherry picked from commit 5f89d37)
rgw: fix for EINVAL errors on forwarded bucket put_acl requests
PutACL rejects request that include both a canned_acl and a request
body. when forwarding requests with canned_acls, we were also including
the generated policy in the body

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 1c863a7)
rgw: update bucket cors in secondary zonegroup should forward to master
pr#14082 is incomplete, cors should be redirect to master

Fixes: http://tracker.ceph.com/issues/16888

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit 7dd0995)

Conflicts:
	src/rgw/rgw_op.cc (jewel does not have 5fff637)
	src/test/rgw/rgw_multi/tests.py (jewel does not have this file)

@smithfarm smithfarm changed the title from [DNM] jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone to jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone Jun 20, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Jun 20, 2017

Contributor

@cbodley Could you look at the newest commit I just added? There were at least two obvious possibilities for resolving the conflict (that I could see). I had to pick one, but I'm not sure it's correct. The code in master was simplified by 5fff637.

Contributor

smithfarm commented Jun 20, 2017

@cbodley Could you look at the newest commit I just added? There were at least two obvious possibilities for resolving the conflict (that I could see). I had to pick one, but I'm not sure it's correct. The code in master was simplified by 5fff637.

@cbodley

lgtm 👍

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Jun 21, 2017

Contributor

Jenkins re-test this please (Unexpected die of job)

Contributor

smithfarm commented Jun 21, 2017

Jenkins re-test this please (Unexpected die of job)

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Aug 25, 2017

Contributor

This passed an rgw suite at http://tracker.ceph.com/issues/20613#note-18 and @cbodley has already approved it, so I'll merge unless there are objections.

Contributor

smithfarm commented Aug 25, 2017

This passed an rgw suite at http://tracker.ceph.com/issues/20613#note-18 and @cbodley has already approved it, so I'll merge unless there are objections.

@smithfarm smithfarm merged commit aec54d8 into ceph:jewel Aug 25, 2017

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details

@smithfarm smithfarm deleted the smithfarm:wip-19768-jewel branch Aug 25, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment