Merge pull request #15040 from tchaikov/wip-19902

osd/PrimaryLogPG: do not call on_shutdown() if (pg.deleting) Reviewed-by: Brad Hubbard <bhubbard@redhat.com> Reviewed-by: Sage Weil <sage@redhat.com>
ceph · May 12, 2017 · e08283a · e08283a
2 parents a4d4a9b + f3c44a0
commit e08283a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
@@ -10418,7 +10418,8 @@ void PrimaryLogPG::on_removal(ObjectStore::Transaction *t)
 
   write_if_dirty(*t);
 
-  on_shutdown();
+  if (!deleting)
+    on_shutdown();
 }
 
 void PrimaryLogPG::on_shutdown()