]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw: reshard: skip stale bucket id entries from reshard queue 34735/head
authorAbhishek Lekshmanan <abhishek@suse.com>
Fri, 17 Apr 2020 15:11:01 +0000 (17:11 +0200)
committerNathan Cutler <ncutler@suse.com>
Fri, 24 Apr 2020 13:06:10 +0000 (15:06 +0200)
commitb5b73e184c1eb9b796aeded7dcfbbab36c03f1de
tree6d8fb292cb7688255a317953eba33969dc7502f2
parentd1d9f9cff9bc39dd63e05ddfe7f63e36dcb4aa16
rgw: reshard: skip stale bucket id entries from reshard queue

If we encounter a reshard queue entry that has an older ID compared to the
bucket's current ID, it'd mean that some other process or a manual reshard has
already processed this entry, skip processing the entry this time. An
alternative is to verify the num_shards that we have in queue >= the current
shards, but this would mean that we may reshard a recently manual resharded
bucket again which might not be intended

Fixes: https://tracker.ceph.com/issues/45134
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 02664fc091674e28233559cd1c42f954d5776d86)

Conflicts:
src/rgw/rgw_reshard.cc
- immediately preceding "get_bucket_info" call looks different in
  nautilus
src/rgw/rgw_reshard.cc