From: Sage Weil <sage@redhat.com>
Date: Thu, 10 Aug 2017 13:41:05 +0000 (-0400)
Subject: mon/Monitor: use legacy health checks in 'status' output before upgrade completion
X-Git-Tag: v12.2.0~37^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17176%2Fhead;p=ceph.git

mon/Monitor: use legacy health checks in 'status' output before upgrade completion

This matches what the 'health' command does.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ced39aeeef441fc588c5f2570710ab107b55828c)
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 34cecc03febbe..2de26718268a7 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2707,7 +2707,12 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f)
 
   if (f) {
     f->dump_stream("fsid") << monmap->get_fsid();
-    get_health_status(false, f, nullptr);
+    if (osdmon()->osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS) {
+      get_health_status(false, f, nullptr);
+    } else {
+      list<string> health_str;
+      get_health(health_str, nullptr, f);
+    }
     f->dump_unsigned("election_epoch", get_epoch());
     {
       f->open_array_section("quorum");