Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ZTS: Fix DEV_DSKDIR trim from disk 

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Elling <Richard.Elling@RichardElling.com>
Closes #7848
This commit is contained in:
Richard Elling 2018-08-30 14:43:37 -07:00 committed by Brian Behlendorf
parent de61daa597
commit 6fa1e1e73a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/zfs-tests/include/libtest.shlib
View File

@ -2006,7 +2006,7 @@ function check_hotspare_state # pool disk state{inuse,avail}
function wait_hotspare_state # pool disk state timeout function wait_hotspare_state # pool disk state timeout
{ {
typeset pool=$1 typeset pool=$1
typeset disk=${2#$/DEV_DSKDIR/} typeset disk=${2#*$DEV_DSKDIR/}
typeset state=$3 typeset state=$3
typeset timeout=${4:-60} typeset timeout=${4:-60}
typeset -i i=0 typeset -i i=0
@ -2050,7 +2050,7 @@ function check_slog_state # pool disk state{online,offline,unavail}
function check_vdev_state # pool disk state{online,offline,unavail} function check_vdev_state # pool disk state{online,offline,unavail}
{ {
typeset pool=$1 typeset pool=$1
typeset disk=${2#$/DEV_DSKDIR/} typeset disk=${2#*$DEV_DSKDIR/}
typeset state=$3 typeset state=$3
cur_state=$(get_device_state $pool $disk) cur_state=$(get_device_state $pool $disk)
@ -2069,7 +2069,7 @@ function check_vdev_state # pool disk state{online,offline,unavail}
function wait_vdev_state # pool disk state timeout function wait_vdev_state # pool disk state timeout
{ {
typeset pool=$1 typeset pool=$1
typeset disk=${2#$/DEV_DSKDIR/} typeset disk=${2#*$DEV_DSKDIR/}
typeset state=$3 typeset state=$3
typeset timeout=${4:-60} typeset timeout=${4:-60}
typeset -i i=0 typeset -i i=0