cleanup

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1606 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/branches/sage/mds/mon/MDSMonitor.cc b/branches/sage/mds/mon/MDSMonitor.cc
index 66adfe6f0163fb98ecad87081a4d41cfbebb6eb5..abe37c40d4ddadbf4041eed5de42e6de721cbee7 100644 (file)
--- a/branches/sage/mds/mon/MDSMonitor.cc
+++ b/branches/sage/mds/mon/MDSMonitor.cc
@@ -195,13 +195,13 @@ bool MDSMonitor::preprocess_beacon(MMDSBeacon *m)
   }
   
   // is there a state change here?
-  if (mdsmap.mds_state.count(from) == 0 &&
-      state == MDSMap::STATE_BOOT) 
-    return false;   // need to add to update map
-
-  if (mdsmap.mds_state[from] != state) {
+  if (mdsmap.mds_state.count(from) == 0) { 
+    if (state == MDSMap::STATE_BOOT)
+      return false;  // need to add to map
+    dout(1) << "mds_beacon " << *m << " announcing non-boot state, ignoring" << endl;
+  } else if (mdsmap.mds_state[from] != state) {
     if (mdsmap.get_epoch() == m->get_last_epoch_seen()) 
-      return false;
+      return false;  // need to update map
     dout(10) << "mds_beacon " << *m << " ignoring requested state, because mds hasn't seen latest map" << endl;
   }