From: John Spray <john.spray@redhat.com>
Date: Thu, 20 Apr 2017 21:31:10 +0000 (-0400)
Subject: mon: tweak mgr status text
X-Git-Tag: v12.0.3~159^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cd69c0416a025ad198d6cdcd0376034653b871d3;p=ceph-ci.git

mon: tweak mgr status text

Previously at startup we saw contradictory status
that had a "no active mgr" health message and then
a line that said "active: x".

Mitigate that a bit by indicating that a !available
active daemon is starting up.

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

diff --git a/src/mon/MgrMap.h b/src/mon/MgrMap.h
index 1fd0500131c..e522ab4ba0f 100644
--- a/src/mon/MgrMap.h
+++ b/src/mon/MgrMap.h
@@ -126,7 +126,12 @@ public:
       dump(f);
     } else {
       if (get_active_gid() != 0) {
-	*ss << "active: " << get_active_name() << " ";
+	*ss << "active: " << get_active_name();
+        if (!available) {
+          // If the daemon hasn't gone active yet, indicate that.
+          *ss << "(starting)";
+        }
+        *ss << " ";
       } else {
 	*ss << "no daemons active ";
       }