Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debug ZVOL open deadlock #6168

Closed
wants to merge 1 commit into from
Closed

Debug ZVOL open deadlock #6168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions TEST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
#TEST_SPLAT_OPTIONS="-acvx"

### ztest
#TEST_ZTEST_SKIP="yes"
TEST_ZTEST_SKIP="yes"
#TEST_ZTEST_TIMEOUT=1800
#TEST_ZTEST_DIR="/var/tmp/"
#TEST_ZTEST_OPTIONS="-V"

### zimport
#TEST_ZIMPORT_SKIP="yes"
TEST_ZIMPORT_SKIP="yes"
#TEST_ZIMPORT_DIR="/var/tmp/zimport"
#TEST_ZIMPORT_VERSIONS="master installed"
#TEST_ZIMPORT_POOLS="zol-0.6.1 zol-0.6.2 master installed"
#TEST_ZIMPORT_OPTIONS="-c"

### xfstests
#TEST_XFSTESTS_SKIP="yes"
TEST_XFSTESTS_SKIP="yes"
#TEST_XFSTESTS_URL="https://github.com/behlendorf/xfstests/archive/"
#TEST_XFSTESTS_VER="zfs.tar.gz"
#TEST_XFSTESTS_POOL="tank"
Expand All @@ -33,7 +33,7 @@
#TEST_ZFSTESTS_SKIP="yes"
#TEST_ZFSTESTS_DISKS="vdb vdc vdd"
#TEST_ZFSTESTS_DISKSIZE="8G"
#TEST_ZFSTESTS_RUNFILE="linux.run"
TEST_ZFSTESTS_RUNFILE="zvol-open-deadlock.run"

### filebench
#TEST_FILEBENCH_SKIP="yes"
Expand All @@ -47,7 +47,7 @@
#TEST_FILEBENCH_OPTIONS=""

### zfsstress
#TEST_ZFSSTRESS_SKIP="yes"
TEST_ZFSSTRESS_SKIP="yes"
#TEST_ZFSSTRESS_URL="https://github.com/nedbass/zfsstress/archive/"
#TEST_ZFSSTRESS_VER="master.tar.gz"
#TEST_ZFSSTRESS_RUNTIME=300
Expand Down
41 changes: 41 additions & 0 deletions tests/runfiles/zvol-open-deadlock.run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#

[DEFAULT]
pre = setup
quiet = False
pre_user = root
user = root
timeout = 30
post_user = root
post = cleanup
outputdir = /var/tmp/test_results

[tests/functional/cli_root/zpool_destroy]
tests = ['zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos']
pre =
post =
4 changes: 3 additions & 1 deletion tests/test-runner/include/logapi.shlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

. ${STF_TOOLS}/include/stf.shlib

trap 'log_timed_out "Test killed by SIGTERM' TERM

# Output an assertion
#
# $@ - assertion text
Expand Down Expand Up @@ -418,7 +420,7 @@ function _endlog
typeset logfile="/tmp/log.$$"
_recursive_output $logfile

if [[ $1 == $STF_FAIL ]] ; then
if [[ $1 == $STF_FAIL ]] || [[ $1 == $STF_TIMED_OUT ]]; then
_execute_testfail_callbacks
fi

Expand Down
6 changes: 0 additions & 6 deletions tests/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@

verify_runnable "global"

# https://github.com/zfsonlinux/zfs/issues/6145
if is_linux; then
log_unsupported "Test case occasionally fails"
fi

function cleanup
{
poolexists $TESTPOOL2 && destroy_pool $TESTPOOL2
Expand All @@ -71,7 +66,6 @@ if ! $(is_physical_device $DISKS) ; then
fi

log_assert "'zpool destroy <pool>' can destroy a specified pool."

log_onexit cleanup

partition_disk $SLICE_SIZE $DISK 2
Expand Down