Import ceph 15.2.8

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

diff --git a/ceph/src/mon/MDSMonitor.cc b/ceph/src/mon/MDSMonitor.cc
index e60c06d46a49b55975dc1a86196d31783d96c120..7d066737a5d68011ad5d566b933f10f8f465a9aa 100644 (file)
--- a/ceph/src/mon/MDSMonitor.cc
+++ b/ceph/src/mon/MDSMonitor.cc
@@ -224,7 +224,7 @@ void MDSMonitor::encode_pending(MonitorDBStore::TransactionRef t)
        mds_metric_summary(metric.type),
        1);
       ostringstream ss;
-      ss << "mds" << info.name << "(mds." << rank << "): " << metric.message;
+      ss << "mds." << info.name << "(mds." << rank << "): " << metric.message;
       bool first = true;
       for (auto &p : metric.metadata) {
        if (first) {
@@ -393,6 +393,10 @@ bool MDSMonitor::preprocess_beacon(MonOpRequestRef op)
   dout(10) << __func__ << ": GID exists in map: " << gid << dendl;
   info = fsmap.get_info_gid(gid);
 
+  if (state == MDSMap::STATE_DNE) {
+    return false;
+  }
+
   // old seq?
   if (info.state_seq > seq) {
     dout(7) << "mds_beacon " << *m << " has old seq, ignoring" << dendl;