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

luminous: multisite: race between sync of bucket and bucket instance metadata #18767

Merged
merged 3 commits into from Nov 9, 2017

Conversation

Projects
None yet
3 participants
@smithfarm
Contributor

smithfarm commented Nov 6, 2017

cbodley added some commits Oct 31, 2017

rgw: take placement_rule from bucket info in update_containers_stats
in case the cls_user_bucket_entry doesn't contain a placement_rule, take
it from the bucket instance info

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 531195d)
rgw: remove placement_rule from rgw_link_bucket()
with the fallback in RGWRados::update_containers_stats(), we no longer
need to pass placement_rule into the cls_user_bucket_entry

this removes the dependency between bucket entrypoint metadata and its
bucket instance metadata during multisite sync

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit dd5d278)
rgw: remove placement_rule from cls_user_bucket_entry
placement_rule is no longer needed in cls_user_bucket_entry, because the
only time that it's needed, we can read it from the bucket instance in
RGWRados::update_containers_stats()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 8e62e35)

@smithfarm smithfarm self-assigned this Nov 6, 2017

@smithfarm smithfarm added this to the luminous milestone Nov 6, 2017

@smithfarm smithfarm added bug fix core rgw and removed core labels Nov 6, 2017

@smithfarm smithfarm requested review from cbodley and mattbenjamin Nov 6, 2017

@cbodley

cbodley approved these changes Nov 6, 2017

@theanalyst

This comment has been minimized.

Show comment
Hide comment
@theanalyst

theanalyst Nov 8, 2017

Member

@cbodley I guess we need this also in 12.2.2 as #17835 went in already?

Member

theanalyst commented Nov 8, 2017

@cbodley I guess we need this also in 12.2.2 as #17835 went in already?

@cbodley

This comment has been minimized.

Show comment
Hide comment
@cbodley

cbodley Nov 8, 2017

Contributor

@theanalyst yes please

Contributor

cbodley commented Nov 8, 2017

@theanalyst yes please

@theanalyst theanalyst merged commit f1776bc into ceph:luminous Nov 9, 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-22020-luminous branch Nov 9, 2017

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