diff options
author | Brian Behlendorf <[email protected]> | 2017-05-18 20:21:15 -0400 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2017-05-22 12:34:32 -0400 |
commit | 95401cb6f7aa9ec3dd2d61335d2dcc9459c2661c (patch) | |
tree | ea97f7ec3304f671baac8e0d6c7ab67965f80ecf /tests/zfs-tests/include | |
parent | f871ab6ea2dd9a3b9fae157ff0a7665bb269c565 (diff) |
Enable remaining tests
Enable most of the remaining test cases which were previously
disabled. The required fixes are as follows:
* cache_001_pos - No changes required.
* cache_010_neg - Updated to use losetup under Linux. Loopback
cache devices are allowed, ZVOLs as cache devices are not.
Disabled until all the builders pass reliably.
* cachefile_001_pos, cachefile_002_pos, cachefile_003_pos,
cachefile_004_pos - Set set_device_dir path in cachefile.cfg,
updated CPATH1 and CPATH2 to reference unique files.
* zfs_clone_005_pos - Wait for udev to create volumes.
* zfs_mount_007_pos - Updated mount options to expected Linux names.
* zfs_mount_009_neg, zfs_mount_all_001_pos - No changes required.
* zfs_unmount_005_pos, zfs_unmount_009_pos, zfs_unmount_all_001_pos -
Updated to expect -f to not unmount busy mount points under Linux.
* rsend_019_pos - Observed to occasionally take a long time on both
32-bit systems and the kmemleak builder.
* zfs_written_property_001_pos - Switched sync(1) to sync_pool.
* devices_001_pos, devices_002_neg - Updated create_dev_file() helper
for Linux.
* exec_002_neg.ksh - Fixed mmap_exec.c to preserve errno. Updated
test case to expect EPERM from Linux as described by mmap(2).
* grow_pool_001_pos - Adding missing setup.ksh and cleanup.ksh
scripts from OpenZFS.
* grow_replicas_001_pos.ksh - Added missing $SLICE_* variables.
* history_004_pos, history_006_neg, history_008_pos - Fixed by
previous commits and were not enabled. No changes required.
* zfs_allow_010_pos - Added missing spaces after assorted zfs
commands in delegate_common.kshlib.
* inuse_* - Illumos dump device tests skipped. Remaining test
cases updated to correctly create required partitions.
* large_files_001_pos - Fixed largest_file.c to accept EINVAL
as well as EFBIG as described in write(2).
* link_count_001 - Added nproc to required commands.
* umountall_001 - Updated to use umount -a.
* online_offline_001_* - Pull in OpenZFS change to file_trunc.c
to make the '-c 0' option run the test in a loop. Included
online_offline.cfg file in all test cases.
* rename_dirs_001_pos - Updated to use the rename_dir test binary,
pkill restricted to exact matches and total runtime reduced.
* slog_013_neg, write_dirs_002_pos - No changes required.
* slog_013_pos.ksh - Updated to use losetup under Linux.
* slog_014_pos.ksh - ZED will not be running, manually degrade
the damaged vdev as expected.
* nopwrite_varying_compression, nopwrite_volume - Forced pool
sync with sync_pool to ensure up to date property values.
* Fixed typos in ZED log messages. Refactored zed_* helper
functions to resolve all-syslog exit=1 errors in zedlog.
* zfs_copies_005_neg, zfs_get_004_pos, zpool_add_004_pos,
zpool_destroy_001_pos, largest_pool_001_pos, clone_001_pos.ksh,
clone_001_pos, - Skip until layering pools on zvols is solid.
* largest_pool_001_pos - Limited to 7eb pool, maximum
supported size in 8eb-1 on Linux.
* zpool_expand_001_pos, zpool_expand_003_neg - Requires
additional support from the ZED, updated skip reason.
* zfs_rollback_001_pos, zfs_rollback_002_pos - Properly cleanup
busy mount points under Linux between test loops.
* privilege_001_pos, privilege_003_pos, rollback_003_pos,
threadsappend_001_pos - Skip with log_unsupported.
* snapshot_016_pos - No changes required.
* snapshot_008_pos - Increased LIMIT from 512K to 2M and added
sync_pool to avoid false positives.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #6128
Diffstat (limited to 'tests/zfs-tests/include')
-rw-r--r-- | tests/zfs-tests/include/commands.cfg | 3 | ||||
-rw-r--r-- | tests/zfs-tests/include/default.cfg | 6 | ||||
-rw-r--r-- | tests/zfs-tests/include/libtest.shlib | 107 |
3 files changed, 87 insertions, 29 deletions
diff --git a/tests/zfs-tests/include/commands.cfg b/tests/zfs-tests/include/commands.cfg index e458f4197..968ab3cd1 100644 --- a/tests/zfs-tests/include/commands.cfg +++ b/tests/zfs-tests/include/commands.cfg @@ -44,6 +44,7 @@ export SYSTEM_FILES='arp getconf getent getfacl + getfattr grep groupadd groupdel @@ -58,6 +59,7 @@ export SYSTEM_FILES='arp ksh ln logname + losetup ls lsblk lsmod @@ -72,6 +74,7 @@ export SYSTEM_FILES='arp mpstat mv net + nproc openssl parted pax diff --git a/tests/zfs-tests/include/default.cfg b/tests/zfs-tests/include/default.cfg index 4556b2cf6..84edce737 100644 --- a/tests/zfs-tests/include/default.cfg +++ b/tests/zfs-tests/include/default.cfg @@ -172,7 +172,11 @@ if is_linux; then ZVOL_RDEVDIR="/dev/zvol" DEV_RDSKDIR="/dev" DEV_MPATHDIR="/dev/mapper" + ZEDLET_DIR="/var/tmp/zed" + VDEVID_CONF="$ZEDLET_DIR/vdev_id.conf" + VDEVID_CONF_ETC="/etc/zfs/vdev_id.conf" + NEWFS_DEFAULT_FS="ext2" else @@ -191,4 +195,4 @@ else fi export unpack_opts pack_opts verbose unpack_preserve pack_preserve \ ZVOL_DEVDIR ZVOL_RDEVDIR NEWFS_DEFAULT_FS DEV_RDSKDIR DEV_MPATHDIR \ - ZEDLET_DIR + ZEDLET_DIR VDEVID_CONF VDEVID_CONF_ETC diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index 5a9da2735..56f765d20 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -751,6 +751,8 @@ function zero_partitions #<whole_disk_name> set_partition $i "" 0mb $diskname done fi + + return 0 } # @@ -3253,31 +3255,83 @@ function wait_replacing #pool } # +# Setup custom environment for the ZED. +# +function zed_setup +{ + if ! is_linux; then + return + fi + + if [[ ! -d $ZEDLET_DIR ]]; then + log_must mkdir $ZEDLET_DIR + fi + + if [[ ! -e $VDEVID_CONF ]]; then + log_must touch $VDEVID_CONF + fi + + if [[ -e $VDEVID_CONF_ETC ]]; then + log_fail "Must not have $VDEVID_CONF_ETC file present on system" + fi + + # Create a symlink for /etc/zfs/vdev_id.conf file. + log_must ln -s $VDEVID_CONF $VDEVID_CONF_ETC + + # Setup minimal ZED configuration. Individual test cases should + # add additional ZEDLETs as needed for their specific test. + log_must cp ${ZEDLETDIR}/zed.rc $ZEDLET_DIR + log_must cp ${ZEDLETDIR}/zed-functions.sh $ZEDLET_DIR + log_must cp ${ZEDLETDIR}/all-syslog.sh $ZEDLET_DIR + + log_must zpool events -c +} + +# +# Cleanup custom ZED environment. +# +function zed_cleanup +{ + if ! is_linux; then + return + fi + + log_must rm -f ${ZEDLET_DIR}/zed.rc + log_must rm -f ${ZEDLET_DIR}/zed-functions.sh + log_must rm -f ${ZEDLET_DIR}/all-syslog.sh + log_must rm -f ${ZEDLET_DIR}/zed.pid + log_must rm -f ${ZEDLET_DIR}/zedlog + log_must rm -f ${ZEDLET_DIR}/state + log_must rm -f $VDEVID_CONF_ETC + log_must rm -f $VDEVID_CONF + rmdir $ZEDLET_DIR +} + +# # Check if ZED is currently running, if not start ZED. # function zed_start { - if is_linux; then - # ZEDLET_DIR=/var/tmp/zed - if [[ ! -d $ZEDLET_DIR ]]; then - log_must mkdir $ZEDLET_DIR - fi - - # Verify the ZED is not already running. - pgrep -x zed > /dev/null - if (($? == 0)); then - log_fail "ZED already running" - fi + if ! is_linux; then + return + fi - # ZEDLETDIR=</etc/zfs/zed.d | ${SRCDIR}/cmd/zed/zed.d> - log_must cp ${ZEDLETDIR}/all-syslog.sh $ZEDLET_DIR + # ZEDLET_DIR=/var/tmp/zed + if [[ ! -d $ZEDLET_DIR ]]; then + log_must mkdir $ZEDLET_DIR + fi - log_note "Starting ZED" - # run ZED in the background and redirect foreground logging - # output to zedlog - log_must eval "zed -vF -d $ZEDLET_DIR -p $ZEDLET_DIR/zed.pid" \ - "-s $ZEDLET_DIR/state 2>${ZEDLET_DIR}/zedlog &" + # Verify the ZED is not already running. + pgrep -x zed > /dev/null + if (($? == 0)); then + log_fail "ZED already running" fi + + log_note "Starting ZED" + # run ZED in the background and redirect foreground logging + # output to zedlog + log_must eval "zed -vF -d $ZEDLET_DIR -p $ZEDLET_DIR/zed.pid" \ + "-s $ZEDLET_DIR/state 2>${ZEDLET_DIR}/zedlog &" } # @@ -3285,16 +3339,13 @@ function zed_start # function zed_stop { - if is_linux; then - if [[ -f ${ZEDLET_DIR}/zed.pid ]]; then - zedpid=$(cat ${ZEDLET_DIR}/zed.pid) - log_must kill $zedpid - fi - log_must rm -f ${ZEDLET_DIR}/all-syslog.sh - log_must rm -f ${ZEDLET_DIR}/zed.pid - log_must rm -f ${ZEDLET_DIR}/zedlog - log_must rm -f ${ZEDLET_DIR}/state - log_must rmdir $ZEDLET_DIR + if ! is_linux; then + return + fi + + if [[ -f ${ZEDLET_DIR}/zed.pid ]]; then + zedpid=$(cat ${ZEDLET_DIR}/zed.pid) + log_must kill $zedpid fi } |