aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Moeller <[email protected]>2020-05-27 20:18:06 -0400
committerGitHub <[email protected]>2020-05-27 17:18:06 -0700
commit4f8b2356cc98a3cfed2da21c56789593dc8c684f (patch)
tree3d59226ac265a74bb6fd3177119e2a09ddf24562
parent70a5fc053033c21098651c59a13ab0ac535579e9 (diff)
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 <[email protected]> Reviewed-by: Igor Kozhukhov <[email protected]> Reviewed-by: George Melikov <[email protected]> Signed-off-by: Ryan Moeller <[email protected]> Closes #10380
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_012_pos.ksh4
1 files 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