summaryrefslogtreecommitdiffstats
path: root/qa/standalone
diff options
context:
space:
mode:
authorRonen Friedman <rfriedma@redhat.com>2024-08-24 07:36:44 +0200
committerRonen Friedman <rfriedma@redhat.com>2024-08-25 15:01:00 +0200
commit503ebee8f9ddf6cd93c384e0cb36fbc82ccd7951 (patch)
tree39974e1734899eca324827f668af1b9c21fc23af /qa/standalone
parenttest/osd: test new functionality added to the not-before queue (diff)
downloadceph-503ebee8f9ddf6cd93c384e0cb36fbc82ccd7951.tar.xz
ceph-503ebee8f9ddf6cd93c384e0cb36fbc82ccd7951.zip
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>
Diffstat (limited to 'qa/standalone')
-rwxr-xr-xqa/standalone/scrub/osd-scrub-repair.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
index b717026e191..59564f7e37e 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