]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MgrMonitor: unify updating map code path
authorxie xingguo <xie.xingguo@zte.com.cn>
Sun, 9 Oct 2016 02:34:18 +0000 (10:34 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Mon, 17 Oct 2016 13:00:08 +0000 (21:00 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/mon/MgrMonitor.cc

index 109354731b4dfcc26b5728a71edc64666209bafb..1effc775e464867e010f38c133ac533e89d466fc 100644 (file)
@@ -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;