From 21e8512b97aa6c78d483e30f16bf8df1b9e97872 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 13 Dec 2017 20:15:17 -0600 Subject: [PATCH] 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 --- src/osd/OSD.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 9b7d2644385..9b5bb1e51a6 100644 --- 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( -- 2.39.5