From: John Spray <john.spray@redhat.com>
Date: Thu, 22 Jun 2017 15:18:32 +0000 (-0400)
Subject: mon: don't consider a starting mgr to be an error
X-Git-Tag: v12.1.1~58^2~17
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0c8a1d3940096f667faf716ae9245921e1011842;p=ceph-ci.git

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 <john.spray@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index ccb1cda4943..d200f2b55f7 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) {