From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 25 May 2016 10:33:49 +0000 (+0800)
Subject: MDSMonitor.cc: fix mdsmap.<namespace> subscriptions
X-Git-Tag: v10.2.3~28^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7987f060479f81d6181f8949e8ed2c8b3029dfd;p=ceph.git

MDSMonitor.cc: fix mdsmap.<namespace> subscriptions

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 8f09dd15cb07597c57d0a6ae981f15a47de11bb9)
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 9d72a0f9ad6..44172324e2a 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -2414,22 +2414,22 @@ void MDSMonitor::check_subs()
 {
   std::list<std::string> types;
 
-  // Subscriptions may be to "fsmap" (MDS and legacy clients),
-  // "fsmap.<namespace>", or to "fsmap" for the full state of all
+  // Subscriptions may be to "mdsmap" (MDS and legacy clients),
+  // "mdsmap.<namespace>", or to "fsmap" for the full state of all
   // filesystems.  Build a list of all the types we service
   // subscriptions for.
-  types.push_back("mdsmap");
   types.push_back("fsmap");
+  types.push_back("mdsmap");
   for (const auto &i : fsmap.filesystems) {
     auto fscid = i.first;
     std::ostringstream oss;
-    oss << "fsmap." << fscid;
+    oss << "mdsmap." << fscid;
     types.push_back(oss.str());
   }
 
   for (const auto &type : types) {
     if (mon->session_map.subs.count(type) == 0)
-      return;
+      continue;
     xlist<Subscription*>::iterator p = mon->session_map.subs[type]->begin();
     while (!p.end()) {
       Subscription *sub = *p;