From: Sage Weil <sage@inktank.com>
Date: Wed, 29 May 2013 23:36:34 +0000 (-0700)
Subject: mon: include cluster fsid/uuid in status output
X-Git-Tag: v0.65~136^2^2~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc73581a07d59518144c8c7888b660614d2ac704;p=ceph.git

mon: include cluster fsid/uuid in status output

Implements: #5147
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index fdf2ab3dc4f0..fc423bd696a3 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2444,6 +2444,7 @@ void Monitor::get_status(stringstream &ss, Formatter *f)
   get_health(health, NULL, f);
 
   if (f) {
+    f->dump_stream("fsid") << monmap->get_fsid();
     f->dump_stream("monmap") << *monmap;
     f->dump_stream("election_epoch") << get_epoch();
     f->dump_stream("quorum") << get_quorum();
@@ -2453,6 +2454,7 @@ void Monitor::get_status(stringstream &ss, Formatter *f)
     f->dump_stream("mdsmap") << mdsmon()->mdsmap;
     f->close_section();
   } else {
+    ss << "  cluster " << monmap->get_fsid() << "\n";
     ss << "   health " << health << "\n";
     ss << "   monmap " << *monmap << ", election epoch " << get_epoch()
       << ", quorum " << get_quorum() << " " << get_quorum_names() << "\n";