]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MgrMonitor: fix standby addition to mgrmap 16397/head
authorSage Weil <sage@redhat.com>
Tue, 18 Jul 2017 18:20:48 +0000 (14:20 -0400)
committerSage Weil <sage@redhat.com>
Tue, 18 Jul 2017 18:20:48 +0000 (14:20 -0400)
Inadvertantly removed by ba45fba01c96bcae5b55c50a6076bb1e879d58b9

Fixes: http://tracker.ceph.com/issues/20647
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/MgrMonitor.cc

index decbcae452bcdb78cb4ea4d0e290278afeeca3a1..b516083a06054442df43e91ca6aa3e94e42595e1 100644 (file)
@@ -298,6 +298,8 @@ bool MgrMonitor::prepare_beacon(MonOpRequestRef op)
       dout(10) << "new standby " << m->get_gid() << dendl;
       mon->clog->debug() << "Standby manager daemon " << m->get_name()
                          << " started";
+      pending_map.standbys[m->get_gid()] = {m->get_gid(), m->get_name(),
+                                           m->get_available_modules()};
       updated = true;
     }
   }