]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: recover from incomplete reshard attempt 24899/head
authorJ. Eric Ivancich <ivancich@redhat.com>
Wed, 17 Oct 2018 17:43:24 +0000 (13:43 -0400)
committerJ. Eric Ivancich <ivancich@redhat.com>
Thu, 1 Nov 2018 20:25:36 +0000 (16:25 -0400)
commitd93d0d28f3d15771b7e72268c315874b0dadcb6b
tree7a4e4c5dd4d6749b3fd8bc56a2aae1f4f257bf6b
parente5a21af7b06689a415feb4aa3ff3bfac7863725f
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