]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: fix MDS health status from peons 2989/head 2996/head
authorJohn Spray <john.spray@redhat.com>
Mon, 24 Nov 2014 11:00:25 +0000 (11:00 +0000)
committerJohn Spray <john.spray@redhat.com>
Mon, 24 Nov 2014 17:18:34 +0000 (17:18 +0000)
The health data was there, but we were attempting
to enumerate MDS GIDs from pending_mdsmap (empty on
peons) instead of mdsmap (populated from paxos updates)

Fixes: #10151
Backport: giant

Signed-off-by: John Spray <john.spray@redhat.com>
src/mon/MDSMonitor.cc

index 9e91a8904e709f1bf122dab38fe2787f177d2a7f..babf5f6ed2d926288b066ada8ef0e422e05147ab 100644 (file)
@@ -577,8 +577,8 @@ void MDSMonitor::get_health(list<pair<health_status_t, string> >& summary,
   mdsmap.get_health(summary, detail);
 
   // For each MDS GID...
-  for (std::map<mds_gid_t, MDSMap::mds_info_t>::const_iterator i = pending_mdsmap.mds_info.begin();
-      i != pending_mdsmap.mds_info.end(); ++i) {
+  for (std::map<mds_gid_t, MDSMap::mds_info_t>::const_iterator i = mdsmap.mds_info.begin();
+      i != mdsmap.mds_info.end(); ++i) {
     // Decode MDSHealth
     bufferlist bl;
     mon->store->get(MDS_HEALTH_PREFIX, stringify(i->first), bl);