From 38aff741f3c8ba975d5b7339dc03bd97391b03c2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 21 Feb 2017 19:13:23 -0600 Subject: [PATCH] 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 --- src/common/config_opts.h | 1 + src/mon/OSDMonitor.cc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 8984c35594e32..9491344cc9ac6 100644 --- 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 3d513e787bc72..a4eab94fca128 100644 --- 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; -- 2.39.5