]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PrimaryLogPG: do not call on_shutdown() if (pg.deleting) 15040/head
authorKefu Chai <kchai@redhat.com>
Thu, 11 May 2017 05:13:39 +0000 (13:13 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 11 May 2017 05:16:31 +0000 (13:16 +0800)
when a callback is called, it could be facing a PG already shut down by
OSD. but if that callback wants to shut that PG down. it should check
the PG's status first.

Fixes: http://tracker.ceph.com/issues/19902
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/osd/PrimaryLogPG.cc

index 60922d1a8aae76e3b8576fbd0eb8a52667c9bb9b..ba9df21115c4dd2fc985a17c19046db8e2bd37eb 100644 (file)
@@ -10230,7 +10230,8 @@ void PrimaryLogPG::on_removal(ObjectStore::Transaction *t)
 
   write_if_dirty(*t);
 
-  on_shutdown();
+  if (!deleting)
+    on_shutdown();
 }
 
 void PrimaryLogPG::on_shutdown()