From b719768e35fdd6d4052546338453cee0713a1a3c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 30 Jul 2018 09:23:45 -0700 Subject: ZTS: Fix reservation_017_pos It's possible for an unrelated process, like blkid, to have the volume open when 'zfs destroy' is run. Switch the cleanup function to the destroy_dataset() helper which handles this case by retrying the destroy when the dataset is busy. Reviewed-by: Giuseppe Di Natale Reviewed-by: George Melikov Signed-off-by: Brian Behlendorf Closes #7750 --- tests/zfs-tests/tests/functional/reservation/reservation_017_pos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/zfs-tests') diff --git a/tests/zfs-tests/tests/functional/reservation/reservation_017_pos.sh b/tests/zfs-tests/tests/functional/reservation/reservation_017_pos.sh index dc31c5a8f..bb3af67d2 100755 --- a/tests/zfs-tests/tests/functional/reservation/reservation_017_pos.sh +++ b/tests/zfs-tests/tests/functional/reservation/reservation_017_pos.sh @@ -55,7 +55,7 @@ function cleanup typeset vol for vol in $regvol $sparsevol; do - datasetexists $vol && log_must zfs destroy $vol + destroy_dataset $vol done } log_onexit cleanup -- cgit v1.2.3