From: Sage Weil Date: Thu, 4 May 2017 17:06:37 +0000 (-0500) Subject: mon/OSDMonitor: default require_min_compat_client to hammer for new clusters X-Git-Tag: v12.0.3~50^2~12 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=481411e99575906e87e5b0a82350c14633bda642;p=ceph.git mon/OSDMonitor: default require_min_compat_client to hammer for new clusters Signed-off-by: Sage Weil --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index e51c8847aeb4..adb67b2fc02c 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -320,6 +320,7 @@ OPTION(mon_cache_target_full_warn_ratio, OPT_FLOAT, .66) // position between poo OPTION(mon_osd_full_ratio, OPT_FLOAT, .95) // what % full makes an OSD "full" OPTION(mon_osd_backfillfull_ratio, OPT_FLOAT, .90) // what % full makes an OSD backfill full (backfill halted) OPTION(mon_osd_nearfull_ratio, OPT_FLOAT, .85) // what % full makes an OSD near full +OPTION(mon_osd_initial_require_min_compat_client, OPT_STR, "hammer") OPTION(mon_allow_pool_delete, OPT_BOOL, false) // allow pool deletion OPTION(mon_globalid_prealloc, OPT_U32, 10000) // how many globalids to prealloc OPTION(mon_osd_report_timeout, OPT_INT, 900) // grace period before declaring unresponsive OSDs dead diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index a0bcb279bdee..a99bd88bb94d 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -230,6 +230,7 @@ void OSDMonitor::create_initial() 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; + newmap.require_min_compat_client = g_conf->mon_osd_initial_require_min_compat_client; } // encode into pending incremental