From 37af714e84a91dbeba1080941e6995168623dd8b Mon Sep 17 00:00:00 2001 From: sageweil Date: Thu, 9 Aug 2007 05:05:37 +0000 Subject: [PATCH] cleanup git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1606 29311d96-e01e-0410-9327-a35deaab8ce9 --- branches/sage/mds/mon/MDSMonitor.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/branches/sage/mds/mon/MDSMonitor.cc b/branches/sage/mds/mon/MDSMonitor.cc index 66adfe6f0163f..abe37c40d4dda 100644 --- 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; } -- 2.39.5