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

[2.2] Additional backports #15318

Merged
merged 8 commits into from
Sep 28, 2023
Merged

[2.2] Additional backports #15318

merged 8 commits into from
Sep 28, 2023

Conversation

behlendorf
Copy link
Contributor

Motivation and Context

Minor fixes to ztest and the ZFS Test Suite to include in 2.2 to keep the CI green.

Description

f26df28 ZTS: Fix introduced test bug in block_cloning_copyfilerange
b74024f ZTS: Add additional exceptions
0dc8183 Set timeout before creating pool in test
3779d67 Invoke zdb by guid to avoid import errors
b253363 ZIL: Avoid dbuf_read() in ztest_get_data()

How Has This Been Tested?

Clean cherry picks from master.

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)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

amotin and others added 5 commits September 26, 2023 14:38
@amotin @behlendorf
ZIL: Avoid dbuf_read() in ztest_get_data()
b253363 
While working on similar patches for zfs and zvol in openzfs#15153 I've
forgot about ztest.  Update it also so that we test the same code
paths as use in production.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by:	Alexander Motin <[email protected]>
Sponsored by:	iXsystems, Inc.
Closes openzfs#15301
@pcd1193182 @behlendorf
Invoke zdb by guid to avoid import errors
3779d67 
The problem that was occurring is basically that a device was removed 
by ztest and replaced with another device. It was then reguided. The 
import then failed because there were two possible imports with the 
same name; one with the new guid, and one with the old. This can 
happen because the label writes from the device removal/replacement 
can be subject to ztest's error injection. 

The other ways to fix this would be to change the error injection to 
not trigger on removals (which may not be technically feasible), or 
to change the import code to not report configurations that are so 
short on devices (which would potentially have unpleasant end-user 
effects when trying to recover from data losses/device configuration 
issues).

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Matthew Ahrens <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Paul Dagnelie <[email protected]>
Closes openzfs#15298
@pcd1193182 @behlendorf
Set timeout before creating pool in test
0dc8183 
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Rob Norris <[email protected]>
Signed-off-by: Paul Dagnelie <[email protected]>
Closes openzfs#15309
@behlendorf
ZTS: Add additional exceptions
b74024f 
"zfs_share_concurrent_shares" may fail on FreeBSD and some Linux
distributions (fedora).  Move it to the common list.

"zfs_allow_010_pos" has been observed to fail on FreeBSD 13.

Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Kay Pedersen <[email protected]>
Reviewed-by: Umer Saleem <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes openzfs#15306
@pcd1193182 @behlendorf
ZTS: Fix introduced test bug in block_cloning_copyfilerange
f26df28 
Reviewed-by: John Wren Kennedy <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Paul Dagnelie <[email protected]>
Closes openzfs#15316
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Sep 26, 2023
pcd1193182 and others added 3 commits September 28, 2023 14:25
@pcd1193182 @behlendorf
Reduce trim min size even lower for tests to reduce flakiness
74ee84b 
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Paul Dagnelie <[email protected]>
Closes openzfs#15315
@pcd1193182 @behlendorf
Don't allocate from new metaslabs
e84b162 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Paul Dagnelie <[email protected]>
Closes openzfs#15307
Closes openzfs#15308
@akashb-22 @behlendorf
Fix ENOSPC for extended quota
62aa4d1 
When unlinking multiple files from a pool at 100% capacity, it
was possible for ENOSPC to be returned after the first few unlinks.
This issue was fixed previously by PR openzfs#13172 but then this was
again introduced by PR openzfs#13839.

This is resolved using the existing mechanism of returning ERESTART
when over quota as long as we know enough space will shortly be
available after processing the pending deferred frees.

Also, updated the existing testcase which reliably reproduced the
issue without this patch.

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Reviewed-by: Dipak Ghosh <[email protected]>
Signed-off-by: Akash B <[email protected]>
Closes openzfs#15312
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Sep 28, 2023
@behlendorf behlendorf merged commit 229ca7d into openzfs:zfs-2.2-release Sep 28, 2023
5 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amotin amotin amotin approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@behlendorf @amotin @pcd1193182 @akashb-22