From 4f8b2356cc98a3cfed2da21c56789593dc8c684f Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Wed, 27 May 2020 20:18:06 -0400 Subject: [PATCH] ZTS: Retry export/destroy when busy in zpool_import_012 It can take a moment for the NFS server to give up the mountpoint after unsharing a filesystem. Use log_must_busy to retry export/destroy a few times after switching off sharenfs. Reviewed-by: Brian Behlendorf Reviewed-by: Igor Kozhukhov Reviewed-by: George Melikov Signed-off-by: Ryan Moeller Closes #10380 --- .../functional/cli_root/zpool_import/zpool_import_012_pos.ksh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_012_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_012_pos.ksh index 222c4aebe..a568948e3 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_012_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_012_pos.ksh @@ -147,9 +147,9 @@ for option in "" "-Df"; do while ((guid_bit <= 1)); do typeset guid_flag="pool name" if [[ -z $option ]]; then - log_must zpool export $pool + log_must_busy zpool export $pool else - log_must zpool destroy $pool + log_must_busy zpool destroy $pool fi typeset target=$pool