Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ZTS: remove verify_slog_support helper 

verify_slog_support no longer applies to ZFS since slog support
is always available.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Signed-off-by: Christian Schwarz <me@cschwarz.com>
Closes #12092
This commit is contained in:
Christian Schwarz 2021-05-24 22:57:29 +02:00 committed by GitHub
parent f8646c871a
commit 0989d798fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/zfs-tests/include/libtest.shlib
View File

@ -1897,13 +1897,11 @@ function zfs_zones_setup #zone_name zone_root zone_ip
block_device_wait block_device_wait
# #
# If current system support slog, add slog device for pool # Add slog device for pool
# #
if verify_slog_support ; then typeset sdevs="$TEST_BASE_DIR/sdev1 $TEST_BASE_DIR/sdev2"
typeset sdevs="$TEST_BASE_DIR/sdev1 $TEST_BASE_DIR/sdev2" log_must mkfile $MINVDEVSIZE $sdevs
log_must mkfile $MINVDEVSIZE $sdevs log_must zpool add $pool_name log mirror $sdevs
log_must zpool add $pool_name log mirror $sdevs
fi
# this isn't supported just yet. # this isn't supported just yet.
# Create a filesystem. In order to add this to # Create a filesystem. In order to add this to
@ -3067,28 +3065,6 @@ function random_get
_random_get "$#" "$@" _random_get "$#" "$@"
} }
#
# Detect if the current system support slog
#
function verify_slog_support
{
typeset dir=$TEST_BASE_DIR/disk.$$
typeset pool=foo.$$
typeset vdev=$dir/a
typeset sdev=$dir/b
mkdir -p $dir
mkfile $MINVDEVSIZE $vdev $sdev
typeset -i ret=0
if ! zpool create -n $pool $vdev log $sdev > /dev/null 2>&1; then
ret=1
fi
rm -r $dir
return $ret
}
# #
# The function will generate a dataset name with specific length # The function will generate a dataset name with specific length
# $1, the length of the name # $1, the length of the name

6
tests/zfs-tests/tests/functional/pool_names/pool_names_002_neg.ksh
View File

@ -111,9 +111,9 @@ set -A POOLNAME \
"2222222222222222222" "mirror_pool" "raidz_pool" \ "2222222222222222222" "mirror_pool" "raidz_pool" \
"mirror-pool" "raidz-pool" "spare" "spare_pool" \ "mirror-pool" "raidz-pool" "spare" "spare_pool" \
"spare-pool" "raidz1-" "raidz2:" ":aaa" "-bbb" "_ccc" ".ddd" "spare-pool" "raidz1-" "raidz2:" ":aaa" "-bbb" "_ccc" ".ddd"
if verify_slog_support ; then
POOLNAME[${#POOLNAME[@]}]='log' POOLNAME[${#POOLNAME[@]}]='log'
fi
typeset -i i=0 typeset -i i=0
while ((i < ${#POOLNAME[@]})); do while ((i < ${#POOLNAME[@]})); do
log_mustnot zpool create -m $TESTDIR ${POOLNAME[$i]} $DISK log_mustnot zpool create -m $TESTDIR ${POOLNAME[$i]} $DISK

4
tests/zfs-tests/tests/functional/slog/cleanup.ksh
View File

@ -34,10 +34,6 @@
verify_runnable "global" verify_runnable "global"
if ! verify_slog_support ; then
log_unsupported "This system doesn't support separate intent logs"
fi
if datasetexists $TESTPOOL ; then if datasetexists $TESTPOOL ; then
log_must zpool destroy -f $TESTPOOL log_must zpool destroy -f $TESTPOOL
fi fi

4
tests/zfs-tests/tests/functional/slog/setup.ksh
View File

@ -34,8 +34,4 @@
verify_runnable "global" verify_runnable "global"
if ! verify_slog_support ; then
log_unsupported "This system doesn't support separate intent logs"
fi
log_pass log_pass