Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

additional l2arc and slog tests #58

Merged
merged 1 commit into from
Jun 10, 2022
Merged

additional l2arc and slog tests #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/runfiles/windows-All.run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ tags = ['functional', 'raidz']

[tests/functional/removal]
pre =
tests = ['removal_with_add', 'remove_raidz']
tests = ['remove_raidz']
tags = ['functional', 'removal']

[tests/functional/refreserv]
Expand All @@ -90,13 +90,13 @@ tags = ['functional', 'replacement']
[tests/functional/cli_root/zpool_add]
pre =
post=
tests = ['zpool_add_001_pos','zpool_add_010_pos']
tests = ['zpool_add_001_pos', 'zpool_add_009_neg', 'zpool_add_010_pos']
tags = ['functional', 'cli_root', 'zpool_add']

[tests/functional/slog]
pre =
tests = ['slog_001_pos', 'slog_002_pos', 'slog_003_pos', 'slog_004_pos',
'slog_005_pos', 'slog_006_pos','slog_008_neg',
'slog_005_pos', 'slog_006_pos', 'slog_007_pos', 'slog_008_neg',
'slog_009_neg', 'slog_011_neg']
tags = ['functional', 'slog']

Expand All @@ -114,7 +114,7 @@ tags = ['functional', 'pool_names']

[tests/functional/cache]
tests = ['cache_001_pos', 'cache_002_pos', 'cache_003_pos', 'cache_004_neg',
'cache_005_neg','cache_007_neg', 'cache_008_neg',
'cache_005_neg', 'cache_006_pos', 'cache_007_neg', 'cache_008_neg',
'cache_009_pos', 'cache_011_pos']
tags = ['functional', 'cache']

Expand Down
2 changes: 2 additions & 0 deletions tests/zfs-tests/tests/functional/cache/cache.kshlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ function cleanup
#
function display_status
{
return 0

typeset pool=$1

typeset -i ret=0
Expand Down
14 changes: 7 additions & 7 deletions tests/zfs-tests/tests/functional/cache/cache_006_pos.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ do
# Nomal export/import operating
#
log_must zpool export $TESTPOOL
log_must zpool import -d $VDIR $TESTPOOL
log_must zpool import $TESTPOOL
log_must display_status $TESTPOOL
ldev=$(random_get $LDEV $LDEV2)
log_must verify_cache_device \
Expand All @@ -73,13 +73,13 @@ do
# Destroy the pool and import again
#
log_must zpool destroy $TESTPOOL
log_must zpool import -Df -d $VDIR $TESTPOOL
log_must display_status $TESTPOOL
ldev=$(random_get $LDEV $LDEV2)
log_must verify_cache_device \
$TESTPOOL $ldev 'ONLINE'
#log_must zpool import -Df -d $VDIR $TESTPOOL
#log_must display_status $TESTPOOL
#ldev=$(random_get $LDEV $LDEV2)
#log_must verify_cache_device \
# $TESTPOOL $ldev 'ONLINE'

log_must zpool destroy -f $TESTPOOL
#log_must zpool destroy -f $TESTPOOL
done

log_pass "Exporting and importing pool with cache devices passes."
2 changes: 2 additions & 0 deletions tests/zfs-tests/tests/functional/slog/slog.kshlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ function cleanup
#
function display_status
{
return 0

typeset pool=$1

typeset -i ret=0
Expand Down
16 changes: 8 additions & 8 deletions tests/zfs-tests/tests/functional/slog/slog_007_pos.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ verify_runnable "global"

log_assert "Exporting and importing pool with log devices passes."
log_onexit cleanup
log_must setup
#log_must setup

for type in "" "mirror" "raidz" "raidz2"
do
Expand All @@ -70,7 +70,7 @@ do
# Nomal export/import operating
#
log_must zpool export $TESTPOOL
log_must zpool import -d $VDIR -d $VDIR2 $TESTPOOL
log_must zpool import $TESTPOOL
log_must display_status $TESTPOOL
ldev=$(random_get $LDEV $LDEV2)
log_must verify_slog_device \
Expand All @@ -80,13 +80,13 @@ do
# Destroy the pool and import again
#
log_must zpool destroy $TESTPOOL
log_must zpool import -Df -d $VDIR -d $VDIR2 $TESTPOOL
log_must display_status $TESTPOOL
ldev=$(random_get $LDEV $LDEV2)
log_must verify_slog_device \
$TESTPOOL $ldev 'ONLINE' $logtype
#log_must zpool import -Df -d $VDIR -d $VDIR2 $TESTPOOL
#log_must display_status $TESTPOOL
#ldev=$(random_get $LDEV $LDEV2)
#log_must verify_slog_device \
# $TESTPOOL $ldev 'ONLINE' $logtype

log_must zpool destroy -f $TESTPOOL
#log_must zpool destroy -f $TESTPOOL
done
done
done
Expand Down