From: Sage Weil <sage@newdream.net>
Date: Fri, 30 Jan 2009 19:13:23 +0000 (-0800)
Subject: mon: only propose new osdmap once at end of mdsmonitor tick()
X-Git-Tag: v0.7~258
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d463db6f45364fdb3bfb512e3d9b9cb08690fdfd;p=ceph.git

mon: only propose new osdmap once at end of mdsmonitor tick()
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 0a0ab8610280..c640273dd814 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -538,6 +538,9 @@ void MDSMonitor::tick()
       last_beacon[p->second.addr] = g_clock.now();
 
   if (mon->osdmon()->paxos->is_writeable()) {
+
+    bool propose_osdmap = false;
+
     map<entity_addr_t, utime_t>::iterator p = last_beacon.begin();
     while (p != last_beacon.end()) {
       entity_addr_t addr = p->first;
@@ -593,7 +596,7 @@ void MDSMonitor::tick()
 	  utime_t until = now;
 	  until += g_conf.mds_blacklist_interval;
 	  mon->osdmon()->blacklist(addr, until);
-	  mon->osdmon()->propose_pending();
+	  propose_osdmap = true;
 	}
 	
 	do_propose = true;
@@ -614,6 +617,10 @@ void MDSMonitor::tick()
       
       last_beacon.erase(addr);
     }
+
+    if (propose_osdmap)
+      mon->osdmon()->propose_pending();
+
   }