osd: Reset() the snaptrimmer on shutdown

We were failing to exit various wait states which held PGRefs. Error!

Fixes: http://tracker.ceph.com/issues/19931
Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index c3539c1dbc4ff5a7f8061cf0904bcaa38ef07c8d..c8fc5cb5b147afa8c12c2056942599a572e7f404 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -10446,6 +10446,8 @@ void PrimaryLogPG::on_shutdown()
   cancel_log_updates();
   // we must remove PGRefs, so do this this prior to release_backoffs() callers
   clear_backoffs(); 
+  // clean up snap trim references
+  snap_trimmer_machine.process_event(Reset());
 
   pgbackend->on_change();