cleanup: Remove debug option osd_debug_scrub_chance_rewrite_digest

This option seems pointless and there are no test cases that use it.

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 6adeaed32f70923d012bf9410bfa8651694be3cf)

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 69fbc51c1935ef24ba09cb80a00b86199346f960..6c6c2175ebc270f3a6e749093a9c714ab236f8a8 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -770,7 +770,6 @@ OPTION(osd_debug_drop_ping_probability, OPT_DOUBLE)
 OPTION(osd_debug_drop_ping_duration, OPT_INT)
 OPTION(osd_debug_op_order, OPT_BOOL)
 OPTION(osd_debug_verify_missing_on_start, OPT_BOOL)
-OPTION(osd_debug_scrub_chance_rewrite_digest, OPT_U64)
 OPTION(osd_debug_verify_snaps, OPT_BOOL)
 OPTION(osd_debug_verify_stray_on_activate, OPT_BOOL)
 OPTION(osd_debug_skip_full_check_in_backfill_reservation, OPT_BOOL)

diff --git a/src/common/options.cc b/src/common/options.cc
index 1f75ed434a5258b364fe812c55f01577a71d8a78..20acf359bfeab302c6b3670951bb862a4e8f23d2 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -3234,10 +3234,6 @@ std::vector<Option> get_global_options() {
     .set_default(false)
     .set_description(""),
 
-    Option("osd_debug_scrub_chance_rewrite_digest", Option::TYPE_UINT, Option::LEVEL_DEV)
-    .set_default(0)
-    .set_description(""),
-
     Option("osd_debug_verify_snaps", Option::TYPE_BOOL, Option::LEVEL_DEV)
     .set_default(false)
     .set_description(""),

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 6cdbac4001f63e48141b46e124ea74b2fb602c8f..88737ec0dee4a99d74ebb5f9c09083cd61d3bf97 100644 (file)
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -1063,13 +1063,6 @@ void PGBackend::be_compare_scrubmaps(
        dout(20) << __func__ << " missing digest on " << *k << dendl;
        update = MAYBE;
       }
-      if (auth_object.digest_present && auth_object.omap_digest_present &&
-         cct->_conf->osd_debug_scrub_chance_rewrite_digest &&
-         (((unsigned)rand() % 100) >
-          cct->_conf->osd_debug_scrub_chance_rewrite_digest)) {
-       dout(20) << __func__ << " randomly updating digest on " << *k << dendl;
-       update = MAYBE;
-      }
 
       // recorded digest != actual digest?
       if (auth_oi.is_data_digest() && auth_object.digest_present &&