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: update bucket cors in secondary zonegroup should forward to master #15260

Merged
merged 1 commit into from Jun 20, 2017

Conversation

Projects
None yet
2 participants
@shashalu
Contributor

shashalu commented May 24, 2017

#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

@cbodley

This comment has been minimized.

Contributor

cbodley commented May 24, 2017

thanks @shashalu, could you please add a simple test for this in src/test/rgw/rgw_multi/tests.py? something similar to test_bucket_acl(), that verifies that the change is applied immediately on non-master zones without waiting for metadata sync

@cbodley cbodley self-assigned this May 24, 2017

@shashalu

This comment has been minimized.

Contributor

shashalu commented May 27, 2017

@cbodley add test_bucket_cors() in tests.py

@cbodley cbodley removed the needs-test label May 30, 2017

@@ -661,6 +662,14 @@ def test_bucket_acl():
bucket.set_acl('public-read')
assert(len(bucket.get_acl().acl.grants) == 2) # new grant on AllUsers
def test_bucket_cors():
buckets, zone_bucket = create_bucket_per_zone_in_realm()
for zone, bucket in zone_bucket.items():

This comment has been minimized.

@cbodley

cbodley Jun 8, 2017

Contributor

after rebasing this on master, i'm seeing this failure:

Traceback (most recent call last):
  File "/usr/lib/python2.7/site-packages/nose-1.3.7-py2.7.egg/nose/case.py", line 197, in runTest
    self.test(*self.arg)
  File "/usr/lib/python2.7/site-packages/nose-1.3.7-py2.7.egg/nose/util.py", line 620, in newfunc
    return func(*arg, **kw)
  File "/home/cbodley/ceph/src/test/rgw/rgw_multi/tests.py", line 660, in test_bucket_cors
    for zone, bucket in zone_bucket.items():
AttributeError: 'list' object has no attribute 'items'

commit f503762 changed zone_bucket from dict to list, so this line needs to be for zone, bucket in zone_bucket:

@cbodley

This comment has been minimized.

Contributor

cbodley commented Jun 16, 2017

@shashalu please rebase

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>
@cbodley

This comment has been minimized.

Contributor

cbodley commented Jun 19, 2017

jenkins test this please

@cbodley cbodley merged commit 2edd33c into ceph:master Jun 20, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
arm64 make check arm64 make check succeeded
Details
make check make check succeeded
Details

dongbula pushed a commit to dongbula/ceph that referenced this pull request Jul 22, 2017

Merge pull request ceph#15260 from shashalu/fix-secondary-zonegroup-cors
rgw: update bucket cors in secondary zonegroup should forward to master

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment