import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / mon / Monitor.cc

diff --git a/ceph/src/mon/Monitor.cc b/ceph/src/mon/Monitor.cc
index 1c46c38774d87b496301ccff602e42d065b1b292..cd634d349b1ae715da7df809823cc99c50ec0603 100644 (file)
--- a/ceph/src/mon/Monitor.cc
+++ b/ceph/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, ' '));
@@ -3088,7 +3088,6 @@ bool Monitor::_allowed_command(MonSession *s, const string &module,
 
   bool capable = s->caps.is_capable(
     g_ceph_context,
-    CEPH_ENTITY_TYPE_MON,
     s->entity_name,
     module, prefix, param_str_map,
     cmd_r, cmd_w, cmd_x,
@@ -4343,7 +4342,6 @@ void Monitor::_ms_dispatch(Message *m)
         // exist only while the op is being handled.
         remove_session(s);
       }
-      s->put();
       s = nullptr;
     }
   }