diff options
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zpool/zpool_002_pos.ksh | 37 | ||||
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos.ksh | 39 |
2 files changed, 43 insertions, 33 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_002_pos.ksh index 9440e807f..caf8a9a2d 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_002_pos.ksh @@ -47,31 +47,32 @@ function cleanup { unset ZFS_ABORT - if [[ -d $corepath ]]; then - rm -rf $corepath + if is_freebsd && [ -n "$old_corefile" ]; then + sysctl kern.corefile=$old_corefile fi - if poolexists $pool; then - log_must zpool destroy -f $pool - fi + # Clean up the pool created if we failed to abort. + poolexists $pool && destroy_pool $pool + + rm -rf $corepath $vdev1 $vdev2 $vdev3 } log_assert "With ZFS_ABORT set, all zpool commands can abort and generate a core file." log_onexit cleanup -#preparation work for testing corepath=$TESTDIR/core +corefile=$corepath/zpool.core if [[ -d $corepath ]]; then - rm -rf $corepath + log_must rm -rf $corepath fi -mkdir $corepath +log_must mkdir $corepath pool=pool.$$ vdev1=$TESTDIR/file1 vdev2=$TESTDIR/file2 vdev3=$TESTDIR/file3 for vdev in $vdev1 $vdev2 $vdev3; do - mkfile $MINVDEVSIZE $vdev + log_must mkfile $MINVDEVSIZE $vdev done set -A cmds "create $pool mirror $vdev1 $vdev2" "list $pool" "iostat $pool" \ @@ -86,27 +87,25 @@ set -A badparams "" "create" "destroy" "add" "remove" "list *" "iostat" "status" "import" "export" "upgrade" "history -?" "get" "set" if is_linux; then - ulimit -c unlimited - echo "$corepath/core.zpool" >/proc/sys/kernel/core_pattern + echo $corefile >/proc/sys/kernel/core_pattern echo 0 >/proc/sys/kernel/core_uses_pid - export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0" elif is_freebsd; then - ulimit -c unlimited - log_must sysctl kern.corefile=$corepath/core.zpool - export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0" -else - coreadm -p ${corepath}/core.%f + old_corefile=$(sysctl -n kern.corefile) + log_must sysctl kern.corefile=$corefile fi +ulimit -c unlimited +export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0" export ZFS_ABORT=yes for subcmd in "${cmds[@]}" "${badparams[@]}"; do - corefile=${corepath}/core.zpool zpool $subcmd >/dev/null 2>&1 if [[ ! -e $corefile ]]; then - log_fail "zpool $subcmd cannot generate core file with ZFS_ABORT set." + log_fail "zpool $subcmd cannot generate core file with ZFS_ABORT set." fi rm -f $corefile done +unset ZFS_ABORT + log_pass "With ZFS_ABORT set, zpool command can abort and generate core file as expected." diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos.ksh index d51633745..71d73c0f8 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_003_pos.ksh @@ -44,9 +44,17 @@ function cleanup { + unset ZFS_ABORT + if is_freebsd && [ -n "$old_corefile" ]; then sysctl kern.corefile=$old_corefile fi + + rm -rf $corepath + + # Don't leave the pool frozen. + destroy_pool $TESTPOOL + default_mirror_setup $DISKS } verify_runnable "both" @@ -54,7 +62,14 @@ verify_runnable "both" log_assert "Debugging features of zpool should succeed." log_onexit cleanup -log_must zpool -? > /dev/null 2>&1 +corepath=$TESTDIR/core +corefile=$corepath/zpool.core +if [[ -d $corepath ]]; then + log_must rm -rf $corepath +fi +log_must mkdir $corepath + +log_must eval "zpool -? >/dev/null 2>&1" if is_global_zone ; then log_must zpool freeze $TESTPOOL @@ -65,26 +80,22 @@ fi log_mustnot zpool freeze fakepool -# Remove corefile possibly left by previous failing run of this test. -[[ -f core ]] && log_must rm -f core - if is_linux; then - ulimit -c unlimited - echo "core" >/proc/sys/kernel/core_pattern + echo $corefile >/proc/sys/kernel/core_pattern echo 0 >/proc/sys/kernel/core_uses_pid - export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0" elif is_freebsd; then - ulimit -c unlimited old_corefile=$(sysctl -n kern.corefile) - log_must sysctl kern.corefile=core - export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0" + log_must sysctl kern.corefile=$corefile fi +ulimit -c unlimited + +export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0" +export ZFS_ABORT=yes + +zpool >/dev/null 2>&1 -ZFS_ABORT=1; export ZFS_ABORT -zpool > /dev/null 2>&1 unset ZFS_ABORT -[[ -f core ]] || log_fail "zpool did not dump core by request." -[[ -f core ]] && log_must rm -f core +[[ -f $corefile ]] || log_fail "zpool did not dump core by request." log_pass "Debugging features of zpool succeed." |