From 2587abc30d8d7b77aff30ed56191cbb63f59be8a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 28 Aug 2017 17:18:00 -0400 Subject: [PATCH] mon: remove mon_osd_allow_primary_{temp,affinity} These are covered by require_osd_release in the OSDMap. Signed-off-by: Sage Weil --- src/common/legacy_config_opts.h | 2 -- src/common/options.cc | 8 -------- src/mon/OSDMonitor.cc | 8 -------- 3 files changed, 18 deletions(-) diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h index 1a846818ff0..cf0564a12e3 100644 --- a/src/common/legacy_config_opts.h +++ b/src/common/legacy_config_opts.h @@ -223,8 +223,6 @@ OPTION(mon_osd_min_in_ratio, OPT_DOUBLE) // min osds required to be in to mark OPTION(mon_osd_warn_op_age, OPT_DOUBLE) // max op age before we generate a warning (make it a power of 2) OPTION(mon_osd_err_op_age_ratio, OPT_DOUBLE) // when to generate an error, as multiple of mon_osd_warn_op_age OPTION(mon_osd_max_split_count, OPT_INT) // largest number of PGs per "involved" OSD to let split create -OPTION(mon_osd_allow_primary_temp, OPT_BOOL) // allow primary_temp to be set in the osdmap -OPTION(mon_osd_allow_primary_affinity, OPT_BOOL) // allow primary_affinity to be set in the osdmap OPTION(mon_osd_prime_pg_temp, OPT_BOOL) // prime osdmap with pg mapping changes OPTION(mon_osd_prime_pg_temp_max_time, OPT_FLOAT) // max time to spend priming OPTION(mon_osd_prime_pg_temp_max_estimate, OPT_FLOAT) // max estimate of pg total before we do all pgs in parallel diff --git a/src/common/options.cc b/src/common/options.cc index e6c678b3330..fb0d3adc408 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -961,14 +961,6 @@ std::vector