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 f664c96e4f9ae5f350753d97b995af6d2add58e6..47004704f6c547f0cf98957b1095278c9c68f324 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -824,7 +824,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 5a81dda59ecdc4fb9897f02122954e5490b5278e..7b6acbdd8d92a994c9c1f9d1fd214a2db776f44a 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2753,10 +2753,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 97cf4faf5cc27f2fd0bba40b608f69c0a4855344..ecc404c6f7842d7b6570ceb3c0bdf9e3d2a7ca74 100644 (file)
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -1064,13 +1064,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 &&