From eee6e4cb42233b00c3b905c755b22e1b578ce8b4 Mon Sep 17 00:00:00 2001 From: sage Date: Fri, 18 Aug 2006 18:38:26 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@803 29311d96-e01e-0410-9327-a35deaab8ce9 --- ceph/mon/Monitor.cc | 52 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/ceph/mon/Monitor.cc b/ceph/mon/Monitor.cc index e70907ac8526b..e81f2aadc433b 100644 --- a/ceph/mon/Monitor.cc +++ b/ceph/mon/Monitor.cc @@ -422,33 +422,33 @@ void Monitor::bcast_latest_osd_map_osd() void Monitor::tick() { lock.Lock(); - - dout(10) << "tick" << endl; - - // mark down osds out? - utime_t now = g_clock.now(); - list mark_out; - for (map::iterator i = pending_out.begin(); - i != pending_out.end(); - i++) { - utime_t down = now; - down -= i->second; - - if (down.sec() >= g_conf.mon_osd_down_out_interval) { - dout(10) << "tick marking osd" << i->first << " OUT after " << down << " sec" << endl; - mark_out.push_back(i->first); + { + dout(10) << "tick" << endl; + + // mark down osds out? + utime_t now = g_clock.now(); + list mark_out; + for (map::iterator i = pending_out.begin(); + i != pending_out.end(); + i++) { + utime_t down = now; + down -= i->second; + + if (down.sec() >= g_conf.mon_osd_down_out_interval) { + dout(10) << "tick marking osd" << i->first << " OUT after " << down << " sec" << endl; + mark_out.push_back(i->first); + } } + for (list::iterator i = mark_out.begin(); + i != mark_out.end(); + i++) { + pending_out.erase(*i); + pending.new_out.push_back( *i ); + accept_pending(); + } + + // next! + g_timer.add_event_after(g_conf.mon_tick_interval, new C_Mon_Tick(this)); } - for (list::iterator i = mark_out.begin(); - i != mark_out.end(); - i++) { - pending_out.erase(*i); - pending.new_out.push_back( *i ); - accept_pending(); - } - - // next! - g_timer.add_event_after(g_conf.mon_tick_interval, new C_Mon_Tick(this)); - lock.Unlock(); } -- 2.39.5