From: John Spray <john.spray@redhat.com>
Date: Fri, 20 Oct 2017 12:54:29 +0000 (+0100)
Subject: mon: fix up mgr_inactive_grace for backport
X-Git-Tag: v12.2.2~61^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f41cbb72f39359d7efc9feb0825cbad61e51c07c;p=ceph.git

mon: fix up mgr_inactive_grace for backport

This was converted to options.cc only, but we cannot
backport another commit that removes this legacy health
reporting code, so this commit updates the legacy health
reporting code for the options.cc style config opt.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index e71368899947..60bf621eb7d2 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -517,7 +517,7 @@ void MgrMonitor::get_health(
     if (mon->osdmon()->osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS) {
       utime_t now = ceph_clock_now();
       if (first_seen_inactive != utime_t() &&
-	  now - first_seen_inactive > g_conf->mon_mgr_inactive_grace) {
+	  now - first_seen_inactive > g_conf->get_val<int64_t>("mon_mgr_inactive_grace")) {
 	level = HEALTH_ERR;
       }
     }