From e92fd7c6e59de5e065b5aae291a4d7fec1fde492 Mon Sep 17 00:00:00 2001
From: David Zafman <dzafman@redhat.com>
Date: Wed, 30 May 2018 11:47:04 -0700
Subject: [PATCH] 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)
---
 src/common/legacy_config_opts.h | 1 -
 src/common/options.cc           | 4 ----
 src/osd/PGBackend.cc            | 7 -------
 3 files changed, 12 deletions(-)

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index f664c96e4f9ae..47004704f6c54 100644
--- 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 5a81dda59ecdc..7b6acbdd8d92a 100644
--- 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 97cf4faf5cc27..ecc404c6f7842 100644
--- 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 &&
-- 
2.39.5