osd/ReplicatedBackend: turn more be_deep_scrub options into legacy

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 77828795fe6db4c039d6e98fa2889f1f054c0026..191eea388458f3dbff29e99c404c1b0e8f029514 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -749,6 +749,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 708ffe55866519a87f602b06ce814c13da896325..e786c5003313c7c79e4b18b9b6b7e5c21a873036 100644 (file)
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -698,10 +698,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;