From: Ronen Friedman <rfriedma@redhat.com>
Date: Sat, 24 Aug 2024 05:36:44 +0000 (-0500)
Subject: test/osd/scrub: disable tests for deleted scrub functionality
X-Git-Tag: v20.0.0~1219^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=503ebee8f9ddf6cd93c384e0cb36fbc82ccd7951;p=ceph.git

test/osd/scrub: disable tests for deleted scrub functionality

The scrub scheduler no longer "upgrades" shallow scrubs into
deep ones on error, so the tests that check this functionality
are no longer valid.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
index b717026e1916..59564f7e37e2 100755
--- a/qa/standalone/scrub/osd-scrub-repair.sh
+++ b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -5754,11 +5754,13 @@ function TEST_corrupt_scrub_erasure_overwrites() {
 
 #
 # Test to make sure that a periodic scrub won't cause deep-scrub info to be lost
+# Update 2024: this functionality was removed from the code. The test will be skipped.
 #
 function TEST_periodic_scrub_replicated() {
     local dir=$1
     local poolname=psr_pool
     local objname=POBJ
+    return 0
 
     run_mon $dir a --osd_pool_default_size=2 || return 1
     run_mgr $dir x || return 1
@@ -5795,12 +5797,13 @@ function TEST_periodic_scrub_replicated() {
 
     flush_pg_stats
     local last_scrub=$(get_last_scrub_stamp $pg)
-    # Fake a schedule scrub
+    # Fake a scheduled deep scrub
     ceph tell $pg schedule-scrub || return 1
     # Wait for schedule regular scrub
     wait_for_scrub $pg "$last_scrub"
 
     # It needed to be upgraded
+    # update 2024: the "upgrade" functionality has been removed
     grep -q "Deep scrub errors, upgrading scrub to deep-scrub" $dir/osd.${primary}.log || return 1
 
     # Bad object still known