From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Apr 2017 14:05:48 +0000 (-0400)
Subject: mon/PGMonitor: do not warn about pgp_num for fake "deleted" pools
X-Git-Tag: v12.0.3~28^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d5f77d3fe37094c8b6d5cd4fe6624107fceee218;p=ceph.git

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 537bd5601dcf..151468a58970 100644
--- 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();