From: Sage Weil <sage@redhat.com>
Date: Mon, 28 Jan 2019 21:30:42 +0000 (-0600)
Subject: mon/HealthMonitor: add mon_warn_on_msgr2_not_enabled
X-Git-Tag: v14.1.0~129^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=85ef902ca555269778b402b6e4520e2d8a0af837;p=ceph-ci.git

mon/HealthMonitor: add mon_warn_on_msgr2_not_enabled

Default true, but allow users (or tests) to turn this warning off.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 6737ff0dac8..a9f2c6e25ef 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1587,6 +1587,12 @@ std::vector<Option> get_global_options() {
     .add_service("mon")
     .set_description("allow use of MDS daemons in standby-replay as replacements"),
 
+    Option("mon_warn_on_msgr2_not_enabled", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+    .set_default(true)
+    .add_service("mon")
+    .set_description("issue MON_MSGR2_NOT_ENABLED health warning if monitors are all running Nautilus but not all binding to a msgr2 port")
+    .add_see_also("ms_bind_msgr2"),
+
     Option("mon_warn_on_legacy_crush_tunables", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)
     .add_service("mgr")
diff --git a/src/mon/HealthMonitor.cc b/src/mon/HealthMonitor.cc
index 84594251474..692bfdf4e7a 100644
--- a/src/mon/HealthMonitor.cc
+++ b/src/mon/HealthMonitor.cc
@@ -368,6 +368,7 @@ bool HealthMonitor::check_leader_health()
 
   // MON_MSGR2_NOT_ENABLED
   if (g_conf().get_val<bool>("ms_bind_msgr2") &&
+      g_conf().get_val<bool>("mon_warn_on_msgr2_not_enabled") &&
       mon->monmap->get_required_features().contains_all(
 	ceph::features::mon::FEATURE_NAUTILUS)) {
     list<string> details;