From 037434e4fc5e30f6bb38ce62c7aab8aaa30c6e0b Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 2 Mar 2022 11:03:53 -0800 Subject: [PATCH] ZTS: Fix import_devices_missing.ksh Related to commit 90b77a036. Retry the `zpool export` if the pool is "busy" indicating there is a process accessing the mount point. This can happen after an import, allowing it to be retried will avoid spurious test failures. Reviewed-by: Tony Hutter Signed-off-by: Brian Behlendorf Closes #13169 --- .../cli_root/zpool_import/import_devices_missing.ksh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_devices_missing.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_devices_missing.ksh index 53828c912c..af6ac8d78e 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_devices_missing.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_devices_missing.ksh @@ -68,7 +68,7 @@ function test_devices_missing log_must generate_data $TESTPOOL1 $MD5FILE2 "second" - log_must zpool export $TESTPOOL1 + log_must_busy zpool export $TESTPOOL1 log_must mv $missingvdevs $BACKUP_DEVICE_DIR @@ -85,7 +85,7 @@ function test_devices_missing "get suspended." verify_data_md5sums $MD5FILE >/dev/null 2>&1 - log_must zpool export $TESTPOOL1 + log_must_busy zpool export $TESTPOOL1 typeset newpaths=$(echo "$missingvdevs" | \ sed "s:$DEVICE_DIR:$BACKUP_DEVICE_DIR:g")