Date: Thu, 8 Feb 2018 22:38:39 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329049 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cache tests/hotspare tests/pool_names tests/slog tests/zinject Message-ID: <201802082238.w18McdqL005077@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Thu Feb 8 22:38:39 2018 New Revision: 329049 URL: https://svnweb.freebsd.org/changeset/base/329049 Log: Remove verify_cache_support and verify_slog_support FreeBSD's ZFS test suite will never need to run on a system that doesn't support these things. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cleanup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/cleanup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_004_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Feb 8 22:38:39 2018 (r329049) @@ -1194,11 +1194,9 @@ function zfs_zones_setup #zone_name zone_root zone_ip # # If current system support slog, add slog device for pool # - if verify_slog_support ; then - typeset sdevs="$TMPDIR/sdev1 $TMPDIR/sdev2" - log_must create_vdevs $sdevs - log_must $ZPOOL add $pool_name log mirror $sdevs - fi + typeset sdevs="$TMPDIR/sdev1 $TMPDIR/sdev2" + log_must create_vdevs $sdevs + log_must $ZPOOL add $pool_name log mirror $sdevs # this isn't supported just yet. # Create a filesystem. In order to add this to @@ -2637,28 +2635,6 @@ function random_get_with_non function random_get { _random_get "$#" "$@" -} - -# -# Detect if the current system support slog -# -function verify_slog_support -{ - typeset dir=$TMPDIR/disk.${TESTCASE_ID} - typeset pool=foo.${TESTCASE_ID} - typeset vdev=$dir/a - typeset sdev=$dir/b - - $MKDIR -p $dir - log_must create_vdevs $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 } # Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache.kshlib Thu Feb 8 22:38:39 2018 (r329049) @@ -178,9 +178,3 @@ function verify_cache_device return 1 } - -function verify_cache_support -{ - $ZPOOL upgrade -v | $GREP "Cache devices" > /dev/null 2>&1 - return $? -} Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cleanup.ksh Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cleanup.ksh Thu Feb 8 22:38:39 2018 (r329049) @@ -31,10 +31,6 @@ verify_runnable "global" -if ! verify_cache_support ; then - log_unsupported "This system doesn't support cache device" -fi - cleanup if [[ -d $VDIR ]]; then log_must $RM -rf $VDIR Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh Thu Feb 8 22:38:39 2018 (r329049) @@ -31,10 +31,6 @@ verify_runnable "global" -if ! verify_cache_support ; then - log_unsupported "This system doesn't support cache device" -fi - if ! $(is_physical_device $LDEV) ; then log_unsupported "Only physical disk could be cache device" fi Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare.kshlib Thu Feb 8 22:38:39 2018 (r329049) @@ -59,9 +59,7 @@ function set_devs pooldevs=("${devarray[3]}" "${devarray[4]}" "${devarray[5]}") - if verify_slog_support ; then - logdevs="${devarray[7]}" - fi + logdevs="${devarray[7]}" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_002_neg.ksh Thu Feb 8 22:38:39 2018 (r329049) @@ -137,9 +137,7 @@ set -A POOLNAME "c0t0d0s0" "c0t0d0" "c0t0d19" "c0t5000 "mirror_pool" "raidz_pool" \ "mirror-pool" "raidz-pool" "spare" "spare_pool" \ "spare-pool" "raidz1-" "raidz2:" ":aaa" "-bbb" "_ccc" ".ddd" -if verify_slog_support ; then - POOLNAME[${#POOLNAME[@]}]='log' -fi +POOLNAME[${#POOLNAME[@]}]='log' typeset -i i=0 while ((i < ${#POOLNAME[@]})); do log_mustnot $ZPOOL create -m $TESTDIR ${POOLNAME[$i]} $DISK Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/cleanup.ksh Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/cleanup.ksh Thu Feb 8 22:38:39 2018 (r329049) @@ -31,10 +31,6 @@ verify_runnable "global" -if ! verify_slog_support ; then - log_unsupported "This system doesn't support separate intent logs" -fi - if datasetexists $TESTPOOL ; then log_must $ZPOOL destroy -f $TESTPOOL fi Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/setup.ksh Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/setup.ksh Thu Feb 8 22:38:39 2018 (r329049) @@ -31,10 +31,6 @@ verify_runnable "global" -if ! verify_slog_support ; then - log_unsupported "This system doesn't support separate intent logs" -fi - if [[ -d $VDEV ]]; then log_must $RM -rf $VDIR fi Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject.cfg Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject.cfg Thu Feb 8 22:38:39 2018 (r329049) @@ -56,12 +56,6 @@ export VDEV6=${DISK0}p7 export pooldevs="$VDEV0 $VDEV1 $VDEV2" export sparedevs="$VDEV3" -if verify_slog_support ; then - export logdevs="$VDEV4" -fi - -if verify_cache_support ; then - export cachedevs="$VDEV5" -fi +export logdevs="$VDEV4" export alldevs="$pooldevs $sparedevs $logdevs $cachedevs" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_001_pos.ksh Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_001_pos.ksh Thu Feb 8 22:38:39 2018 (r329049) @@ -129,13 +129,8 @@ inject_clear for type in "${types[@]}"; do create_pool $TESTPOOL $type $pooldevs spare $sparedevs - if verify_slog_support ; then - log_must $ZPOOL add -f $TESTPOOL log $logdevs - fi - - if verify_cache_support ; then - log_must $ZPOOL add -f $TESTPOOL cache $cachedevs - fi + log_must $ZPOOL add -f $TESTPOOL log $logdevs + log_must $ZPOOL add -f $TESTPOOL cache $cachedevs log_must $ZPOOL replace $TESTPOOL $VDEV0 $sparedevs log_must $ZFS create $TESTPOOL/$TESTFS Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_002_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_002_pos.ksh Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_002_pos.ksh Thu Feb 8 22:38:39 2018 (r329049) @@ -128,13 +128,8 @@ inject_clear for type in "${types[@]}"; do create_pool $TESTPOOL $type $pooldevs spare $sparedevs - if verify_slog_support ; then - log_must $ZPOOL add -f $TESTPOOL log $logdevs - fi - - if verify_cache_support ; then - log_must $ZPOOL add -f $TESTPOOL cache $cachedevs - fi + log_must $ZPOOL add -f $TESTPOOL log $logdevs + log_must $ZPOOL add -f $TESTPOOL cache $cachedevs log_must $ZPOOL replace $TESTPOOL $VDEV0 $sparedevs log_must $ZFS create $TESTPOOL/$TESTFS Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_003_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_003_pos.ksh Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_003_pos.ksh Thu Feb 8 22:38:39 2018 (r329049) @@ -124,13 +124,8 @@ inject_clear for type in "${types[@]}"; do create_pool $TESTPOOL $type $pooldevs spare $sparedevs - if verify_slog_support ; then - log_must $ZPOOL add -f $TESTPOOL log $logdevs - fi - - if verify_cache_support ; then - log_must $ZPOOL add -f $TESTPOOL cache $cachedevs - fi + log_must $ZPOOL add -f $TESTPOOL log $logdevs + log_must $ZPOOL add -f $TESTPOOL cache $cachedevs log_must $ZPOOL replace $TESTPOOL $VDEV0 $sparedevs log_must $ZFS create $TESTPOOL/$TESTFS Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_004_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_004_pos.ksh Thu Feb 8 22:37:19 2018 (r329048) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_004_pos.ksh Thu Feb 8 22:38:39 2018 (r329049) @@ -112,13 +112,8 @@ inject_clear for type in "${types[@]}"; do create_pool $TESTPOOL $type $pooldevs spare $sparedevs - if verify_slog_support ; then - log_must $ZPOOL add -f $TESTPOOL log $logdevs - fi - - if verify_cache_support ; then - log_must $ZPOOL add -f $TESTPOOL cache $cachedevs - fi + log_must $ZPOOL add -f $TESTPOOL log $logdevs + log_must $ZPOOL add -f $TESTPOOL cache $cachedevs log_must $ZPOOL replace $TESTPOOL $VDEV0 $sparedevs log_must $ZFS create $TESTPOOL/$TESTFS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802082238.w18McdqL005077>