osd: Warn and shutdown on a mismatched fsid, instead of failing an assert

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 881db35f476936fc52bcb536d308ea5286992454..10ad4b4c128cfac305fb9e35f1bb010895fb2eda 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2172,7 +2172,13 @@ void OSD::handle_osd_map(MOSDMap *m)
 
       bufferlist::iterator p = bl.begin();
       inc.decode(p);
-      osdmap->apply_incremental(inc);
+      if (osdmap->apply_incremental(inc)) {
+       //error out!
+       dout(0) << "ERROR: Got non-matching FSID from trusted source!" << dendl;
+       session->put();
+       m->put();
+       shutdown();
+      }
 
       // archive the full map
       bl.clear();

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index 1ca3f6883b962183832d68e0ad164c6c62945332..e780925cedbf83821bec5e7ab210b1b5c8627cfc 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -475,11 +475,13 @@ private:
   }
 
 
-  void apply_incremental(Incremental &inc) {
+  int apply_incremental(Incremental &inc) {
     if (inc.epoch == 1)
       fsid = inc.fsid;
     else
-      assert(ceph_fsid_compare(&inc.fsid, &fsid) == 0);
+      if (ceph_fsid_compare(&inc.fsid, &fsid) == 0) {
+       return -EINVAL;
+      }
     assert(inc.epoch == epoch+1);
     epoch++;
     modified = inc.modified;
@@ -487,7 +489,7 @@ private:
     // full map?
     if (inc.fullmap.length()) {
       decode(inc.fullmap);
-      return;
+      return 0;
     }
 
     // nope, incremental.
@@ -586,6 +588,7 @@ private:
       bufferlist::iterator blp = inc.crush.begin();
       crush.decode(blp);
     }
+    return 0;
   }
 
   // serialize, unserialize