From: David Zafman Date: Mon, 13 May 2013 19:53:11 +0000 (-0700) Subject: Replace mis-named mon config variables using mon_osd_min_down_reports/mon_osd_min_dow... X-Git-Tag: v0.63~34 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88af2b0f7b951367e670869db76e57f0d970aa38;p=ceph.git Replace mis-named mon config variables using mon_osd_min_down_reports/mon_osd_min_down_reporters Signed-off-by: David Zafman Reviewed-by: Sage Weil --- diff --git a/PendingReleaseNotes b/PendingReleaseNotes index 8b137891791f..021204898ad3 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -1 +1,6 @@ - +- The 'osd min down {reporters|reports}' config options have been + renamed to 'mon osd min down {reporters|reports}', and the + documentation has been updated to reflect that these options apply + to the monitors (who process failure reports) and not OSDs. If you + have adjusted these settings, please update your ``ceph.conf'' + accordingly. diff --git a/doc/rados/configuration/mon-osd-interaction.rst b/doc/rados/configuration/mon-osd-interaction.rst index bbedf3b14b31..fd54a671c99e 100644 --- a/doc/rados/configuration/mon-osd-interaction.rst +++ b/doc/rados/configuration/mon-osd-interaction.rst @@ -69,8 +69,8 @@ You can change the minimum number of ``osd down`` reports by adding an ``osd min down reports`` setting under the ``[osd]`` section of your Ceph configuration file, or by setting the value at runtime. By default, only one OSD is required to report another OSD down. You can change the number of OSDs required to report -a monitor down by adding an ``osd min down reporters`` setting under the -``[osd]`` section of your Ceph configuration file, or by setting the value at +a monitor down by adding an ``mon osd min down reporters`` setting under the +``[mon]`` section of your Ceph configuration file, or by setting the value at runtime. @@ -271,6 +271,21 @@ Monitor Settings :Type: 32-bit Integer :Default: ``900`` +``mon osd min down reporters`` + +:Description: The minimum number of OSDs required to report a ``down`` OSD. +:Type: 32-bit Integer +:Default: ``1`` + + +``mon osd min down reports`` + +:Description: The minimum number of times an OSD must report that another + is ``down``. + +:Type: 32-bit Integer +:Default: ``3`` + OSD Settings @@ -333,19 +348,3 @@ OSD Settings :Type: 32-bit Integer :Default: ``30`` - -``osd min down reporters`` - -:Description: The minimum number of OSDs required to report a ``down`` OSD. -:Type: 32-bit Integer -:Default: ``1`` - - -``osd min down reports`` - -:Description: The minimum number of times an OSD must report that another - is ``down``. - -:Type: 32-bit Integer -:Default: ``3`` - diff --git a/src/common/config_opts.h b/src/common/config_opts.h index ffb62be568ff..aa54a213fbf6 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -180,6 +180,8 @@ OPTION(mon_sync_debug, OPT_BOOL, false) // enable sync-specific debug OPTION(mon_sync_debug_leader, OPT_INT, -1) // monitor to be used as the sync leader OPTION(mon_sync_debug_provider, OPT_INT, -1) // monitor to be used as the sync provider OPTION(mon_sync_debug_provider_fallback, OPT_INT, -1) // monitor to be used as fallback if sync provider fails +OPTION(mon_osd_min_down_reporters, OPT_INT, 1) // number of OSDs who need to report a down OSD for it to count +OPTION(mon_osd_min_down_reports, OPT_INT, 3) // number of times a down OSD must be reported for it to count // dump transactions OPTION(mon_debug_dump_transactions, OPT_BOOL, true) @@ -407,8 +409,6 @@ OPTION(osd_mon_heartbeat_interval, OPT_INT, 30) // (seconds) how often to ping OPTION(osd_mon_report_interval_max, OPT_INT, 120) OPTION(osd_mon_report_interval_min, OPT_INT, 5) // pg stats, failures, up_thru, boot. OPTION(osd_mon_ack_timeout, OPT_INT, 30) // time out a mon if it doesn't ack stats -OPTION(osd_min_down_reporters, OPT_INT, 1) // number of OSDs who need to report a down OSD for it to count -OPTION(osd_min_down_reports, OPT_INT, 3) // number of times a down OSD must be reported for it to count OPTION(osd_default_data_pool_replay_window, OPT_INT, 45) OPTION(osd_preserve_trimmed_log, OPT_BOOL, false) OPTION(osd_auto_mark_unfound_lost, OPT_BOOL, false) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 7c5ffce48ce6..a0be0ec2af61 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -931,8 +931,8 @@ bool OSDMonitor::check_failure(utime_t now, int target_osd, failure_info_t& fi) } if (failed_for >= grace && - ((int)fi.reporters.size() >= g_conf->osd_min_down_reporters) && - (fi.num_reports >= g_conf->osd_min_down_reports)) { + ((int)fi.reporters.size() >= g_conf->mon_osd_min_down_reporters) && + (fi.num_reports >= g_conf->mon_osd_min_down_reports)) { dout(1) << " we have enough reports/reporters to mark osd." << target_osd << " down" << dendl; pending_inc.new_state[target_osd] = CEPH_OSD_UP;