From 50d5044237c5b41bb85000dd0a8e59edc9550d3a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 28 Feb 2017 00:03:00 -0600 Subject: [PATCH] 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 --- src/mon/OSDMonitor.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index efb55f96ae053..b1e57d19cec6a 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3673,6 +3673,16 @@ void OSDMonitor::get_health(list >& 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() & -- 2.39.5