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: after CreateBucket is forwarded to master, local bucket may use different value for bucket index shards #15450

Merged
merged 2 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 added bug fix core rgw and removed core labels Jun 3, 2017

@smithfarm smithfarm changed the title from jewel: multisite: after CreateBucket is forwarded to master, local bucket may use different value for bucket index shards to jewel: rgw: multisite: after CreateBucket is forwarded to master, local bucket may use different value for bucket index shards Jun 3, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Jun 3, 2017

Contributor

@cbodley Please see http://tracker.ceph.com/issues/19745#note-6

(so far, this PR only contains the first of the two master PRs indicated for backport)

Contributor

smithfarm commented Jun 3, 2017

@cbodley Please see http://tracker.ceph.com/issues/19745#note-6

(so far, this PR only contains the first of the two master PRs indicated for backport)

@smithfarm smithfarm changed the title from jewel: rgw: multisite: after CreateBucket is forwarded to master, local bucket may use different value for bucket index shards to [DNM] jewel: rgw: multisite: after CreateBucket is forwarded to master, local bucket may use different value for bucket index shards Jun 19, 2017

@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Jul 12, 2017

Contributor

Jenkins re-test this please

@cbodley Ping

Contributor

smithfarm commented Jul 12, 2017

Jenkins re-test this please

@cbodley Ping

@cbodley

This comment has been minimized.

Show comment
Hide comment
@cbodley

cbodley Jul 12, 2017

Contributor

@smithfarm thanks. i did the cherry-pick for #15010 and resolved the init_bucket_index() conflict. i pushed the branch to https://github.com/cbodley/ceph/commits/wip-19758. you can pull in that last commit cbodley@1a50cc3

Contributor

cbodley commented Jul 12, 2017

@smithfarm thanks. i did the cherry-pick for #15010 and resolved the init_bucket_index() conflict. i pushed the branch to https://github.com/cbodley/ceph/commits/wip-19758. you can pull in that last commit cbodley@1a50cc3

@smithfarm smithfarm changed the title from [DNM] jewel: rgw: multisite: after CreateBucket is forwarded to master, local bucket may use different value for bucket index shards to jewel: rgw: multisite: after CreateBucket is forwarded to master, local bucket may use different value for bucket index shards Jul 12, 2017

shashalu added some commits Apr 7, 2017

rgw: using the same bucket num_shards as master zg when create bucket…
… in secondary zg

create bucket in secondary zonegroup will forward to master. The master may have different num_shards option.
So when create bucket in local, should use master's num_shards instead of local num_shards option.

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

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

Conflicts:
    src/rgw/rgw_op.cc
    - different argument list of store->create_bucket() in jewel, compared to
      master
    - no RGWBulkUploadOp:: in jewel; modifications to
      RGWBulkUploadOp::handle_dir() omitted
rgw: when create_bucket use the same num_shards with info.num_shards
pr #14388 only fix the num_shards in BucketInfo, "init_bucket_index" function still use local num_shards

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

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

Conflicts:
	src/rgw/rgw_rados.cc: init_bucket_index() called earlier
@smithfarm

This comment has been minimized.

Show comment
Hide comment
@smithfarm

smithfarm Jul 12, 2017

Contributor

@cbodley Thanks! Updated. This enabled me to do the kraken backport as well. While I was working on it, I realized that I left out a potentially significant aspect of the conflict resolution from the first commit, i.e. 9379937 - could you look at it again to see if it's sane?

Contributor

smithfarm commented Jul 12, 2017

@cbodley Thanks! Updated. This enabled me to do the kraken backport as well. While I was working on it, I realized that I left out a potentially significant aspect of the conflict resolution from the first commit, i.e. 9379937 - could you look at it again to see if it's sane?

@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 beb6e22 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-19758-jewel branch Aug 25, 2017

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