From 10ea8e1d7d11aa548f7561ec5b9e4c52a02203d4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 10 Apr 2017 18:31:22 -0400 Subject: [PATCH] mon/OSDMonitor: ignore health checks about require_luminous if debug flag is set This makes it tedious for teuthology health checks to proceed when we deliberately run luminous osds without this flag. Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index a4eab94fca1..9731e73e692 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3676,7 +3676,9 @@ void OSDMonitor::get_health(list >& summary, } // warn about upgrade flags that can be set but are not. - if (HAVE_FEATURE(osdmap.get_up_osd_features(), SERVER_LUMINOUS) && + if (g_conf->mon_debug_no_require_luminous) { + // ignore these checks + } else if (HAVE_FEATURE(osdmap.get_up_osd_features(), SERVER_LUMINOUS) && !osdmap.test_flag(CEPH_OSDMAP_REQUIRE_LUMINOUS)) { string msg = "all OSDs are running luminous or later but the" " 'require_luminous_osds' osdmap flag is not set"; -- 2.39.5