]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: recover from incomplete reshard attempt
authorJ. Eric Ivancich <ivancich@redhat.com>
Wed, 17 Oct 2018 17:43:24 +0000 (13:43 -0400)
committerAbhishek Lekshmanan <abhishek@suse.com>
Thu, 29 Nov 2018 12:03:59 +0000 (13:03 +0100)
commitf4a18a100240b870a3621faf6dc942ec47e34b7b
tree59964a1d2bf76a8c928040b3b0d990629f2aa960
parent604036085d7ec500b0397088bb5cb3ba9dfea5e6
rgw: recover from incomplete reshard attempt

In case a reshard attempt is left in an incomplete state, i.e., flags
still show resharding even though the bucket reshard lock isn't being
held, try to recover by taking the bucket reshard lock and clearing
flags associated with resharding.

This change requires access to an RGWBucketInfo object. So call stack
into this function should provide that to prevent unnecessary
work. Changes were made to provide this object.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 4891ae59314041802da0f6dc249ccbeb761616dc)
src/rgw/rgw_admin.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_reshard.cc
src/rgw/rgw_reshard.h