From d5f77d3fe37094c8b6d5cd4fe6624107fceee218 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 19 Apr 2017 10:05:48 -0400 Subject: [PATCH] mon/PGMonitor: do not warn about pgp_num for fake "deleted" pools This breaks the upgrade test from jewel. We can probably revert it later. Signed-off-by: Sage Weil --- src/mon/PGMonitor.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index 537bd5601dcf..151468a58970 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -1588,7 +1588,9 @@ void PGMonitor::get_health(list >& summary, if (!pi) continue; // in case osdmap changes haven't propagated to PGMap yet const string& name = mon->osdmon()->osdmap.get_pool_name(p->first); - if (pi->get_pg_num() > pi->get_pgp_num()) { + if (pi->get_pg_num() > pi->get_pgp_num() && + !(name.find(".DELETED") != string::npos && + g_conf->mon_fake_pool_delete)) { ostringstream ss; ss << "pool " << name << " pg_num " << pi->get_pg_num() << " > pgp_num " << pi->get_pgp_num(); -- 2.47.3