From 2d5cafdf6461c213aa2642210a3c4efabce61efd Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Thu, 25 May 2017 21:52:49 -0700 Subject: [PATCH] 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 (cherry picked from commit b0e9deeea8a8e90f6d7e9d56b6b4aed890e01d7b) --- src/osd/PrimaryLogPG.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 2bf70bf2eb264..669e3dd49dc55 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -10136,6 +10136,8 @@ void PrimaryLogPG::on_shutdown() cancel_proxy_ops(false); apply_and_flush_repops(false); cancel_log_updates(); + // clean up snap trim references + snap_trimmer_machine.process_event(Reset()); pgbackend->on_change(); -- 2.39.5