]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: fix up mgr_inactive_grace for backport
authorJohn Spray <john.spray@redhat.com>
Fri, 20 Oct 2017 12:54:29 +0000 (13:54 +0100)
committerJohn Spray <john.spray@redhat.com>
Wed, 1 Nov 2017 23:03:29 +0000 (23:03 +0000)
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>
src/mon/MgrMonitor.cc

index e713688999477518df74ce838df8dffd4b30dd75..60bf621eb7d24eb23ecb3b74ae52b7ce84217259 100644 (file)
@@ -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;
       }
     }