From 56fa4aa96eb3875f254e93eaef646ea20ba187f9 Mon Sep 17 00:00:00 2001 From: Rich Ercolani <214141+rincebrain@users.noreply.github.com> Date: Thu, 3 Mar 2022 13:43:38 -0500 Subject: [PATCH] Default to ON for compression A simple change, but so many tests break with it, and those are the majority of this. Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: Rich Ercolani Closes #13078 --- .../libzfs_core/test/test_libzfs_core.py | 3 +- include/sys/zio.h | 2 +- man/man7/zfsprops.7 | 4 +- tests/zfs-tests/include/libtest.shlib | 48 ++++++++++++++----- .../zfs_copies/zfs_copies_002_pos.ksh | 2 +- .../functional/cli_root/zfs_destroy/setup.ksh | 1 + ...fs_clone_livelist_condense_and_disable.ksh | 6 +++ .../zfs_clone_livelist_condense_races.ksh | 6 +++ .../zfs_destroy/zfs_clone_livelist_dedup.ksh | 7 +++ .../zfs_destroy_clone_livelist.ksh | 6 +++ .../zfs_destroy_dev_removal_condense.ksh | 2 +- .../zfs_receive/receive-o-x_props_aliases.ksh | 2 +- .../receive-o-x_props_override.ksh | 2 +- .../functional/cli_root/zfs_rename/setup.ksh | 3 +- .../zpool_trim/zpool_trim_partial.ksh | 2 +- .../tests/functional/events/cleanup.ksh | 2 + .../functional/events/events_002_pos.ksh | 2 +- .../tests/functional/events/zed_fd_spill.ksh | 8 +++- .../tests/functional/fault/decrypt_fault.ksh | 1 + .../inheritance/inherit_001_pos.ksh | 4 +- .../tests/functional/projectquota/setup.ksh | 2 + .../tests/functional/quota/setup.ksh | 4 +- .../functional/redundancy/redundancy.kshlib | 2 +- .../redundancy/redundancy_draid.ksh | 2 +- .../redundancy/redundancy_draid_damaged.ksh | 6 ++- .../redundancy/redundancy_raidz.ksh | 2 +- .../tests/functional/refquota/setup.ksh | 4 +- .../functional/refreserv/refreserv_raidz.ksh | 2 +- .../tests/functional/refreserv/setup.ksh | 4 +- .../removal/removal_with_errors.ksh | 1 + .../removal/removal_with_export.ksh | 1 + .../tests/functional/reservation/setup.ksh | 1 + .../tests/functional/rsend/rsend_009_pos.ksh | 4 +- .../functional/rsend/send_partial_dataset.ksh | 2 +- .../functional/snapshot/snapshot_014_pos.ksh | 3 ++ .../tests/functional/userquota/setup.ksh | 4 +- .../userquota/userspace_send_encrypted.ksh | 2 +- .../tests/functional/write_dirs/setup.ksh | 4 +- .../tests/functional/xattr/setup.ksh | 4 +- 39 files changed, 124 insertions(+), 43 deletions(-) diff --git a/contrib/pyzfs/libzfs_core/test/test_libzfs_core.py b/contrib/pyzfs/libzfs_core/test/test_libzfs_core.py index d949d88d5a..2567f7ebf8 100644 --- a/contrib/pyzfs/libzfs_core/test/test_libzfs_core.py +++ b/contrib/pyzfs/libzfs_core/test/test_libzfs_core.py @@ -4132,7 +4132,8 @@ class _TempPool(object): cachefile = 'none' self._zpool_create = [ 'zpool', 'create', '-o', 'cachefile=' + cachefile, - '-O', 'mountpoint=legacy', self._pool_name, self._pool_file_path] + '-O', 'mountpoint=legacy', '-O', 'compression=off', + self._pool_name, self._pool_file_path] try: os.ftruncate(fd, size) os.close(fd) diff --git a/include/sys/zio.h b/include/sys/zio.h index 07135d1e2a..2cf10f3097 100644 --- a/include/sys/zio.h +++ b/include/sys/zio.h @@ -125,7 +125,7 @@ enum zio_checksum { #define ZIO_COMPRESS_LEGACY_ON_VALUE ZIO_COMPRESS_LZJB #define ZIO_COMPRESS_LZ4_ON_VALUE ZIO_COMPRESS_LZ4 -#define ZIO_COMPRESS_DEFAULT ZIO_COMPRESS_OFF +#define ZIO_COMPRESS_DEFAULT ZIO_COMPRESS_ON #define BOOTFS_COMPRESS_VALID(compress) \ ((compress) == ZIO_COMPRESS_LZJB || \ diff --git a/man/man7/zfsprops.7 b/man/man7/zfsprops.7 index 0fc62f000a..0976e80d73 100644 --- a/man/man7/zfsprops.7 +++ b/man/man7/zfsprops.7 @@ -784,9 +784,9 @@ Changing this property affects only newly-written data. .Xc Controls the compression algorithm used for this dataset. .Pp -Setting compression to +When set to .Sy on -indicates that the current default compression algorithm should be used. +(the default), indicates that the current default compression algorithm should be used. The default balances compression and decompression speed, with compression ratio and is expected to work well on a wide variety of workloads. Unlike all other settings for this property, diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index bb8cb5c8c7..0ab0045391 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -448,7 +448,7 @@ function create_recv_clone datasetexists $recvfs && log_fail "Recv filesystem must not exist." datasetexists $sendfs && log_fail "Send filesystem must not exist." - log_must zfs create -o mountpoint="$mountpoint" $sendfs + log_must zfs create -o compression=off -o mountpoint="$mountpoint" $sendfs log_must zfs snapshot $snap log_must eval "zfs send $snap | zfs recv -u $recvfs" log_must mkfile 1m "$mountpoint/data" @@ -3567,17 +3567,19 @@ function wait_replacing #pool done } -# # Wait for a pool to be scrubbed # # $1 pool name +# $2 timeout # -function wait_scrubbed +function wait_scrubbed #pool timeout { - typeset pool=${1:-$TESTPOOL} - while ! is_pool_scrubbed $pool ; do - sleep 1 - done + typeset timeout=${2:-300} + typeset pool=${1:-$TESTPOOL} + for (( timer = 0; timer < $timeout; timer++ )); do + is_pool_scrubbed $pool && break; + sleep 1; + done } # Backup the zed.rc in our test directory so that we can edit it for our test. @@ -3671,6 +3673,21 @@ function zed_cleanup rmdir $ZEDLET_DIR } +# +# Check if ZED is currently running; if so, returns PIDs +# +function zed_check +{ + if ! is_linux; then + return + fi + zedpids="$(pgrep -x zed)" +# ret1=$? + zedpids2="$(pgrep -x lt-zed)" +# ret2=$? + echo ${zedpids} ${zedpids2} +} + # # Check if ZED is currently running, if not start ZED. # @@ -3686,9 +3703,14 @@ function zed_start fi # Verify the ZED is not already running. - pgrep -x zed > /dev/null - if (($? == 0)); then - log_note "ZED already running" + zedpids=$(zed_check) + if [ -n "$zedpids" ]; then + # We never, ever, really want it to just keep going if zed + # is already running - usually this implies our test cases + # will break very strangely because whatever we wanted to + # configure zed for won't be listening to our changes in the + # tmpdir + log_fail "ZED already running - ${zedpids}" else log_note "Starting ZED" # run ZED in the background and redirect foreground logging @@ -3707,13 +3729,13 @@ function zed_start function zed_stop { if ! is_linux; then - return + return "" fi log_note "Stopping ZED" while true; do - zedpids="$(pgrep -x zed)" - [ "$?" -ne 0 ] && break + zedpids=$(zed_check) + [ ! -n "$zedpids" ] && break log_must kill $zedpids sleep 1 diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh index 5774fb873f..61d7aa28d2 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh @@ -59,7 +59,7 @@ log_assert "Verify that the space used by multiple copies is charged correctly." log_onexit cleanup for val in 1 2 3; do - log_must zfs create -o copies=$val $TESTPOOL/fs_$val + log_must zfs create -o compression=off -o copies=$val $TESTPOOL/fs_$val log_must mkfile $FILESIZE /$TESTPOOL/fs_$val/$FILE done diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/setup.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/setup.ksh index 6a9af3bc28..34c726362f 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/setup.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/setup.ksh @@ -30,3 +30,4 @@ DISK=${DISKS%% *} default_setup $DISK +zfs set compression=off $TESTPOOL/$TESTFS \ No newline at end of file diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_condense_and_disable.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_condense_and_disable.ksh index 2f328ceac4..b9d6ad1e5d 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_condense_and_disable.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_condense_and_disable.ksh @@ -39,6 +39,7 @@ function cleanup set_tunable64 LIVELIST_MAX_ENTRIES $ORIGINAL_MAX # reset the minimum percent shared to 75 set_tunable32 LIVELIST_MIN_PERCENT_SHARED $ORIGINAL_MIN + log_must zfs inherit compression $TESTPOOL } function check_ll_len @@ -116,6 +117,11 @@ ORIGINAL_MAX=$(get_tunable LIVELIST_MAX_ENTRIES) ORIGINAL_MIN=$(get_tunable LIVELIST_MIN_PERCENT_SHARED) log_onexit cleanup +# You might think that setting compression=off for $TESTFS1 would be +# sufficient. You would be mistaken. +# You need compression=off for whatever the parent of $TESTFS1 is, +# and $TESTFS1. +log_must zfs set compression=off $TESTPOOL log_must zfs create $TESTPOOL/$TESTFS1 log_must mkfile 5m /$TESTPOOL/$TESTFS1/atestfile log_must zfs snapshot $TESTPOOL/$TESTFS1@snap diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_condense_races.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_condense_races.ksh index d83280e32d..cf248bb87f 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_condense_races.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_condense_races.ksh @@ -42,6 +42,7 @@ function cleanup # reset the condense tests to 0 set_tunable32 LIVELIST_CONDENSE_ZTHR_PAUSE 0 set_tunable32 LIVELIST_CONDENSE_SYNC_PAUSE 0 + log_must zfs inherit compression $TESTPOOL } function delete_race @@ -93,6 +94,11 @@ ORIGINAL_MAX=$(get_tunable LIVELIST_MAX_ENTRIES) log_onexit cleanup +# You might think that setting compression=off for $TESTFS1 would be +# sufficient. You would be mistaken. +# You need compression=off for whatever the parent of $TESTFS1 is, +# and $TESTFS1. +log_must zfs set compression=off $TESTPOOL log_must zfs create $TESTPOOL/$TESTFS1 log_must mkfile 100m /$TESTPOOL/$TESTFS1/atestfile sync_pool $TESTPOOL diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_dedup.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_dedup.ksh index 00583402db..9632cf01b3 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_dedup.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_dedup.ksh @@ -80,9 +80,16 @@ function test_dedup ORIGINAL_MIN_SHARED=$(get_tunable LIVELIST_MIN_PERCENT_SHARED) log_onexit cleanup +# You might think that setting compression=off for $TESTFS1 would be +# sufficient. You would be mistaken. +# You need compression=off for whatever the parent of $TESTFS1 is, +# and $TESTFS1. +log_must zfs set compression=off $TESTPOOL log_must zfs create $TESTPOOL/$TESTFS1 log_must mkfile 5m /$TESTPOOL/$TESTFS1/atestfile log_must zfs snapshot $TESTPOOL/$TESTFS1@snap test_dedup +log_must zfs inherit compression $TESTPOOL + log_pass "Clone's livelist processes dedup blocks as expected." diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_clone_livelist.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_clone_livelist.ksh index 9165b03a16..54d6096890 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_clone_livelist.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_clone_livelist.ksh @@ -42,6 +42,7 @@ function cleanup datasetexists $TESTPOOL/$TESTFS1 && destroy_dataset $TESTPOOL/$TESTFS1 -R # reset the livelist sublist size to its original value set_tunable64 LIVELIST_MAX_ENTRIES $ORIGINAL_MAX + log_must zfs inherit compression $TESTPOOL } function clone_write_file @@ -146,6 +147,11 @@ function test_clone_clone_promote ORIGINAL_MAX=$(get_tunable LIVELIST_MAX_ENTRIES) log_onexit cleanup +# You might think that setting compression=off for $TESTFS1 would be +# sufficient. You would be mistaken. +# You need compression=off for whatever the parent of $TESTFS1 is, +# and $TESTFS1. +log_must zfs set compression=off $TESTPOOL log_must zfs create $TESTPOOL/$TESTFS1 log_must mkfile 20m /$TESTPOOL/$TESTFS1/atestfile log_must zfs snapshot $TESTPOOL/$TESTFS1@snap diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_dev_removal_condense.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_dev_removal_condense.ksh index b4f2740c7a..fa5ebb6cce 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_dev_removal_condense.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_dev_removal_condense.ksh @@ -53,7 +53,7 @@ VIRTUAL_DISK2=$TEST_BASE_DIR/disk2 log_must truncate -s $(($MINVDEVSIZE * 8)) $VIRTUAL_DISK1 log_must truncate -s $(($MINVDEVSIZE * 16)) $VIRTUAL_DISK2 -log_must zpool create $TESTPOOL2 $VIRTUAL_DISK1 +log_must zpool create -O compression=off $TESTPOOL2 $VIRTUAL_DISK1 log_must poolexists $TESTPOOL2 log_must zfs create $TESTPOOL2/$TESTFS diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_aliases.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_aliases.ksh index d4b0aa2341..6e5b48ffe2 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_aliases.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_aliases.ksh @@ -129,7 +129,7 @@ log_must eval "check_prop_inherit $destsub copies $dest" log_must eval "check_prop_inherit $destsub atime $dest" log_must eval "check_prop_inherit $destsub checksum $dest" log_must eval "check_prop_source $destsub quota 0 default" -log_must eval "check_prop_source $destsub compression off default" +log_must eval "check_prop_source $destsub compression on default" # Cleanup log_must zfs destroy -r -f $orig log_must zfs destroy -r -f $dest diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_override.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_override.ksh index 2d3c15c62f..44fe60463b 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_override.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_override.ksh @@ -135,7 +135,7 @@ log_must eval "check_prop_inherit $destsub atime $dest" log_must eval "check_prop_inherit $destsub checksum $dest" log_must eval "check_prop_inherit $destsub '$userprop:dest2' $dest" log_must eval "check_prop_source $destsub quota 0 default" -log_must eval "check_prop_source $destsub compression off default" +log_must eval "check_prop_source $destsub compression on default" log_must eval "check_prop_missing $dest '$userprop:orig'" log_must eval "check_prop_missing $destsub '$userprop:orig'" log_must eval "check_prop_source " \ diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_rename/setup.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_rename/setup.ksh index 60acbe07ac..788e093fb2 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_rename/setup.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_rename/setup.ksh @@ -42,7 +42,8 @@ if [[ -d $TESTDIR2 ]]; then log_unresolved Could not remove $TESTDIR2 fi fi -log_must zfs create $TESTPOOL/$DATAFS +log_must zfs set compression=off $TESTPOOL/$TESTFS +log_must zfs create -o compression=off $TESTPOOL/$DATAFS log_must zfs set mountpoint=$TESTDIR2 $TESTPOOL/$DATAFS log_must eval "dd if=$IF of=$OF bs=$BS count=$CNT >/dev/null 2>&1" diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_partial.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_partial.ksh index f3b3b0f272..bdbf3db533 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_partial.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_trim/zpool_trim_partial.ksh @@ -64,7 +64,7 @@ log_must set_tunable64 TRIM_EXTENT_BYTES_MIN 4096 log_must mkdir "$TESTDIR" log_must truncate -s $LARGESIZE "$LARGEFILE" -log_must zpool create $TESTPOOL "$LARGEFILE" +log_must zpool create -O compression=off $TESTPOOL "$LARGEFILE" log_must mkfile $(( floor(LARGESIZE * 0.80) )) /$TESTPOOL/file sync_all_pools diff --git a/tests/zfs-tests/tests/functional/events/cleanup.ksh b/tests/zfs-tests/tests/functional/events/cleanup.ksh index 699bc28233..72570d9288 100755 --- a/tests/zfs-tests/tests/functional/events/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/events/cleanup.ksh @@ -28,4 +28,6 @@ zed_cleanup all-debug.sh all-syslog.sh all-dumpfds +zed_stop + default_cleanup diff --git a/tests/zfs-tests/tests/functional/events/events_002_pos.ksh b/tests/zfs-tests/tests/functional/events/events_002_pos.ksh index af2be33dbc..9407656b6e 100755 --- a/tests/zfs-tests/tests/functional/events/events_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/events/events_002_pos.ksh @@ -62,7 +62,7 @@ log_must truncate -s $MINVDEVSIZE $VDEV1 $VDEV2 # 1. Create a pool and generate some events. log_must truncate -s 0 $ZED_DEBUG_LOG log_must zpool events -c -log_must zpool create $MPOOL mirror $VDEV1 $VDEV2 +log_must zpool create -O compression=off $MPOOL mirror $VDEV1 $VDEV2 # 2. Start the ZED and verify it handles missed events. log_must zed_start diff --git a/tests/zfs-tests/tests/functional/events/zed_fd_spill.ksh b/tests/zfs-tests/tests/functional/events/zed_fd_spill.ksh index 8736a7fdf7..4ae136d0f3 100755 --- a/tests/zfs-tests/tests/functional/events/zed_fd_spill.ksh +++ b/tests/zfs-tests/tests/functional/events/zed_fd_spill.ksh @@ -47,8 +47,14 @@ log_onexit cleanup logdir="$(mktemp -d)" log_must ln -s "$logdir" /tmp/zts-zed_fd_spill-logdir + self="$(readlink -f "$0")" -log_must ln -s "${self%/*}/zed_fd_spill-zedlet" "${ZEDLET_DIR}/all-dumpfds" +zedlet="${self%/*}/zed_fd_spill-zedlet" +log_must ln -s $zedlet "${ZEDLET_DIR}/all-dumpfds" + +# zed will cry foul and refuse to run it if this isn't true +sudo chown root $zedlet +sudo chmod 700 $zedlet log_must zpool events -c log_must zed_stop diff --git a/tests/zfs-tests/tests/functional/fault/decrypt_fault.ksh b/tests/zfs-tests/tests/functional/fault/decrypt_fault.ksh index d81c4b2bd2..a4cf06144e 100755 --- a/tests/zfs-tests/tests/functional/fault/decrypt_fault.ksh +++ b/tests/zfs-tests/tests/functional/fault/decrypt_fault.ksh @@ -40,6 +40,7 @@ function cleanup log_onexit cleanup default_mirror_setup_noexit $DISK1 $DISK2 +log_must zfs set compression=off $TESTPOOL log_must eval "echo 'password' | zfs create -o encryption=on \ -o keyformat=passphrase -o keylocation=prompt $TESTPOOL/fs" mntpt=$(get_prop mountpoint $TESTPOOL/fs) diff --git a/tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh b/tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh index 7c5b812877..95dc7359f2 100755 --- a/tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh @@ -388,12 +388,12 @@ set -A prop "checksum" "" \ # above must have a corresponding entry in the two arrays below. # -set -A def_val "on" "off" "on" \ +set -A def_val "on" "on" "on" \ "off" "" \ "hidden" \ "off" -set -A local_val "off" "on" "off" \ +set -A local_val "off" "off" "off" \ "on" "" \ "visible" \ "off" diff --git a/tests/zfs-tests/tests/functional/projectquota/setup.ksh b/tests/zfs-tests/tests/functional/projectquota/setup.ksh index c81b300e5e..88906d91cd 100755 --- a/tests/zfs-tests/tests/functional/projectquota/setup.ksh +++ b/tests/zfs-tests/tests/functional/projectquota/setup.ksh @@ -53,4 +53,6 @@ fi DISK=${DISKS%% *} default_setup_noexit $DISK +zfs set compression=off $TESTPOOL + log_pass diff --git a/tests/zfs-tests/tests/functional/quota/setup.ksh b/tests/zfs-tests/tests/functional/quota/setup.ksh index 677cb12d79..99a4cb3493 100755 --- a/tests/zfs-tests/tests/functional/quota/setup.ksh +++ b/tests/zfs-tests/tests/functional/quota/setup.ksh @@ -33,4 +33,6 @@ DISK=${DISKS%% *} -default_container_setup $DISK +default_setup_noexit $DISK "true" +log_must zfs set compression=off $TESTPOOL +log_pass diff --git a/tests/zfs-tests/tests/functional/redundancy/redundancy.kshlib b/tests/zfs-tests/tests/functional/redundancy/redundancy.kshlib index 9888034667..55816b4516 100644 --- a/tests/zfs-tests/tests/functional/redundancy/redundancy.kshlib +++ b/tests/zfs-tests/tests/functional/redundancy/redundancy.kshlib @@ -139,7 +139,7 @@ function setup_test_env log_must truncate -s $MINVDEVSIZE $vdevs - log_must zpool create -f -m $TESTDIR $pool $keyword $vdevs + log_must zpool create -O compression=off -f -m $TESTDIR $pool $keyword $vdevs log_note "Filling up the filesystem ..." typeset -i ret=0 diff --git a/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh b/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh index 8015e682c8..b2721707cb 100755 --- a/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh +++ b/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh @@ -219,7 +219,7 @@ for nparity in 1 2 3; do raid=draid$nparity dir=$TEST_BASE_DIR - log_must zpool create -f -o cachefile=none $TESTPOOL $raid ${disks[@]} + log_must zpool create -O compression=off -f -o cachefile=none $TESTPOOL $raid ${disks[@]} log_must zfs set primarycache=metadata $TESTPOOL log_must zfs create $TESTPOOL/fs diff --git a/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged.ksh b/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged.ksh index 6796cc78a1..9b3be9f4e3 100755 --- a/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged.ksh +++ b/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged.ksh @@ -85,7 +85,9 @@ function test_sequential_resilver # for (( i=0; i<$nparity; i=i+1 )); do spare=draid${nparity}-0-$i - log_must zpool replace -fsw $pool $dir/dev-$i $spare + zpool status $pool + zpool replace -fsw $pool $dir/dev-$i $spare + zpool status $pool done log_must zpool scrub -w $pool @@ -128,7 +130,7 @@ for nparity in 1 2 3; do raid=draid${nparity}:${nparity}s dir=$TEST_BASE_DIR - log_must zpool create -f -o cachefile=none $TESTPOOL $raid ${disks[@]} + log_must zpool create -O compression=off -f -o cachefile=none $TESTPOOL $raid ${disks[@]} log_must zfs set primarycache=metadata $TESTPOOL log_must zfs create $TESTPOOL/fs diff --git a/tests/zfs-tests/tests/functional/redundancy/redundancy_raidz.ksh b/tests/zfs-tests/tests/functional/redundancy/redundancy_raidz.ksh index d736883916..7351cfaae5 100755 --- a/tests/zfs-tests/tests/functional/redundancy/redundancy_raidz.ksh +++ b/tests/zfs-tests/tests/functional/redundancy/redundancy_raidz.ksh @@ -219,7 +219,7 @@ for nparity in 1 2 3; do raid=raidz$nparity dir=$TEST_BASE_DIR - log_must zpool create -f -o cachefile=none $TESTPOOL $raid ${disks[@]} + log_must zpool create -O compression=off -f -o cachefile=none $TESTPOOL $raid ${disks[@]} log_must zfs set primarycache=metadata $TESTPOOL log_must zfs create $TESTPOOL/fs diff --git a/tests/zfs-tests/tests/functional/refquota/setup.ksh b/tests/zfs-tests/tests/functional/refquota/setup.ksh index a34453bd38..48bd314cd2 100755 --- a/tests/zfs-tests/tests/functional/refquota/setup.ksh +++ b/tests/zfs-tests/tests/functional/refquota/setup.ksh @@ -33,4 +33,6 @@ verify_runnable "both" DISK=${DISKS%% *} -default_setup $DISK +default_setup_noexit $DISK +log_must zfs set compression=off $TESTPOOL +log_pass diff --git a/tests/zfs-tests/tests/functional/refreserv/refreserv_raidz.ksh b/tests/zfs-tests/tests/functional/refreserv/refreserv_raidz.ksh index 056c7916d9..0c8de79b3f 100755 --- a/tests/zfs-tests/tests/functional/refreserv/refreserv_raidz.ksh +++ b/tests/zfs-tests/tests/functional/refreserv/refreserv_raidz.ksh @@ -98,7 +98,7 @@ for parity in 1 2 3; do continue fi - log_must zpool create "$TESTPOOL" "$raid" "${disks[@]}" + log_must zpool create -O compression=off "$TESTPOOL" "$raid" "${disks[@]}" for bits in "${allshifts[@]}"; do vbs=$((1 << bits)) diff --git a/tests/zfs-tests/tests/functional/refreserv/setup.ksh b/tests/zfs-tests/tests/functional/refreserv/setup.ksh index a34453bd38..48bd314cd2 100755 --- a/tests/zfs-tests/tests/functional/refreserv/setup.ksh +++ b/tests/zfs-tests/tests/functional/refreserv/setup.ksh @@ -33,4 +33,6 @@ verify_runnable "both" DISK=${DISKS%% *} -default_setup $DISK +default_setup_noexit $DISK +log_must zfs set compression=off $TESTPOOL +log_pass diff --git a/tests/zfs-tests/tests/functional/removal/removal_with_errors.ksh b/tests/zfs-tests/tests/functional/removal/removal_with_errors.ksh index 9d5143ef8b..be7364eb2b 100755 --- a/tests/zfs-tests/tests/functional/removal/removal_with_errors.ksh +++ b/tests/zfs-tests/tests/functional/removal/removal_with_errors.ksh @@ -78,6 +78,7 @@ function wait_for_removing_cancel default_setup_noexit "mirror $DISK0 $DISK1 mirror $DISK2 $DISK3" log_onexit cleanup +log_must zfs set compression=off $TESTPOOL FILE_CONTENTS="Leeloo Dallas mul-ti-pass." diff --git a/tests/zfs-tests/tests/functional/removal/removal_with_export.ksh b/tests/zfs-tests/tests/functional/removal/removal_with_export.ksh index f76f76d34f..098a52cb9f 100755 --- a/tests/zfs-tests/tests/functional/removal/removal_with_export.ksh +++ b/tests/zfs-tests/tests/functional/removal/removal_with_export.ksh @@ -22,6 +22,7 @@ . $STF_SUITE/tests/functional/removal/removal.kshlib default_setup_noexit "$DISKS" +log_must zfs set compression=off $TESTPOOL log_onexit default_cleanup_noexit function callback diff --git a/tests/zfs-tests/tests/functional/reservation/setup.ksh b/tests/zfs-tests/tests/functional/reservation/setup.ksh index c390347835..6b5128c645 100755 --- a/tests/zfs-tests/tests/functional/reservation/setup.ksh +++ b/tests/zfs-tests/tests/functional/reservation/setup.ksh @@ -32,4 +32,5 @@ . $STF_SUITE/include/libtest.shlib default_setup_noexit ${DISKS%% *} +zfs set compression=off $TESTPOOL log_pass diff --git a/tests/zfs-tests/tests/functional/rsend/rsend_009_pos.ksh b/tests/zfs-tests/tests/functional/rsend/rsend_009_pos.ksh index 7d858d92d5..5712cb5134 100755 --- a/tests/zfs-tests/tests/functional/rsend/rsend_009_pos.ksh +++ b/tests/zfs-tests/tests/functional/rsend/rsend_009_pos.ksh @@ -60,8 +60,8 @@ log_onexit cleanup log_must mkfile $MINVDEVSIZE $TESTDIR/bfile log_must mkfile $SPA_MINDEVSIZE $TESTDIR/sfile -log_must zpool create bpool $TESTDIR/bfile -log_must zpool create spool $TESTDIR/sfile +log_must zpool create -O compression=off bpool $TESTDIR/bfile +log_must zpool create -O compression=off spool $TESTDIR/sfile # # Test out of space on sub-filesystem diff --git a/tests/zfs-tests/tests/functional/rsend/send_partial_dataset.ksh b/tests/zfs-tests/tests/functional/rsend/send_partial_dataset.ksh index c390327a5b..f2e54c8c19 100755 --- a/tests/zfs-tests/tests/functional/rsend/send_partial_dataset.ksh +++ b/tests/zfs-tests/tests/functional/rsend/send_partial_dataset.ksh @@ -46,7 +46,7 @@ function cleanup } log_onexit cleanup -log_must zfs create $POOL/testfs2 +log_must zfs create -o compression=off $POOL/testfs2 log_must zfs create $POOL/stream mntpnt=$(get_prop mountpoint $POOL/testfs2) diff --git a/tests/zfs-tests/tests/functional/snapshot/snapshot_014_pos.ksh b/tests/zfs-tests/tests/functional/snapshot/snapshot_014_pos.ksh index d48d404b6d..384377c7f6 100755 --- a/tests/zfs-tests/tests/functional/snapshot/snapshot_014_pos.ksh +++ b/tests/zfs-tests/tests/functional/snapshot/snapshot_014_pos.ksh @@ -56,11 +56,14 @@ function cleanup datasetexists $TESTPOOL/$TESTCTR/$TESTFS1 && \ log_must zfs set quota=none $TESTPOOL/$TESTCTR/$TESTFS1 + zfs inherit compression $TESTPOOL } log_assert "Verify creating/destroying snapshots do things clean" log_onexit cleanup +log_must zfs set compression=off $TESTPOOL + log_must zfs set quota=$FSQUOTA $TESTPOOL/$TESTCTR/$TESTFS1 log_must mkfile $FILESIZE $TESTDIR1/$TESTFILE diff --git a/tests/zfs-tests/tests/functional/userquota/setup.ksh b/tests/zfs-tests/tests/functional/userquota/setup.ksh index d4b3cdcaba..2c609c9eb5 100755 --- a/tests/zfs-tests/tests/functional/userquota/setup.ksh +++ b/tests/zfs-tests/tests/functional/userquota/setup.ksh @@ -53,4 +53,6 @@ if [ $? -ne 0 ]; then fi DISK=${DISKS%% *} -default_setup $DISK +default_setup_noexit $DISK +log_must zfs set compression=off $TESTPOOL +log_pass diff --git a/tests/zfs-tests/tests/functional/userquota/userspace_send_encrypted.ksh b/tests/zfs-tests/tests/functional/userquota/userspace_send_encrypted.ksh index e9ef0c4262..a9ff051747 100755 --- a/tests/zfs-tests/tests/functional/userquota/userspace_send_encrypted.ksh +++ b/tests/zfs-tests/tests/functional/userquota/userspace_send_encrypted.ksh @@ -52,7 +52,7 @@ log_assert "Sending raw encrypted datasets back to the source dataset succeeds." # Setup pool and create source truncate -s 200m $FILEDEV -log_must zpool create -o feature@encryption=enabled $POOLNAME \ +log_must zpool create -O compression=off -o feature@encryption=enabled $POOLNAME \ $FILEDEV log_must eval "echo 'password' | zfs create -o encryption=on" \ "-o keyformat=passphrase -o keylocation=prompt " \ diff --git a/tests/zfs-tests/tests/functional/write_dirs/setup.ksh b/tests/zfs-tests/tests/functional/write_dirs/setup.ksh index a14eab27e9..c89cb8678c 100755 --- a/tests/zfs-tests/tests/functional/write_dirs/setup.ksh +++ b/tests/zfs-tests/tests/functional/write_dirs/setup.ksh @@ -35,4 +35,6 @@ verify_runnable "global" DISK=$TEST_BASE_DIR/disk0 truncate -s 2G $DISK -default_setup $DISK +default_setup_noexit $DISK +log_must zfs set compression=off $TESTPOOL +log_pass diff --git a/tests/zfs-tests/tests/functional/xattr/setup.ksh b/tests/zfs-tests/tests/functional/xattr/setup.ksh index d9228c4265..7ad36a7143 100755 --- a/tests/zfs-tests/tests/functional/xattr/setup.ksh +++ b/tests/zfs-tests/tests/functional/xattr/setup.ksh @@ -52,4 +52,6 @@ echo $ZFS_USER > $TEST_BASE_DIR/zfs-xattr-test-user.txt echo $USES_NIS > $TEST_BASE_DIR/zfs-xattr-test-nis.txt DISK=${DISKS%% *} -default_setup $DISK +default_setup_noexit $DISK +log_must zfs set compression=off $TESTPOOL +log_pass "Setup complete"