mon: replace mds even if state < 0

That conditional test was from before we redid the mds states

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 17e662530c785bebe37a7eb1316ac4150ae69355..babe80e9f592eccc21132c5d65e901f86e774375 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -591,7 +591,6 @@ void MDSMonitor::tick()
       // and is there a non-laggy standby that can take over for us?
       entity_addr_t sa;
       if (info.rank >= 0 &&
-         info.state > 0 && //|| info.state == MDSMap::STATE_STANDBY_REPLAY) &&
          pending_mdsmap.find_standby_for(info.rank, info.name, sa)) {
        MDSMap::mds_info_t& si = pending_mdsmap.mds_info[sa];
        dout(10) << " replacing " << addr << " mds" << info.rank << "." << info.inc

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index df480da5ace7ac2e5f8d018b187930b799057209..456f59cae1aa62d3cd76d50dcc21ff5bc4ee89cb 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -51,7 +51,7 @@
 #define dout_prefix _prefix(this)
 static ostream& _prefix(Monitor *mon) {
   return *_dout << dbeginl
-               << " mon" << mon->whoami
+               << "mon" << mon->whoami
                << (mon->is_starting() ?
                    (const char*)"(starting)" : 
                    (mon->is_leader() ?