From 802715b74a23a58d66028699a99eb141c85b7447 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 17 Aug 2018 10:01:47 -0700 Subject: [PATCH] ZTS: Fix reservation_001_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: George Melikov Signed-off-by: Brian Behlendorf Closes #7796 --- .../tests/functional/reservation/reservation_001_pos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/zfs-tests/tests/functional/reservation/reservation_001_pos.sh b/tests/zfs-tests/tests/functional/reservation/reservation_001_pos.sh index d142fe0cc..b72b8e4a3 100755 --- a/tests/zfs-tests/tests/functional/reservation/reservation_001_pos.sh +++ b/tests/zfs-tests/tests/functional/reservation/reservation_001_pos.sh @@ -54,7 +54,7 @@ verify_runnable "both" function cleanup { for obj in $OBJ_LIST; do - datasetexists $obj && log_must zfs destroy -f $obj + destroy_dataset $obj done } -- 2.40.0