Skip to content

Commit

Permalink
osd/PrimaryLogPG: do not call on_shutdown() if (pg.deleting)
Browse files Browse the repository at this point in the history
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>
(cherry picked from commit f3c44a0)
  • Loading branch information
tchaikov authored and Alexey Sheplyakov committed May 12, 2017
1 parent 6537fc7 commit 9ec5d8b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/osd/ReplicatedPG.cc
Expand Up @@ -9996,7 +9996,8 @@ void ReplicatedPG::on_removal(ObjectStore::Transaction *t)

write_if_dirty(*t);

on_shutdown();
if (!deleting)
on_shutdown();
}

void ReplicatedPG::on_shutdown()
Expand Down

0 comments on commit 9ec5d8b

Please sign in to comment.