From: Sage Weil <sage@redhat.com>
Date: Thu, 30 May 2019 14:16:06 +0000 (-0500)
Subject: mon: drop mon_debug_no_require_mimic
X-Git-Tag: v15.1.0~2308^2~68
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99970bb795d61fc1691e7846bd583e602f23b4d6;p=ceph.git

mon: drop mon_debug_no_require_mimic

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 b5a02d915e2d..489e9373a2ae 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -279,7 +279,6 @@ OPTION(mon_debug_deprecated_as_obsolete, OPT_BOOL) // consider deprecated comman
 OPTION(mon_debug_dump_transactions, OPT_BOOL)
 OPTION(mon_debug_dump_json, OPT_BOOL)
 OPTION(mon_debug_dump_location, OPT_STR)
-OPTION(mon_debug_no_require_mimic, OPT_BOOL)
 OPTION(mon_debug_no_require_bluestore_for_ec_overwrites, OPT_BOOL)
 OPTION(mon_debug_no_initial_persistent_features, OPT_BOOL)
 OPTION(mon_inject_transaction_delay_max, OPT_DOUBLE)      // seconds
diff --git a/src/common/options.cc b/src/common/options.cc
index f27ea15f12ad..27b6d52e6442 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1935,12 +1935,6 @@ std::vector<Option> get_global_options() {
     .set_description("file to dump paxos transactions to")
     .add_see_also("mon_debug_dump_transactions"),
 
-    Option("mon_debug_no_require_mimic", Option::TYPE_BOOL, Option::LEVEL_DEV)
-    .set_default(false)
-    .add_service("mon")
-    .set_flag(Option::FLAG_CLUSTER_CREATE)
-    .set_description("do not set mimic feature for new mon clusters"),
-
     Option("mon_debug_no_require_nautilus", Option::TYPE_BOOL, Option::LEVEL_DEV)
     .set_default(false)
     .add_service("mon")
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 940dfec9288a..29c2b08ac14a 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -340,14 +340,8 @@ void OSDMonitor::create_initial()
   // new cluster should require latest by default
   if (g_conf().get_val<bool>("mon_debug_no_require_octopus")) {
     if (g_conf().get_val<bool>("mon_debug_no_require_nautilus")) {
-      if (g_conf()->mon_debug_no_require_mimic) {
-	derr << __func__ << " mon_debug_no_require_octopus, nautilus, and mimic=true"
-	     << dendl;
-	newmap.require_osd_release = ceph_release_t::luminous;
-      } else {
-	derr << __func__ << " mon_debug_no_require_octopus and nautilus=true" << dendl;
-	newmap.require_osd_release = ceph_release_t::mimic;
-      }
+      derr << __func__ << " mon_debug_no_require_octopus and nautilus=true" << dendl;
+      newmap.require_osd_release = ceph_release_t::mimic;
     } else {
       derr << __func__ << " mon_debug_no_require_octopus=true" << dendl;
       newmap.require_osd_release = ceph_release_t::nautilus;