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> (cherry picked from commit b0e9dee) Conflicts: src/osd/ReplicatedPG.cc Signed-off-by: Greg Farnum <gfarnum@redhat.com>
ceph · May 26, 2017 · 967d6a5 · 967d6a5
1 parent 54bc1e1
commit 967d6a5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
@@ -10020,6 +10020,8 @@ void ReplicatedPG::on_shutdown()
   cancel_flush_ops(false);
   cancel_proxy_ops(false);
   apply_and_flush_repops(false);
+  // clean up snap trim references
+  snap_trimmer_machine.process_event(Reset());
 
   pgbackend->on_change();