From: Sage Weil <sage@redhat.com>
Date: Tue, 28 Feb 2017 06:03:00 +0000 (-0600)
Subject: mon/OSDMonitor: issue health warning if there are multirule rulesets
X-Git-Tag: v12.1.0~27^2~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=50d5044237c5b41bb85000dd0a8e59edc9550d3a;p=ceph-ci.git

mon/OSDMonitor: issue health warning if there are multirule rulesets

The user will need to manually fix the CRUSH map if this happens.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index efb55f96ae0..b1e57d19cec 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3673,6 +3673,16 @@ void OSDMonitor::get_health(list<pair<health_status_t,string> >& summary,
       }
     }
 
+    if (osdmap.crush->has_multirule_rulesets()) {
+      ostringstream ss;
+      ss << "CRUSH map contains multirule rulesets";
+      summary.push_back(make_pair(HEALTH_WARN, ss.str()));
+      if (detail) {
+	ss << "; please manually fix the map";
+	detail->push_back(make_pair(HEALTH_WARN, ss.str()));
+      }
+    }
+
     // Not using 'sortbitwise' and should be?
     if (!osdmap.test_flag(CEPH_OSDMAP_SORTBITWISE) &&
         (osdmap.get_up_osd_features() &