From: Sage Weil <sage@newdream.net>
Date: Thu, 22 Apr 2010 20:41:17 +0000 (-0700)
Subject: mds: verify mdsmap compatset on startup
X-Git-Tag: v0.20~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=feca69da560e65bddca182142268826a38d30851;p=ceph.git

mds: verify mdsmap compatset on startup
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 38b560d84b00..54979c614d5a 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -691,6 +691,17 @@ void MDS::handle_mds_map(MMDSMap *m)
 
   monc->sub_got("mdsmap", mdsmap->get_epoch());
 
+  // verify compatset
+  dout(10) << "     my compat " << mdsmap_compat << dendl;
+  dout(10) << " mdsmap compat " << mdsmap->compat << dendl;
+  if (!mdsmap_compat.writeable(mdsmap->compat)) {
+    dout(0) << "handle_mds_map mdsmap compatset " << mdsmap->compat
+	    << " not writeable with daemon features " << mdsmap_compat
+	    << ", killing myself" << dendl;
+    suicide();
+    goto out;
+  }
+
   // see who i am
   addr = messenger->get_myaddr();
   whoami = mdsmap->get_rank_gid(monc->get_global_id());