From: Sage Weil Date: Fri, 12 May 2017 02:18:11 +0000 (-0500) Subject: Merge pull request #13610 from liewegas/wip-snapset X-Git-Tag: v12.0.3~28 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0a73ec955cc48c4f5b29c162db13fd1a8e6b84e;p=ceph.git Merge pull request #13610 from liewegas/wip-snapset osd: eliminate snapdir objects and move clone snaps vector into SnapSet Reviewed-by: Josh Durgin --- d0a73ec955cc48c4f5b29c162db13fd1a8e6b84e diff --cc src/common/config_opts.h index ae8ddca5fd6,56a74eec0df..2b4fab679d8 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@@ -319,8 -320,8 +319,9 @@@ OPTION(mon_cache_target_full_warn_ratio 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_fake_pool_delete, OPT_BOOL, false) // fake pool deletion (add _DELETED suffix) 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 OPTION(mon_force_standby_active, OPT_BOOL, true) // should mons force standby-replay mds to be active