Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ZTS: Standardize use of destroy_dataset in cleanup #12663

Merged
merged 7 commits into from
Oct 25, 2021
Merged

ZTS: Standardize use of destroy_dataset in cleanup #12663

merged 7 commits into from
Oct 25, 2021

Commits on Oct 20, 2021

  1. ZTS: Standardize use of destroy_dataset in cleanup 

    When cleaning up a test case standardize on using the convention:

    datasetexists $ds && destroy_dataset $ds <flags>

By using 'destroy_dataset' instead of 'log_must zfs destroy' we ensure
that the destroy is retried in the event that a ZFS volume is busy.
This helps ensures ensure tests are fully cleaned up and prevents false
positive test failures on Linux.

Note that all of the tests which used 'zfs destroy' in cleanup have
been updated even if they don't use volumes.  This was done to
clearly establish the expected convention.

Signed-off-by: Brian Behlendorf <[email protected]>
    @behlendorf
    behlendorf committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    3c01e0b View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2021

  1. Additional cleanup 

    Signed-off-by: Brian Behlendorf <[email protected]>
    @behlendorf
    behlendorf committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    4dcf7d3 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2021

  1. Add missing log_must_busy to zfs_destroy_003_pos 

    This was missed in the first pass of changes but caught by the CI.

Signed-off-by: Brian Behlendorf <[email protected]>
    @behlendorf
    behlendorf committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    4c87cd5 View commit details
    Browse the repository at this point in the history

  2. Add missing log_must_busy to zfs_load-key_all.ksh 

    This issue may also occur when unloading keys.  We made this same
fix to zfs_unload-key_all.ksh so do it here as well.

Signed-off-by: Brian Behlendorf <[email protected]>
    @behlendorf
    behlendorf committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    8115e4c View commit details
    Browse the repository at this point in the history

  3. Fix bootfs_002_neg.ksh cleanup 

    Signed-off-by: Brian Behlendorf <[email protected]>
    @behlendorf
    behlendorf committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    b0df53a View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2021

  1. Update reservation_007_pos, reservation_009_pos 

    Signed-off-by: Brian Behlendorf <[email protected]>
    @behlendorf
    behlendorf committed Oct 23, 2021
    Configuration menu
    Copy the full SHA
    8ddbf8e View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2021

  1. Update zfs_create_crypt_combos.ksh 

    Signed-off-by: Brian Behlendorf <[email protected]>
    @behlendorf
    behlendorf committed Oct 25, 2021
    Configuration menu
    Copy the full SHA
    8d0531d View commit details
    Browse the repository at this point in the history