mon: drop unnecessary state checks

We want to ignore all beacons from the mds regardless of what state they
are in.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 4c591da81df91fe16d6e10d4f0006a78caac5dd5..f301c86f9942413821c5bc4e631f97a18872b15b 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -206,9 +206,7 @@ bool MDSMonitor::preprocess_beacon(MMDSBeacon *m)
     goto out;
   }
 
-  if (mdsmap.get_epoch() != m->get_last_epoch_seen()
-      && !((info.state == MDSMap::STATE_STANDBY) ||
-          (info.state == MDSMap::STATE_STANDBY_REPLAY))){
+  if (mdsmap.get_epoch() != m->get_last_epoch_seen()) {
     dout(10) << "mds_beacon " << *m
             << " ignoring requested state, because mds hasn't seen latest map" << dendl;
     goto ignore;