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 <sage@redhat.com>

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 537bd5601dcf6ec0a5addb75d7e91eed31735007..151468a58970ce7f03198469e211f1505b0811cc 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1588,7 +1588,9 @@ void PGMonitor::get_health(list<pair<health_status_t,string> >& 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();