mon: print FSMap if standbys exist

Fixes: https://tracker.ceph.com/issues/42088
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit cd6f88d7ebe17edcf657d646d733c207930e4351)

diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
index 9f415fc24445bd87b79d2b2cdea3c1d7be35e453..1475e312d069928483c66d69a85260c8ba0eb9e4 100644 (file)
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@ -49,6 +49,13 @@ class MDSMonitor : public PaxosService, public PaxosFSMap, protected CommandHand
   bool prepare_update(MonOpRequestRef op) override;
   bool should_propose(double& delay) override;
 
+  bool should_print_status() const {
+    auto& fs = get_fsmap();
+    auto fs_count = fs.filesystem_count();
+    auto standby_count = fs.get_num_standby();
+    return fs_count > 0 || standby_count > 0;
+  }
+
   void on_active() override;
   void on_restart() override;
 

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 1549580b973a11abe19d5c9554ec857bd71e8696..03cca3c8c4c377cf6bd37517af1f2a668274f401 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3009,8 +3009,8 @@ void Monitor::get_cluster_status(stringstream &ss, Formatter *f)
        mgrmon()->get_map().print_summary(nullptr, &ss);
        ss << "\n";
       }
-      if (mdsmon()->get_fsmap().filesystem_count() > 0) {
-       ss << "    mds: " << spacing << mdsmon()->get_fsmap() << "\n";
+      if (mdsmon()->should_print_status()) {
+        ss << "    mds: " << spacing << mdsmon()->get_fsmap() << "\n";
       }
       ss << "    osd: " << spacing;
       osdmon()->osdmap.print_summary(NULL, ss, string(maxlen + 6, ' '));