]> granicus.if.org Git - zfs/commit
ZTS: Fix upgrade_readonly_pool
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 3 Oct 2019 16:39:13 +0000 (09:39 -0700)
committerGitHub <noreply@github.com>
Thu, 3 Oct 2019 16:39:13 +0000 (09:39 -0700)
commite1c216fb0c33209471b51f80ba3a1ce8910913c7
tree5b820a86d6e1739af3807482d4d2bb1d5933a6c0
parent8ae8b2a1445bcccee1bb8ee7d4886f30050f6f53
ZTS: Fix upgrade_readonly_pool

Update cleanup_upgrade to use destroy_dataset and destroy_pool
when performing cleanup.  These wrappers retry if the pool is busy
preventing occasional failures like those observed when running
tests upgrade_readonly_pool.  For example:

    SUCCESS: test enabled == enabled
    User accounting upgrade is not executed on readonly pool
    NOTE: Performing local cleanup via log_onexit (cleanup_upgrade)
    cannot destroy 'testpool': pool is busy
    ERROR: zpool destroy testpool exited 1

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #9400
tests/zfs-tests/tests/functional/upgrade/upgrade_common.kshlib