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 efb55f96ae0537d79351d8335ed6bf6e267c13d4..b1e57d19cec6a96d2405670c9c4e5599bc55a3bf 100644 (file)
--- 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() &