mon: hide mdsmap in 'ceph status' if not enabled

Previously we checked if the MDS map had ever been
updated (epoch > 1), now we have an explicit flag
for whether it's enabled.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 6e6ea17cfc47678e2769220429212828052a126b..7767542218a63f9fe22abdc3391128599f6bf0a0 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2104,7 +2104,7 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f)
     ss << "     health " << health << "\n";
     ss << "     monmap " << *monmap << ", election epoch " << get_epoch()
        << ", quorum " << get_quorum() << " " << get_quorum_names() << "\n";
-    if (mdsmon()->mdsmap.get_epoch() > 1)
+    if (mdsmon()->mdsmap.get_enabled())
       ss << "     mdsmap " << mdsmon()->mdsmap << "\n";
     osdmon()->osdmap.print_summary(NULL, ss);
     pgmon()->pg_map.print_summary(NULL, &ss);