Skip to content

rgw: bucket layout fixes#34570

Merged
cbodley merged 3 commits intoceph:masterfrom
cbodley:wip-bucket-layout-json
Apr 23, 2020
Merged

rgw: bucket layout fixes#34570
cbodley merged 3 commits intoceph:masterfrom
cbodley:wip-bucket-layout-json

Conversation

@cbodley
Copy link
Contributor

@cbodley cbodley commented Apr 15, 2020

a couple followup fixes for #34096

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

cbodley added 3 commits April 15, 2020 09:21
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley cbodley added the rgw label Apr 15, 2020
@cbodley cbodley requested a review from smanjara April 15, 2020 14:21
Copy link
Contributor

@smanjara smanjara left a comment

Choose a reason for hiding this comment

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

lgtm. thanks!

@smanjara
Copy link
Contributor

smanjara commented Apr 16, 2020

@cbodley, I cherry picked the commits on top of my local branch to test, and I noticed that it creates buckets with num_shards = 11. The changes here doesn't seem to be causing it. Will check further and update.

Copy link
Contributor

@mattbenjamin mattbenjamin left a comment

Choose a reason for hiding this comment

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

lgtm

uint32_t hash_type;
JSONDecoder::decode_json("bi_shard_hash_type", hash_type, obj);
layout.current_index.layout.normal.num_shards = (uint8_t)hash_type;
layout.current_index.layout.normal.hash_type = static_cast<rgw::BucketHashType>(hash_type);
Copy link
Contributor

Choose a reason for hiding this comment

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

ouch

{
int r = 0;
switch (hash_type) {
case RGWBucketInfo::MOD:
Copy link
Contributor

Choose a reason for hiding this comment

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

ew

@cbodley
Copy link
Contributor Author

cbodley commented Apr 23, 2020

@cbodley cbodley merged commit ce5f3e3 into ceph:master Apr 23, 2020
@cbodley cbodley deleted the wip-bucket-layout-json branch April 23, 2020 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants