From ae0d6eb1c01aa74a2c44c017c0c5b06697348d2d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 30 Sep 2016 18:07:53 -0400 Subject: [PATCH] mon/OSDMonitor: health warn if require_{jewel,kraken} flags aren't set We want to prompt users to set these flags as soon as their upgrades complete. Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 4fba1f5679c58..a661b291f2ee9 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3094,6 +3094,26 @@ void OSDMonitor::get_health(list >& summary, } } + // warn about upgrade flags that can be set but are not. + if ((osdmap.get_up_osd_features() & CEPH_FEATURE_SERVER_JEWEL) && + !osdmap.test_flag(CEPH_OSDMAP_REQUIRE_JEWEL)) { + string msg = "all OSDs are running jewel or later but the" + " 'require_jewel_osds' osdmap flag is not set"; + summary.push_back(make_pair(HEALTH_WARN, msg)); + if (detail) { + detail->push_back(make_pair(HEALTH_WARN, msg)); + } + } + if ((osdmap.get_up_osd_features() & CEPH_FEATURE_SERVER_KRAKEN) && + !osdmap.test_flag(CEPH_OSDMAP_REQUIRE_KRAKEN)) { + string msg = "all OSDs are running kraken or later but the" + " 'require_kraken_osds' osdmap flag is not set"; + summary.push_back(make_pair(HEALTH_WARN, msg)); + if (detail) { + detail->push_back(make_pair(HEALTH_WARN, msg)); + } + } + get_pools_health(summary, detail); } } -- 2.39.5