From: Joao Eduardo Luis <joao@suse.de>
Date: Fri, 8 Sep 2017 11:48:12 +0000 (+0100)
Subject: mon/OSDMonitor: don't create pgs if pool was deleted
X-Git-Tag: v12.2.1~23^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b10311dc730edfbd622a5a2ee7fe45293887b61a;p=ceph.git

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 <joao@suse.de>
(cherry picked from commit 7a8a88032ec0bf7f1b485419a11646d7441faf2c)
---

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 {