diff options
| author | Brian Behlendorf <[email protected]> | 2022-02-17 12:09:06 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-02-17 12:09:06 -0800 |
| commit | 7901b62685e91cb5b6d28346e6ffb7e6456326bb (patch) | |
| tree | 68c7b7e07652b7856cf14cd5628ed493fab8b810 | |
| parent | 5eae5a88b258cf955b46a99da07d9d5acad8bacd (diff) | |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #13112
Closes #6935
| -rwxr-xr-x | tests/test-runner/bin/zts-report.py.in | 1 | ||||
| -rwxr-xr-x | tests/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_004_pos.ksh | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in index f3a454722..74a6a1b4d 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 a84de6577..b7468e4c3 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. |