From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Sun, 9 Oct 2016 02:34:18 +0000 (+0800)
Subject: mon/MgrMonitor: unify updating map code path
X-Git-Tag: v11.1.0~588^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8d746baf340b05cffc2586d399ac4d6a37f32b45;p=ceph.git

mon/MgrMonitor: unify updating map code path

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 109354731b4df..1effc775e4648 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -190,7 +190,7 @@ bool MgrMonitor::prepare_beacon(MonOpRequestRef op)
     pending_map.active_name = m->get_name();
 
     dout(4) << "selecting new active in epoch " << pending_map.epoch << dendl;
-    wait_for_finished_proposal(op, new C_Updated(this, op));
+    updated = true;
   } else {
     if (pending_map.standbys.count(m->get_gid()) > 0) {
       dout(10) << "from existing standby " << m->get_gid() << dendl;