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: Fix upgrade_readonly_pool #9400

Merged
merged 1 commit into from
Oct 3, 2019
Merged

ZTS: Fix upgrade_readonly_pool #9400

merged 1 commit into from
Oct 3, 2019

Conversation

behlendorf
Copy link
Contributor

Motivation and Context

http://build.zfsonlinux.org/builders/Debian%209%20x86_64%20%28TEST%29/builds/5528/steps/shell_9/logs/summary

Description

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:

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

How Has This Been Tested?

Pending full CI run.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation (a change to man pages or other documentation)

Checklist:

@behlendorf
ZTS: Fix upgrade_readonly_pool
d929ebf 
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:

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

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
@behlendorf behlendorf added Component: Test Suite Indicates an issue with the test framework or a test case Status: Code Review Needed Ready for review and testing labels Oct 2, 2019
@codecov
Copy link

codecov bot commented Oct 3, 2019 •
edited
Loading

Codecov Report

Merging #9400 into master will increase coverage by 12.47%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #9400       +/-   ##
===========================================
+ Coverage   66.62%   79.09%   +12.47%     
===========================================
  Files         326      404       +78     
  Lines      105097   122527    +17430     
===========================================
+ Hits        70017    96914    +26897     
+ Misses      35080    25613     -9467
Flag Coverage Δ
#kernel 79.75% <ø> (?)
#user 66.81% <ø> (+0.19%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8ae8b2a...d929ebf. Read the comment docs.

ghost
ghost approved these changes Oct 3, 2019
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's like that function was made for this!

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Oct 3, 2019
@behlendorf behlendorf merged commit e1c216f into openzfs:master Oct 3, 2019
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Dec 26, 2019
@behlendorf @tonyhutter
ZTS: Fix upgrade_readonly_pool
d2664a6 
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 openzfs#9400
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Dec 27, 2019
@behlendorf @tonyhutter
ZTS: Fix upgrade_readonly_pool
1ed0d0e 
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 openzfs#9400
tonyhutter pushed a commit that referenced this pull request Jan 23, 2020
@behlendorf @tonyhutter
ZTS: Fix upgrade_readonly_pool
05e2a4c 
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
@behlendorf behlendorf deleted the upgrade_readonly_pool branch April 19, 2021 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ikozhukhov ikozhukhov ikozhukhov approved these changes

@jwk404 jwk404 jwk404 approved these changes

Assignees
No one assigned
Labels
Component: Test Suite Indicates an issue with the test framework or a test case Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@behlendorf @jwk404 @ikozhukhov