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.

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

zfs: update to 2.1.2. #34563

Merged
merged 1 commit into from Dec 24, 2021
Merged

zfs: update to 2.1.2. #34563

merged 1 commit into from Dec 24, 2021

Conversation

zdykstra
Copy link
Contributor

Testing the changes

  • I tested the changes in this PR: YES

@zdykstra
Copy link
Contributor Author

zdykstra commented Dec 16, 2021

Tested locally on x86_64 with root-on-ZFS. No issues with kernel 5.10.x, 5.14.x, 5.15.x.

@zdykstra
Copy link
Contributor Author

Ping @Vaelatern @ahesford

@ericonr
Copy link
Member

ericonr commented Dec 16, 2021

Test failures on musl are because SEEK_DATA and SEEK_HOLE are defined in glibc headers, but not in musl ones. The values can be had from <linux/fs.h>, but that header brings in a lot of cruft too, idk if it's acceptable for upstream. If musl accepts the constants, we can just use that instead.

@Vaelatern
Copy link
Member

This is very brand new, only 2 hours. We prefer to wait at least a few days, so I'll ask that we put this on pause to see if upstream fixes musl.

My zfs-on-root machine is in fact a musl box, so the musl failures obviously are relevant to me :)

@zdykstra
Copy link
Contributor Author

This is very brand new, only 2 hours. We prefer to wait at least a few days, so I'll ask that we put this on pause to see if upstream fixes musl.

My zfs-on-root machine is in fact a musl box, so the musl failures obviously are relevant to me :)

Yup, just getting the ball rolling. I'm dog-fooding it locally because I live the YOLO lifestyle.

@ericonr
Copy link
Member

ericonr commented Dec 16, 2021

@Vaelatern fwiw this isn't inhibiting functionality, it's just a test for the mmap issues they had with file seeking. Disabling or fixing the tests should be equivalent, given that almost no one runs them :P

I'm looking into the musl side to see if we can define the constants, otherwise I can open an issue with ZFS upstream.

@ericonr
Copy link
Member

ericonr commented Dec 17, 2021

@ahesford
Copy link
Member

Even if the musl patch is accepted, the patch would need to be backported to our version indefinitely. Would it be better just to patch the tests here (or disable them)?

Maybe defining these constants in make_build_args is sufficient...

@ericonr
Copy link
Member

ericonr commented Dec 17, 2021

Fwiw the patch is likely to be accepted, from IRC discussion.

I'm okay with backporting, and we can remove it when updating musl.

@zdykstra
Copy link
Contributor Author

I've pulled in openzfs/zfs#12891 - upstreams patch-of-choice for the musl build issue.

@ericonr
Copy link
Member

ericonr commented Dec 21, 2021

LGTM, I can install on musl and reboot to test things.

@Vaelatern
Copy link
Member

not opposed to backporting the zfs musl patch to fix this.

@ericonr
Copy link
Member

ericonr commented Dec 23, 2021

Tested and seems to be working fine here.

Thanks for the update!

@Vaelatern Vaelatern merged commit e1211a2 into void-linux:master Dec 24, 2021
@zdykstra zdykstra deleted the zfs-2.1.2 branch December 25, 2021 00:42
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 25, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants