From f41cbb72f39359d7efc9feb0825cbad61e51c07c Mon Sep 17 00:00:00 2001 From: John Spray Date: Fri, 20 Oct 2017 13:54:29 +0100 Subject: [PATCH] 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 --- src/mon/MgrMonitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index e7136889994..60bf621eb7d 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("mon_mgr_inactive_grace")) { level = HEALTH_ERR; } } -- 2.47.3