MDSMonitor: fix mds health printed in bad format

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

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 5c51d2f84d554a46d8389ead0a0659e5e96058ef..89764d9121d3c32fd903eb0b78df27b96cdfd71a 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -221,13 +221,15 @@ void MDSMonitor::encode_pending(MonitorDBStore::TransactionRef t)
        mds_metric_summary(metric.type));
       ostringstream ss;
       ss << "mds" << info.name << "(mds." << rank << "): " << metric.message;
-      for (auto p = metric.metadata.begin();
-          p != metric.metadata.end();
-          ++p) {
-       if (p != metric.metadata.begin()) {
+      bool first = true;
+      for (auto &p : metric.metadata) {
+       if (first) {
+         ss << " ";
+       } else {
          ss << ", ";
-       }
-       ss << p->first << ": " << p->second;
+        }
+       ss << p.first << ": " << p.second;
+        first = false;
       }
       check->detail.push_back(ss.str());
     }