From 1e867d757e2ddcf3e68a7de7e645ccb4ce1e2943 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Wed, 26 Jul 2017 15:18:49 +0800 Subject: [PATCH] mon/OSDMonitor: introduce mon_osd_destroyed_out_interval for destroyed out control Signed-off-by: xie xingguo --- src/common/legacy_config_opts.h | 1 + src/common/options.cc | 4 ++++ src/mon/OSDMonitor.cc | 11 +++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h index 750240cfb411..c0b0192d98a5 100644 --- a/src/common/legacy_config_opts.h +++ b/src/common/legacy_config_opts.h @@ -212,6 +212,7 @@ OPTION(mon_osd_adjust_down_out_interval, OPT_BOOL) // true if we should scale b OPTION(mon_osd_auto_mark_in, OPT_BOOL) // mark any booting osds 'in' OPTION(mon_osd_auto_mark_auto_out_in, OPT_BOOL) // mark booting auto-marked-out osds 'in' OPTION(mon_osd_auto_mark_new_in, OPT_BOOL) // mark booting new osds 'in' +OPTION(mon_osd_destroyed_out_interval, OPT_INT) // seconds OPTION(mon_osd_down_out_interval, OPT_INT) // seconds OPTION(mon_osd_down_out_subtree_limit, OPT_STR) // smallest crush unit/type that we will not automatically mark out OPTION(mon_osd_min_up_ratio, OPT_DOUBLE) // min osds required to be up to mark things down diff --git a/src/common/options.cc b/src/common/options.cc index c98bd30a9382..ed7dc0c9666c 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -907,6 +907,10 @@ std::vector