From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 26 May 2017 04:52:49 +0000 (-0700)
Subject: osd: Reset() the snaptrimmer on shutdown
X-Git-Tag: v12.1.0~57^2~27^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0e9deeea8a8e90f6d7e9d56b6b4aed890e01d7b;p=ceph.git

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 c3539c1dbc4f..c8fc5cb5b147 100644
--- 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();