osd: clean up pending splits when removing a pg

Say we get an osdmap indicating a pg will split, but the pg is deleting and
finishes its delete before the pg consumes that map.  We need to clean up
the pending split state.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 9b7d26443859df24a82ac1d122f20f463a515b09..9b5bb1e51a69ef6a103582df884151102faab29e 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1746,6 +1746,7 @@ void OSDService::finish_pg_delete(PG *pg)
 {
   osd->op_shardedwq.clear_pg_pointer(pg);
   pg_remove_epoch(pg->get_pgid());
+  cancel_pending_splits_for_parent(pg->get_pgid());
 }
 
 void OSDService::_queue_for_recovery(