From: Sage Weil <sage@redhat.com>
Date: Mon, 10 Apr 2017 22:31:22 +0000 (-0400)
Subject: mon/OSDMonitor: ignore health checks about require_luminous if debug flag is set
X-Git-Tag: v12.0.2~63^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10ea8e1d7d11aa548f7561ec5b9e4c52a02203d4;p=ceph.git

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 <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index a4eab94fca12..9731e73e692b 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3676,7 +3676,9 @@ void OSDMonitor::get_health(list<pair<health_status_t,string> >& 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";