From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Jan 2018 19:26:16 +0000 (-0600)
Subject: osd/PrimaryLogPG: do on_shutdown on removal
X-Git-Tag: v13.0.2~510^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d37d9668913bfa1890c455acff61bd03fb7f5658;p=ceph.git

osd/PrimaryLogPG: do on_shutdown on removal

This cleans up our reservations and misc other state in OSDService that
needs to be cleaned up.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index fa2cae7666f90..18f9dc7cb529c 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -11507,9 +11507,7 @@ void PrimaryLogPG::on_removal(ObjectStore::Transaction *t)
   PGLogEntryHandler rollbacker{this, t};
   pg_log.roll_forward(&rollbacker);
 
-  if (!deleting) {
-    on_shutdown();
-  }
+  on_shutdown();
 }
 
 void PrimaryLogPG::clear_async_reads()