From: Sage Weil <sage@redhat.com>
Date: Wed, 28 Jun 2017 18:46:37 +0000 (-0400)
Subject: mon/MgrStatMonitor: avoid dup health warnings during luminous upgrade
X-Git-Tag: ses5-milestone8^2~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e7384b0b5cde60ed23cc249f441a21c05a650f2;p=ceph.git

mon/MgrStatMonitor: avoid dup health warnings during luminous upgrade

PGMonitor is still providing warnings; do not expose the ones we are
getting from ceph-mgr (which also come from PGMap::get_health()) too or
else we'll get dups!

Fixes: http://tracker.ceph.com/issues/20435
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc
index df92265d30797..658b7001d6e2c 100644
--- a/src/mon/MgrStatMonitor.cc
+++ b/src/mon/MgrStatMonitor.cc
@@ -131,6 +131,10 @@ void MgrStatMonitor::get_health(list<pair<health_status_t,string> >& summary,
 				list<pair<health_status_t,string> > *detail,
 				CephContext *cct) const
 {
+  if (mon->osdmon()->osdmap.require_osd_release < CEPH_RELEASE_LUMINOUS) {
+    return;
+  }
+
   summary.insert(summary.end(), health_summary.begin(), health_summary.end());
   if (detail) {
     detail->insert(detail->end(), health_detail.begin(), health_detail.end());