From 7901b62685e91cb5b6d28346e6ffb7e6456326bb Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 17 Feb 2022 12:09:06 -0800 Subject: [PATCH] ZTS: Fix vdev_zaps_004_pos.ksh When attaching a vdev to a mirror wait for the resilver to complete before invoking `zdb` to inspect the pool. This ensures the pool is essentially idle which allows `zdb` to open the imported pool reliably. Reviewed-by: John Kennedy Signed-off-by: Brian Behlendorf Closes #13112 Closes #6935 --- tests/test-runner/bin/zts-report.py.in | 1 - tests/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_004_pos.ksh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in index f3a454722b..74a6a1b4d3 100755 --- a/tests/test-runner/bin/zts-report.py.in +++ b/tests/test-runner/bin/zts-report.py.in @@ -259,7 +259,6 @@ maybe = { 'upgrade/upgrade_projectquota_001_pos': ['SKIP', project_id_reason], 'user_namespace/setup': ['SKIP', user_ns_reason], 'userquota/setup': ['SKIP', exec_reason], - 'vdev_zaps/vdev_zaps_004_pos': ['FAIL', '6935'], 'zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos': ['FAIL', '5848'], 'pam/setup': ['SKIP', "pamtester might be not available"], } diff --git a/tests/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_004_pos.ksh b/tests/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_004_pos.ksh index a84de65777..b7468e4c33 100755 --- a/tests/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_004_pos.ksh +++ b/tests/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_004_pos.ksh @@ -50,6 +50,7 @@ assert_zap_common $TESTPOOL $DISK "top" $orig_top disk2=$(echo $DISKS | awk '{print $2}') log_must zpool attach $TESTPOOL $DISK $disk2 +log_must zpool wait -t resilver $TESTPOOL log_must zdb -PC $TESTPOOL > $conf # Ensure top-level ZAP was transferred successfully.