Skip to content

zfs: unlock for 5.15#145458

Merged
Mic92 merged 1 commit intoNixOS:masterfrom
Mic92:zfs
Nov 16, 2021
Merged

zfs: unlock for 5.15#145458
Mic92 merged 1 commit intoNixOS:masterfrom
Mic92:zfs

Conversation

@Mic92
Copy link
Copy Markdown
Member

@Mic92 Mic92 commented Nov 11, 2021

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 11, 2021

I tested this for a few days on my laptop.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Nov 11, 2021
@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 11, 2021

1 package failed to build:
linuxKernel.packages.linux_hardened.zfsUnstable

19 packages built:
linuxKernel.packages.linux_4_14.zfsUnstable linuxKernel.packages.linux_4_14_hardened.zfsUnstable linuxKernel.packages.linux_4_19.zfsUnstable linuxKernel.packages.linux_4_19_hardened.zfsUnstable linuxKernel.packages.linux_4_4.zfsUnstable linuxKernel.packages.linux_4_9.zfsUnstable linuxKernel.packages.linux_5_10.zfsUnstable linuxKernel.packages.linux_5_14.zfsUnstable linuxKernel.packages.linux_5_14_hardened.zfsUnstable linuxKernel.packages.linux_5_15.zfsUnstable linuxKernel.packages.linux_5_4.zfsUnstable linuxKernel.packages.linux_5_4_hardened.zfsUnstable linuxKernel.packages.linux_latest_libre.zfsUnstable linuxKernel.packages.linux_libre.zfsUnstable linuxKernel.packages.linux_lqx.zfsUnstable linuxKernel.packages.linux_testing_bcachefs.zfsUnstable linuxKernel.packages.linux_xanmod.zfsUnstable linuxKernel.packages.linux_zen.zfsUnstable zfsUnstable

@Mic92 Mic92 changed the title zfsUnstable: 2.1.1 -> 2021-11-07 (5.15 compat) zfsUnstable: unlock for 5.15 Nov 11, 2021
@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 11, 2021

@hmenke should I do the same for zfs stable? I will test this version now for linux 5.15.

@ofborg ofborg bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Nov 11, 2021
@hmenke
Copy link
Copy Markdown
Member

hmenke commented Nov 11, 2021

I think I'll just write an email to the OpenZFS maintainers and ask them to merge and bump kernel compatibility in a more timely manner.

@hmenke
Copy link
Copy Markdown
Member

hmenke commented Nov 11, 2021

Another option would be to change the documentation for the zfsUnstable derivation and NixOS option and simply track the master branch at all times with no restrictions on kernel compatibility. Truly unstable, so to speak.

@hmenke hmenke mentioned this pull request Nov 11, 2021
12 tasks
@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 11, 2021

Another option would be to change the documentation for the zfsUnstable derivation and NixOS option and simply track the master branch at all times with no restrictions on kernel compatibility. Truly unstable, so to speak.

I only remember in the past this used to be not enough because sometimes PRs where needed to fix kernel compatibility. But it could be that things changed.

@hmenke
Copy link
Copy Markdown
Member

hmenke commented Nov 11, 2021

@Mic92 What do you think of hmenke@2b1e906? That is probably a good middle ground. See also #145485

@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 11, 2021

@Mic92 What do you think of hmenke@2b1e906? That is probably a good middle ground. See also #145485

I think I prefer that approach.

@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 13, 2021

It seems like there is still discussion going on in #145485

I would like to go ahead and merge this. As it is working for me.

@Mic92 Mic92 changed the title zfsUnstable: unlock for 5.15 zfs: unlock for 5.15 Nov 13, 2021
@hmenke
Copy link
Copy Markdown
Member

hmenke commented Nov 14, 2021

I don't think, disabling the compatibility check without a message in the release notes is a good idea.

@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 14, 2021

I don't think, disabling the compatibility check without a message in the release notes is a good idea.

I don't understand. This pr does not disable any compatibility checks.

@hmenke
Copy link
Copy Markdown
Member

hmenke commented Nov 14, 2021

Yes, it does. ZFS 2.1.1 is not compatible with Linux 5.15.

Linux-Maximum: 5.14

https://github.com/openzfs/zfs/blob/zfs-2.1.1/META#L9

@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 14, 2021

Well, linux 5.15 was released two weeks after this zfs release but there were no breaking changes after that - the current version of zfs already had build fixes for 5.15 based on linux master at the time.
I am running on 5.15.1 just fine.

@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 14, 2021

Even if you look at the next patch release of zfs there are no changes related to linux 5.15: https://github.com/openzfs/zfs/commits/zfs-2.1.2-staging
Master already prepares for 5.16, so we won't see anything new.

@hmenke
Copy link
Copy Markdown
Member

hmenke commented Nov 16, 2021

I'm extremely unhappy with this “solution” because in a few weeks we will have the exact same problem again and now the upstream compatibility notes do not hold anymore, but the branch-off for 21.11 is imminent, so this should just be merged to at least have something to work with.

@Mic92
Copy link
Copy Markdown
Member Author

Mic92 commented Nov 16, 2021

We can still backport 2.1.2 to stable and have zfsUnstable on stable follow the version on nixpkgs-unstable to allow the use of newer kernels. I think this worked quite well for the last release.

@Mic92 Mic92 merged commit b81e66e into NixOS:master Nov 16, 2021
@Mic92 Mic92 deleted the zfs branch November 16, 2021 09:57
@TredwellGit
Copy link
Copy Markdown
Member

This should be reverted. Upstream says that the maximum version for 2.1.1 is 5.14 and this pull request does not build because https://github.com/Mic92/nixpkgs/blob/86e057aa5b6b44aa20b65ed194ec359e897bd89d/pkgs/os-specific/linux/zfs/default.nix#L19 was not updated.

Updating zfsStable just because it works in your specific configuration could place others' data at risk.

@TredwellGit
Copy link
Copy Markdown
Member

#146310

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants