From a94207168e50ff9b4ed6cec62636b18187581253 Mon Sep 17 00:00:00 2001 From: Colin Patrick McCabe Date: Wed, 5 Jan 2011 18:29:09 -0800 Subject: [PATCH] osd: Rename osd_mon_report_interval Rename osd_mon_report_interval to osd_mon_report_interval_min. Signed-off-by: Colin McCabe --- src/config.cc | 2 +- src/config.h | 2 +- src/osd/OSD.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.cc b/src/config.cc index 11e11c42c9292..1f64f50797229 100644 --- a/src/config.cc +++ b/src/config.cc @@ -562,7 +562,7 @@ static struct config_option config_optionsp[] = { OPTION(osd_heartbeat_interval, 0, OPT_INT, 1), OPTION(osd_mon_heartbeat_interval, 0, OPT_INT, 30), // if no peers, ping monitor OPTION(osd_heartbeat_grace, 0, OPT_INT, 20), - OPTION(osd_mon_report_interval, 0, OPT_INT, 5), // pg stats, failures, up_thru, boot. + OPTION(osd_mon_report_interval_min, 0, OPT_INT, 5), // pg stats, failures, up_thru, boot. OPTION(osd_min_down_reporters, 0, OPT_INT, 1), // number of OSDs who need to report a down OSD for it to count OPTION(osd_min_down_reports, 0, OPT_INT, 3), // number of times a down OSD must be reported for it to count OPTION(osd_replay_window, 0, OPT_INT, 45), diff --git a/src/config.h b/src/config.h index 12269de2e3258..4b642c0046ffc 100644 --- a/src/config.h +++ b/src/config.h @@ -394,7 +394,7 @@ struct md_config_t { int osd_heartbeat_interval; int osd_mon_heartbeat_interval; int osd_heartbeat_grace; - int osd_mon_report_interval; + int osd_mon_report_interval_min; int osd_min_down_reporters; int osd_min_down_reports; int osd_replay_window; diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 578bbd78ac6f8..4e8f6d8348484 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1570,7 +1570,7 @@ void OSD::tick() // mon report? utime_t now = g_clock.now(); - if (now - last_mon_report > g_conf.osd_mon_report_interval) + if (now - last_mon_report > g_conf.osd_mon_report_interval_min) do_mon_report(); // remove stray pgs? -- 2.39.5