From 1264bae1a8639e4ce83c0fdf96c23d1826009c2a Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Fri, 8 Sep 2017 12:48:12 +0100 Subject: [PATCH] mon/OSDMonitor: don't create pgs if pool was deleted A pool may be deleted while in the process of creating pgs. If that happens, we should not queue additional pgs from that pool to be created. Fixes: http://tracker.ceph.com/issues/21309 Signed-off-by: Joao Eduardo Luis (cherry picked from commit 7a8a88032ec0bf7f1b485419a11646d7441faf2c) --- src/mon/CreatingPGs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mon/CreatingPGs.h b/src/mon/CreatingPGs.h index 4ba91575f3cc0..49935108c442f 100644 --- a/src/mon/CreatingPGs.h +++ b/src/mon/CreatingPGs.h @@ -60,6 +60,7 @@ struct creating_pgs_t { auto last = pgs.lower_bound(pg_t{0, (uint64_t)removed_pool + 1}); pgs.erase(first, last); created_pools.erase(removed_pool); + queue.erase(removed_pool); return total - pgs.size(); } void encode(bufferlist& bl) const { -- 2.39.5