From: Yuri Weinstein Date: Tue, 23 Jan 2018 22:50:34 +0000 (-0800) Subject: Merge pull request #18735 from shinobu-x/wip-22029-luminous X-Git-Tag: v12.2.3~198 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8d526b8a8b0eb5fa545c25210e98625232cb8a8;p=ceph.git Merge pull request #18735 from shinobu-x/wip-22029-luminous luminous: restarting active ceph-mgr cause glitches in bps and iops metrics Reviewed-by: Kefu Chai Reviewed-by: Sage Weil --- c8d526b8a8b0eb5fa545c25210e98625232cb8a8 diff --cc src/common/legacy_config_opts.h index e0f0ad7e3e41,0277a1700b23..1168ba78344c --- a/src/common/legacy_config_opts.h +++ b/src/common/legacy_config_opts.h @@@ -233,8 -232,8 +232,7 @@@ OPTION(mon_clock_drift_allowed, OPT_FLO OPTION(mon_clock_drift_warn_backoff, OPT_FLOAT) // exponential backoff for clock drift warnings OPTION(mon_timecheck_interval, OPT_FLOAT) // on leader, timecheck (clock drift check) interval (seconds) OPTION(mon_timecheck_skew_interval, OPT_FLOAT) // on leader, timecheck (clock drift check) interval when in presence of a skew (seconds) - OPTION(mon_pg_stuck_threshold, OPT_INT) // number of seconds after which pgs can be considered stuck inactive, unclean, etc (see doc/control.rst under dump_stuck for more info) OPTION(mon_pg_min_inactive, OPT_U64) // the number of PGs which have to be inactive longer than 'mon_pg_stuck_threshold' before health goes into ERR. 0 means disabled, never go into ERR. -OPTION(mon_pg_warn_min_per_osd, OPT_INT) // min # pgs per (in) osd before we warn the admin OPTION(mon_pg_warn_max_object_skew, OPT_FLOAT) // max skew few average in objects per pg OPTION(mon_pg_warn_min_objects, OPT_INT) // do not warn below this object # OPTION(mon_pg_warn_min_pool_objects, OPT_INT) // do not warn on pools below this object #