From: Sage Weil <sage@newdream.net>
Date: Mon, 21 Sep 2009 22:11:07 +0000 (-0700)
Subject: mds: fix mds standby map handling
X-Git-Tag: v0.15~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f22324d860c3fbeaebeb9012c7b940804eb86b7;p=ceph.git

mds: fix mds standby map handling

Borken by c6ddbdb4671b3594f9b4d5f54b65f8525935758b
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 8149a7a980ad..139fa59d5b3e 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -607,17 +607,6 @@ void MDS::handle_mds_map(MMDSMap *m)
   state = mdsmap->get_state(addr);
   dout(10) << "map says i am " << addr << " mds" << whoami << " state " << ceph_mds_state_name(state) << dendl;
 
-  if (whoami < 0) {
-    if (want_state == MDSMap::STATE_BOOT) {
-      dout(10) << "not in map yet" << dendl;
-    } else {
-      dout(1) << "handle_mds_map i (" << addr
-	      << ") dne in the mdsmap, killing myself" << dendl;
-      suicide();
-    }
-    goto out;
-  }
-
   if (state != oldstate)
     last_state = oldstate;
 
@@ -631,6 +620,17 @@ void MDS::handle_mds_map(MMDSMap *m)
     goto out;
   }
 
+  if (whoami < 0) {
+    if (want_state == MDSMap::STATE_BOOT) {
+      dout(10) << "not in map yet" << dendl;
+    } else {
+      dout(1) << "handle_mds_map i (" << addr
+	      << ") dne in the mdsmap, killing myself" << dendl;
+      suicide();
+    }
+    goto out;
+  }
+
   // ??
   assert(whoami >= 0);
   incarnation = mdsmap->get_inc(whoami);