osd/ReplicatedBackend: turn more be_deep_scrub options into legacy

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 946b6dde76e513af3e28a8725c873c414f4ad40b)

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 8d3ff1497c2477f0f984ba7ba38713d3fc210b1e..f664c96e4f9ae5f350753d97b995af6d2add58e6 100644 (file)
--- 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 6b513bdaecbef27d93f7c1339bf909fb5743082c..acfb2a63d56d30a764d9ecfe8c0a985a2654886a 100644 (file)
--- 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<uint64_t>(
-       "osd_deep_scrub_large_omap_object_key_threshold") ||
-      pos.omap_bytes > cct->_conf->get_val<uint64_t>(
-       "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;