From: Sage Weil <sage@redhat.com>
Date: Sat, 25 Feb 2017 03:28:25 +0000 (-0500)
Subject: mon/MgrMonitor: feed our MgrClient MgrMaps
X-Git-Tag: v12.0.2~252^2~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55088f7bbe06547bea377752f73bfa258b688afb;p=ceph.git

mon/MgrMonitor: feed our MgrClient MgrMaps

We don't have a MonClient so we don't subscribe to these in the
usual way.  This will do.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index d9cee80b463f..871478a7b3e6 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -33,23 +33,24 @@ void MgrMonitor::create_initial()
 void MgrMonitor::update_from_paxos(bool *need_bootstrap)
 {
   version_t version = get_last_committed();
-  if (version == map.epoch) {
-    return;
-  }
+  if (version != map.epoch) {
+    dout(4) << "loading version " << version << dendl;
 
-  dout(4) << "loading version " << version << dendl;
+    bufferlist bl;
+    int err = get_version(version, bl);
+    assert(err == 0);
 
-  bufferlist bl;
-  int err = get_version(version, bl);
-  assert(err == 0);
+    bufferlist::iterator p = bl.begin();
+    map.decode(p);
 
-  bufferlist::iterator p = bl.begin();
-  map.decode(p);
+    dout(4) << "active server: " << map.active_addr
+	    << "(" << map.active_gid << ")" << dendl;
 
-  dout(4) << "active server: " << map.active_addr
-          << "(" << map.active_gid << ")" << dendl;
+    check_subs();
+  }
 
-  check_subs();
+  // feed our pet MgrClient
+  mon->mgr_client.ms_dispatch(new MMgrMap(map));
 }
 
 void MgrMonitor::create_pending()