From d463db6f45364fdb3bfb512e3d9b9cb08690fdfd Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 30 Jan 2009 11:13:23 -0800 Subject: [PATCH] mon: only propose new osdmap once at end of mdsmonitor tick() --- src/mon/MDSMonitor.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 0a0ab86102804..c640273dd814e 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::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(); + } -- 2.39.5