PGBackend: add debug option to rewrite digest even if present

Related: #11027
Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index b13eb0982606c9b537ace1fd64a2be1338fa3fcd..b1da85f1ebb5e87bea46d3af80b6ed3f77ec9c6b 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -639,6 +639,7 @@ OPTION(osd_debug_drop_pg_create_probability, OPT_DOUBLE, 0)
 OPTION(osd_debug_drop_pg_create_duration, OPT_INT, 1)
 OPTION(osd_debug_drop_op_probability, OPT_DOUBLE, 0)   // probability of stalling/dropping a client op
 OPTION(osd_debug_op_order, OPT_BOOL, false)
+OPTION(osd_debug_scrub_chance_rewrite_digest, OPT_U64, 0)
 OPTION(osd_debug_verify_snaps_on_info, OPT_BOOL, false)
 OPTION(osd_debug_verify_stray_on_activate, OPT_BOOL, false)
 OPTION(osd_debug_skip_full_check_in_backfill_reservation, OPT_BOOL, false)

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index a3f2b89182fb8b502f72263200365ffe69bb99ea..179630dfda26e47b5cb10e7633dacbf168a8f369 100644 (file)
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -623,7 +623,10 @@ void PGBackend::be_compare_scrubmaps(
     }
     if (okseed &&
        auth_object.digest_present && auth_object.omap_digest_present &&
-       (!auth_oi.is_data_digest() || !auth_oi.is_omap_digest())) {
+       (!auth_oi.is_data_digest() || !auth_oi.is_omap_digest() ||
+        (g_conf->osd_debug_scrub_chance_rewrite_digest &&
+         (((unsigned)rand() % 100) >
+           g_conf->osd_debug_scrub_chance_rewrite_digest)))) {
       if (!cur_inconsistent.empty() || !cur_missing.empty()) {
        dout(20) << __func__ << " not updating oi digest on "
                 << *k << " since it is inconsistent" << dendl;