From 7ae8ed2d048289cf3a06b48990e1a7c400b5e4da Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 23 Apr 2009 10:20:11 -0700 Subject: [PATCH] osd: set osd down -> out interval to 5 minutes This is the delay from when an osd is marked down before we decide it won't recover soon as we migrate/replicate data elsewhere. --- src/config.cc | 2 +- src/mon/OSDMonitor.cc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/config.cc b/src/config.cc index da10d2ba2085b..ec5831cf68058 100644 --- a/src/config.cc +++ b/src/config.cc @@ -372,7 +372,7 @@ static struct config_option config_optionsp[] = { OPTION(ms_nocrc, 0, OPT_BOOL, false), OPTION(mon_data, 0, OPT_STR, ""), OPTION(mon_tick_interval, 0, OPT_INT, 5), - OPTION(mon_osd_down_out_interval, 0, OPT_INT, 5), // seconds + OPTION(mon_osd_down_out_interval, 0, OPT_INT, 300), // seconds OPTION(mon_lease, 0, OPT_FLOAT, 5), // lease interval OPTION(mon_lease_renew_interval, 0, OPT_FLOAT, 3), // on leader, to renew the lease OPTION(mon_lease_ack_timeout, 0, OPT_FLOAT, 10.0), // on leader, if lease isn't acked by all peons diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 8c7bf771ec95d..11f137a32d79d 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -576,6 +576,7 @@ bool OSDMonitor::preprocess_alive(MOSDAlive *m) bool OSDMonitor::prepare_alive(MOSDAlive *m) { int from = m->get_orig_source().num(); + stringstream ss; ss << "osd alive (" << m->get_orig_source_inst() << ")"; mon->get_logclient()->log(LOG_DEBUG, ss); @@ -804,7 +805,8 @@ void OSDMonitor::tick() down -= i->second; if (down.sec() >= g_conf.mon_osd_down_out_interval) { - dout(10) << "tick marking osd" << i->first << " OUT after " << down << " sec" << dendl; + dout(10) << "tick marking osd" << i->first << " OUT after " << down + << " sec (target " << g_conf.mon_osd_down_out_interval << ")" << dendl; mark_out.push_back(i->first); } } -- 2.39.5