From e275e85531ee640c9c4080860c809b9bec4c933d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 25 Oct 2010 16:44:10 -0700 Subject: [PATCH] mon: remove pg from deleted pools from pg_map Signed-off-by: Sage Weil --- src/mon/PGMonitor.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index 1286fbea3eb70..c793b7267b04f 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -575,7 +575,18 @@ bool PGMonitor::register_new_pgs() pending_inc.pg_remove.insert(*p); removed++; } - if (NULL == mon->osdmon()->osdmap.get_pg_pool(p->pool())) { + if (!osdmap->have_pg_pool(p->pool())) { + dout(20) << " removing creating_pg " << *p << " because containing pool deleted" << dendl; + pending_inc.pg_remove.insert(*p); + ++removed; + } + } + + // deleted pools? + for (set::iterator p = pg_map.pg_set.begin(); + p != pg_map.pg_set.end(); + p++) { + if (!osdmap->have_pg_pool(p->pool())) { dout(20) << " removing creating_pg " << *p << " because containing pool deleted" << dendl; pending_inc.pg_remove.insert(*p); ++removed; -- 2.39.5