mon/OSDMonitor: add mon_debug_no_require_luminous

Add debug option not to set the require_luminous osdmap flag on mkfs, for
debugging purposes.

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 8984c35594e328804ded47bb4227a4200bbfa73e..9491344cc9ac6f38bf35d3b212fa09ed73f7fdf0 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -370,6 +370,7 @@ OPTION(mon_debug_deprecated_as_obsolete, OPT_BOOL, false) // consider deprecated
 OPTION(mon_debug_dump_transactions, OPT_BOOL, false)
 OPTION(mon_debug_dump_json, OPT_BOOL, false)
 OPTION(mon_debug_dump_location, OPT_STR, "/var/log/ceph/$cluster-$name.tdump")
+OPTION(mon_debug_no_require_luminous, OPT_BOOL, false)
 OPTION(mon_inject_transaction_delay_max, OPT_DOUBLE, 10.0)      // seconds
 OPTION(mon_inject_transaction_delay_probability, OPT_DOUBLE, 0) // range [0, 1]
 

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 3d513e787bc72d71ca585247d849e6c329bd7e80..a4eab94fca12803faf5067d5c1f2e301b0304177 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -159,7 +159,8 @@ void OSDMonitor::create_initial()
   // new cluster should require latest by default
   newmap.set_flag(CEPH_OSDMAP_REQUIRE_JEWEL);
   newmap.set_flag(CEPH_OSDMAP_REQUIRE_KRAKEN);
-  newmap.set_flag(CEPH_OSDMAP_REQUIRE_LUMINOUS);
+  if (!g_conf->mon_debug_no_require_luminous)
+    newmap.set_flag(CEPH_OSDMAP_REQUIRE_LUMINOUS);
 
   newmap.full_ratio = g_conf->mon_osd_full_ratio;
   newmap.nearfull_ratio = g_conf->mon_osd_nearfull_ratio;