mds: fix standby handling in map

I broke this by taking the state from
the old mdsmap instead of the new one.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
index e0c317e8cf7de507d2e3c500ad2eeec2322b7650..5093f594738f4bbc0d216efe0c2ed11ca7c45410 100644 (file)
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@ -815,15 +815,16 @@ void MDSDaemon::handle_mds_map(MMDSMap *m)
     return;
   }
 
+  entity_addr_t addr;
+
   // keep old map, for a moment
   MDSMap *oldmap = mdsmap;
-  const MDSMap::DaemonState new_state = mdsmap->get_state_gid(mds_gid_t(monc->get_global_id()));
-  const int incarnation = mdsmap->get_inc_gid(mds_gid_t(monc->get_global_id()));
-  entity_addr_t addr;
 
   // decode and process
   mdsmap = new MDSMap;
   mdsmap->decode(m->get_encoded());
+  const MDSMap::DaemonState new_state = mdsmap->get_state_gid(mds_gid_t(monc->get_global_id()));
+  const int incarnation = mdsmap->get_inc_gid(mds_gid_t(monc->get_global_id()));
 
   monc->sub_got("mdsmap", mdsmap->get_epoch());