From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 6 Apr 2018 20:31:27 +0000 (-0700)
Subject: MDSMonitor: fix mds health printed in bad format
X-Git-Tag: v12.2.6~153^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3df37f8dfb7831a2b4097da34692ce748a4973ad;p=ceph.git

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 5c51d2f84d55..89764d9121d3 100644
--- 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());
     }