From 076110873c37670ea5887cdee54420c39ae95ddd Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sat, 26 Aug 2017 15:24:24 -0400
Subject: [PATCH] mon:
 s/mon_debug_no_require_luminous/mon_debug_no_require_mimic/

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/common/legacy_config_opts.h |  2 +-
 src/common/options.cc           |  2 +-
 src/mon/OSDMonitor.cc           | 27 ++++++++++++++-------------
 src/mon/PGMap.cc                |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index cf0564a12e3..62bced22ca4 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -310,7 +310,7 @@ 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_luminous, OPT_BOOL)
+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 fb0d3adc408..d8f2744e8b6 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1303,7 +1303,7 @@ std::vector<Option> get_global_options() {
     .set_default("/var/log/ceph/$cluster-$name.tdump")
     .set_description(""),
 
-    Option("mon_debug_no_require_luminous", Option::TYPE_BOOL, Option::LEVEL_DEV)
+    Option("mon_debug_no_require_mimic", Option::TYPE_BOOL, Option::LEVEL_DEV)
     .set_default(false)
     .set_description(""),
 
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 2cae5af4eb0..0b9a5a5adcb 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -233,21 +233,22 @@ void OSDMonitor::create_initial()
   // new clusters should sort bitwise by default.
   newmap.set_flag(CEPH_OSDMAP_SORTBITWISE);
 
+  newmap.flags |=
+    CEPH_OSDMAP_RECOVERY_DELETES |
+    CEPH_OSDMAP_PURGED_SNAPDIRS;
+  newmap.full_ratio = g_conf->mon_osd_full_ratio;
+  if (newmap.full_ratio > 1.0) newmap.full_ratio /= 100;
+  newmap.backfillfull_ratio = g_conf->mon_osd_backfillfull_ratio;
+  if (newmap.backfillfull_ratio > 1.0) newmap.backfillfull_ratio /= 100;
+  newmap.nearfull_ratio = g_conf->mon_osd_nearfull_ratio;
+  if (newmap.nearfull_ratio > 1.0) newmap.nearfull_ratio /= 100;
+
   // new cluster should require latest by default
-  if (g_conf->mon_debug_no_require_luminous) {
-    newmap.require_osd_release = CEPH_RELEASE_KRAKEN;
-    derr << __func__ << " mon_debug_no_require_luminous=true" << dendl;
-  } else {
+  if (g_conf->mon_debug_no_require_mimic) {
     newmap.require_osd_release = CEPH_RELEASE_LUMINOUS;
-    newmap.flags |=
-      CEPH_OSDMAP_RECOVERY_DELETES |
-      CEPH_OSDMAP_PURGED_SNAPDIRS;
-    newmap.full_ratio = g_conf->mon_osd_full_ratio;
-    if (newmap.full_ratio > 1.0) newmap.full_ratio /= 100;
-    newmap.backfillfull_ratio = g_conf->mon_osd_backfillfull_ratio;
-    if (newmap.backfillfull_ratio > 1.0) newmap.backfillfull_ratio /= 100;
-    newmap.nearfull_ratio = g_conf->mon_osd_nearfull_ratio;
-    if (newmap.nearfull_ratio > 1.0) newmap.nearfull_ratio /= 100;
+    derr << __func__ << " mon_debug_no_require_mimic=true" << dendl;
+  } else {
+    newmap.require_osd_release = CEPH_RELEASE_MIMIC;
     int r = ceph_release_from_name(
       g_conf->mon_osd_initial_require_min_compat_client.c_str());
     if (r <= 0) {
diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 767cc6a5e51..b18a3bcf49a 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2727,7 +2727,7 @@ void PGMap::get_health_checks(
       // required release
       if (osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS &&
           sum.num_objects > 0 && pool.application_metadata.empty() &&
-          !pool.is_tier() && !g_conf->mon_debug_no_require_luminous) {
+          !pool.is_tier()) {
         stringstream ss;
         ss << "application not enabled on pool '" << pool_name << "'";
         detail.push_back(ss.str());
-- 
2.39.5