Skip to content

Commit

Permalink
DOSE-434 Zpool_scrub (openzfs#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
ankurs-delphix authored Dec 8, 2021
1 parent 831e86c commit 7f24ea2
Showing 8 changed files with 42 additions and 2 deletions.
6 changes: 6 additions & 0 deletions tests/runfiles/object_store.run
Original file line number Diff line number Diff line change
@@ -394,3 +394,9 @@ tests = ['import_cachefile_device_added', 'import_cachefile_device_removed',
'zpool_import_missing_002_pos', 'zpool_import_missing_003_pos',
'zpool_import_rename_001_pos']
tags = ['functional', 'cli_root', 'zpool_import']

[tests/functional/cli_root/zpool_scrub]
tests = ['zpool_scrub_001_neg', 'zpool_scrub_002_pos', 'zpool_scrub_003_pos',
'zpool_scrub_004_pos', 'zpool_scrub_005_pos', 'zpool_scrub_multiple_copies',
'zpool_scrub_offline_device','zpool_scrub_print_repairing']
tags = ['functional', 'cli_root', 'zpool_scrub']
10 changes: 10 additions & 0 deletions tests/test-runner/bin/zts-report.py.in
Original file line number Diff line number Diff line change
@@ -309,6 +309,16 @@ if os.environ.get('ZTS_OBJECT_STORE') == 'true':
['SKIP', object_store_skip],
'cli_root/zpool_import/zpool_import_missing_002_pos':
['SKIP', object_store_skip],
'cli_root/zpool_scrub/zpool_scrub_004_pos':
['SKIP', object_store_skip],
'cli_root/zpool_scrub/zpool_scrub_005_pos':
['SKIP', object_store_skip],
'cli_root/zpool_scrub/zpool_scrub_print_repairing':
['SKIP', object_store_skip],
'cli_root/zpool_scrub/zpool_scrub_offline_device':
['SKIP', object_store_skip],
'cli_root/zpool_scrub/zpool_scrub_multiple_copies':
['SKIP', object_store_skip],
})

#
Original file line number Diff line number Diff line change
@@ -33,9 +33,13 @@
. $STF_SUITE/tests/functional/cli_root/zpool_scrub/zpool_scrub.cfg

verify_runnable "global"
verify_disk_count "$DISKS" 2

default_mirror_setup_noexit $DISK1 $DISK2
if use_object_store; then
default_setup_noexit
else
verify_disk_count "$DISKS" 2
default_mirror_setup_noexit $DISK1 $DISK2
fi

mntpnt=$(get_prop mountpoint $TESTPOOL/$TESTFS)

Original file line number Diff line number Diff line change
@@ -44,6 +44,10 @@
# 5. Verify scrub failed until the resilver completed
#

if use_object_store; then
log_unsupported "Not supported for object store run"
fi

function cleanup
{
log_must set_tunable32 SCAN_SUSPEND_PROGRESS 0
Original file line number Diff line number Diff line change
@@ -42,6 +42,10 @@
# 3. Try it twice, verify both of them work fine.
#

if use_object_store; then
log_unsupported "Not supported for object store run"
fi

verify_runnable "global"

log_assert "When scrubbing, detach device should not break system."
Original file line number Diff line number Diff line change
@@ -38,6 +38,10 @@

verify_runnable "global"

if use_object_store; then
log_unsupported "Not supported for object store with multiple copies"
fi

function cleanup
{
destroy_dataset $TESTPOOL/$TESTFS2
Original file line number Diff line number Diff line change
@@ -45,6 +45,10 @@
# Ported from script used to reproduce issue #5806
#

if use_object_store; then
log_unsupported "Not supported for object store run"
fi

verify_runnable "global"

function cleanup
Original file line number Diff line number Diff line change
@@ -36,6 +36,10 @@
# 4. Verify we see "(repairing)" on the bad vdev
#

if use_object_store; then
log_unsupported "Not supported for object store run"
fi

verify_runnable "global"

log_assert "Verify we see '(repairing)' while scrubbing a bad vdev."

0 comments on commit 7f24ea2

Please sign in to comment.