From: xie xingguo Date: Thu, 22 Feb 2018 09:27:14 +0000 (+0800) Subject: osd/ReplicatedBackend: turn more be_deep_scrub options into legacy X-Git-Tag: v12.2.6~98^2~14 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a0bacab58c37e30dfb5d8f65c7396e1ee29e511;p=ceph.git osd/ReplicatedBackend: turn more be_deep_scrub options into legacy Signed-off-by: xie xingguo (cherry picked from commit 946b6dde76e513af3e28a8725c873c414f4ad40b) --- diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h index 8d3ff1497c247..f664c96e4f9ae 100644 --- a/src/common/legacy_config_opts.h +++ b/src/common/legacy_config_opts.h @@ -787,6 +787,8 @@ OPTION(osd_deep_scrub_stride, OPT_INT) OPTION(osd_deep_scrub_keys, OPT_INT) OPTION(osd_deep_scrub_update_digest_min_age, OPT_INT) // objects must be this old (seconds) before we update the whole-object digest on scrub OPTION(osd_skip_data_digest, OPT_BOOL) +OPTION(osd_deep_scrub_large_omap_object_key_threshold, OPT_U64) +OPTION(osd_deep_scrub_large_omap_object_value_sum_threshold, OPT_U64) OPTION(osd_class_dir, OPT_STR) // where rados plugins are stored OPTION(osd_open_classes_on_start, OPT_BOOL) OPTION(osd_class_load_list, OPT_STR) // list of object classes allowed to be loaded (allow all: *) diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index 6b513bdaecbef..acfb2a63d56d3 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -822,10 +822,10 @@ int ReplicatedBackend::be_deep_scrub( } } - if (pos.omap_keys > cct->_conf->get_val( - "osd_deep_scrub_large_omap_object_key_threshold") || - pos.omap_bytes > cct->_conf->get_val( - "osd_deep_scrub_large_omap_object_value_sum_threshold")) { + if (pos.omap_keys > cct->_conf-> + osd_deep_scrub_large_omap_object_key_threshold || + pos.omap_bytes > cct->_conf-> + osd_deep_scrub_large_omap_object_value_sum_threshold) { dout(25) << __func__ << " " << poid << " large omap object detected. Object has " << pos.omap_keys << " keys and size " << pos.omap_bytes << " bytes" << dendl;