From: Sage Weil <sage@redhat.com>
Date: Tue, 16 May 2017 22:40:08 +0000 (-0400)
Subject: mon/MgrMap: prefix summary with epoch; add comma
X-Git-Tag: ses5-milestone6~8^2~19^2~130
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bbcdb84e6259b352f9c749fe216f4b7f948e7f6;p=ceph.git

mon/MgrMap: prefix summary with epoch; add comma

This matches the others now:

    cluster 0d553373-5de6-4d90-bc60-cfd6f6554631
     health HEALTH_OK
     monmap e2: 1 mons, quorum a
      fsmap e2: 0/0/1 up
        mgr e3: active: x(starting), standbys: y
     osdmap e5: 1 osds: 0 up, 0 in
      pgmap v6: 24 pgs, 3 pools, 0 bytes data, 0 objects
            0 kB used, 0 kB / 0 kB avail
            100.000% pgs inactive
                  24 creating


Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MgrMap.h b/src/mon/MgrMap.h
index 9d30c953c72..b092efd71fe 100644
--- a/src/mon/MgrMap.h
+++ b/src/mon/MgrMap.h
@@ -125,6 +125,7 @@ public:
     if (f) {
       dump(f);
     } else {
+      *ss << "e" << get_epoch() << ": ";
       if (get_active_gid() != 0) {
 	*ss << get_active_name();
         if (!available) {
@@ -133,12 +134,11 @@ public:
         } else {
           *ss << "(active)";
         }
-        *ss << " ";
       } else {
-	*ss << "no daemons active ";
+	*ss << "no daemons active";
       }
       if (standbys.size()) {
-	*ss << "standbys: ";
+	*ss << ", standbys: ";
 	bool first = true;
 	for (const auto &i : standbys) {
 	  if (!first) {