mon: remove mon_osd_allow_primary_{temp,affinity}

These are covered by require_osd_release in the OSDMap.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 1a846818ff0b44dfe07986dbf27713ef2e993e7a..cf0564a12e3273239467ea960151fa3989d045cf 100644 (file)
--- 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 e6c678b3330a3c99d4be44913807a587a3a88f53..fb0d3adc408d09557e1c5c746c0fde0c2fdde4db 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -961,14 +961,6 @@ std::vector<Option> get_global_options() {
     .set_default(32)
     .set_description(""),
 
-    Option("mon_osd_allow_primary_temp", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
-    .set_default(false)
-    .set_description(""),
-
-    Option("mon_osd_allow_primary_affinity", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
-    .set_default(false)
-    .set_description(""),
-
     Option("mon_osd_prime_pg_temp", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)
     .set_description(""),

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c7fd3e4389cd698c9d4bb846f65dc381c648cbba..16412512dcb5e4bfe046bca307899c20e50979da 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -9077,10 +9077,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
         << " < firefly, which is required for primary-temp";
       err = -EPERM;
       goto reply;
-    } else if (!g_conf->mon_osd_allow_primary_temp) {
-      ss << "you must enable 'mon osd allow primary temp = true' on the mons before you can set primary_temp mappings.  note that this is for developers only: older clients/OSDs will break and there is no feature bit infrastructure in place.";
-      err = -EPERM;
-      goto reply;
     }
 
     pending_inc.new_primary_temp[pgid] = osd;
@@ -9346,10 +9342,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
         << " < firefly, which is required for primary-affinity";
       err = -EPERM;
       goto reply;
-    } else if (!g_conf->mon_osd_allow_primary_affinity) {
-      ss << "you must enable 'mon osd allow primary affinity = true' on the mons before you can adjust primary-affinity.  note that older clients will no longer be able to communicate with the cluster.";
-      err = -EPERM;
-      goto reply;
     }
     err = check_cluster_features(CEPH_FEATURE_OSD_PRIMARY_AFFINITY, ss);
     if (err == -EAGAIN)