From 0c8a1d3940096f667faf716ae9245921e1011842 Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 22 Jun 2017 11:18:32 -0400 Subject: [PATCH] mon: don't consider a starting mgr to be an error The .available flag is there to tell MgrClients whether to try and connect -- it isn't the right condition for a health complaint. Signed-off-by: John Spray --- src/mon/MgrMonitor.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index ccb1cda4943e9..d200f2b55f7ba 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -113,7 +113,7 @@ void MgrMonitor::encode_pending(MonitorDBStore::TransactionRef t) put_last_committed(t, pending_map.epoch); health_check_map_t next; - if (!pending_map.available) { + if (pending_map.active_gid == 0) { auto level = should_warn_about_mgr_down(); if (level != HEALTH_OK) { next.add("MGR_DOWN", level, "no active mgr"); @@ -401,7 +401,7 @@ void MgrMonitor::get_health( return; } - if (!map.available) { + if (map.active_gid == 0) { auto level = HEALTH_WARN; // do not escalate to ERR if they are still upgrading to jewel. if (mon->osdmon()->osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS) { -- 2.39.5