From: Sage Weil <sage@newdream.net>
Date: Mon, 20 Apr 2009 22:18:19 +0000 (-0700)
Subject: mon: replace mds even if state < 0
X-Git-Tag: v0.7.3~92
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04dc76399139d3f02f2c41fbb87e3d07de925de2;p=ceph.git

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 17e662530c7..babe80e9f59 100644
--- 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 df480da5ace..456f59cae1a 100644
--- 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() ?