From f11de858a94228250d9782f18d9957b417983975 Mon Sep 17 00:00:00 2001 From: John Spray Date: Fri, 15 May 2015 15:53:13 +0100 Subject: [PATCH] mds: fix handle_mds_map in standby_replay Broken by "mds: validate the state+rank in MDS map" Signed-off-by: John Spray --- src/mds/MDS.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc index 52ccf1f54ab2d..3a93c837a8f08 100644 --- a/src/mds/MDS.cc +++ b/src/mds/MDS.cc @@ -1566,14 +1566,14 @@ void MDS::handle_mds_map(MMDSMap *m) // see who i am addr = messenger->get_myaddr(); + state = mdsmap->get_state_gid(mds_gid_t(monc->get_global_id())); + incarnation = mdsmap->get_inc_gid(mds_gid_t(monc->get_global_id())); whoami = mdsmap->get_rank_gid(mds_gid_t(monc->get_global_id())); if (whoami == MDS_RANK_NONE && ( state == MDSMap::STATE_STANDBY_REPLAY || state == MDSMap::STATE_ONESHOT_REPLAY)) { whoami = mdsmap->get_mds_info_gid(mds_gid_t(monc->get_global_id())).standby_for_rank; } - state = mdsmap->get_state_gid(mds_gid_t(monc->get_global_id())); - incarnation = mdsmap->get_inc_gid(mds_gid_t(monc->get_global_id())); dout(10) << "map says i am " << addr << " mds." << whoami << "." << incarnation << " state " << ceph_mds_state_name(state) << dendl; -- 2.47.3