]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd: release backoffs during merge 31822/head
authorSage Weil <sage@redhat.com>
Thu, 14 Nov 2019 14:49:32 +0000 (08:49 -0600)
committerNeha Ojha <nojha@redhat.com>
Fri, 22 Nov 2019 19:49:13 +0000 (11:49 -0800)
commit9ae6f62efe255807b87ca1d45cd30f06d8c0d1c3
tree6d6473aa2cdfdb3942e735eced9836ccbfc90c53
parent9989c20373e2294b7479ec4bd6ac5cce80b01645
osd: release backoffs during merge

When we merge PGs, ensure that backoffs release messages are sent to
the client before the victim PG is destroyed.  This is /almost/ handled
by on_shutdown(), except that the shutdown code is aggressive about
tearing down backoff state in order to manage the PGRef lifecycle
carefully--and because in the shutdown (or normal PG/pool deletion) case
it doesn't matter what (if anything) we tell the client.

Fix this by simply queuing the backoff release prior to shutting down the
merge source PG.

An alternative appraoch would be to rejigger the PGRef release timing, but
that code is very fragile and this is a more targetted fix for this issue.
We might consider a more careful look in the future... or not!

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f75d8327277012db70c2ca00991decacf29b1b6a)
src/osd/OSD.cc
src/osd/PG.h