From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Feb 2017 21:33:47 +0000 (-0500)
Subject: mon/PGMonitor: stop generating health warnings with luminous
X-Git-Tag: v12.0.1~145^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8bab735909f3e2b3e61001d5af61fca8e5146d9b;p=ceph.git

mon/PGMonitor: stop generating health warnings with luminous

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 4fd2109b664b..17804fafe86a 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1734,8 +1734,12 @@ void PGMonitor::get_health(list<pair<health_status_t,string> >& summary,
   }
 
   // full/nearfull
-  check_full_osd_health(summary, detail, pg_map.full_osds, "full", HEALTH_ERR);
-  check_full_osd_health(summary, detail, pg_map.nearfull_osds, "near full", HEALTH_WARN);
+  if (!mon->osdmon()->osdmap.test_flag(CEPH_OSDMAP_REQUIRE_LUMINOUS)) {
+    check_full_osd_health(summary, detail, pg_map.full_osds, "full",
+			  HEALTH_ERR);
+    check_full_osd_health(summary, detail, pg_map.nearfull_osds, "near full",
+			  HEALTH_WARN);
+  }
 
   // near-target max pools
   const map<int64_t,pg_pool_t>& pools = mon->osdmon()->osdmap.get_pools();