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_2_2: 2.2.5 -> 2.2.6 #339696

Merged
merged 1 commit into from
Sep 5, 2024
Merged

zfs_2_2: 2.2.5 -> 2.2.6 #339696

merged 1 commit into from
Sep 5, 2024

Conversation

amarshall
Copy link
Member

  • This release brings official support for Kernel 6.10
  • Also update zfs_unstable as it would otherwise lag behind
  • Upstream now links zpool completion, so only do so on older zfs (since we still need to support 2.1.x)

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.2.6

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

- This release brings official support for Kernel 6.10
- Also update zfs_unstable as it would otherwise lag behind
- Upstream now links `zpool` completion, so only do so on older zfs
  (since we still need to support 2.1.x)

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.2.6
@toastal
Copy link
Contributor

toastal commented Sep 5, 2024

looks like a lot 6.11 compat merged as well … maybe good enough to compile with 6.11 for zfs-unstable’s maximum version for the bold?

@matdibu
Copy link
Contributor

matdibu commented Sep 5, 2024

looks like a lot 6.11 compat merged as well … maybe good enough to compile with 6.11 for zfs-unstable’s maximum version for the bold?

I don't think that's a good idea, maybe OpenZFS team had a reason not to mark it compatible with 6.11

@adamcstephens adamcstephens merged commit 63aafed into NixOS:master Sep 5, 2024
26 of 28 checks passed
@amarshall amarshall deleted the zfs-update branch September 5, 2024 12:22
@eqfae
Copy link

eqfae commented Sep 5, 2024

Does anyone know how to lock the kernel version? zfs is slower for the latest kernel, plus mergers, etc., and cannot be updated for a long time.

@amarshall
Copy link
Member Author

@eqfae See the manual.

@bphenriques
Copy link

Does anyone know how to lock the kernel version? zfs is slower for the latest kernel, plus mergers, etc., and cannot be updated for a long time.

Can you elaborate on slower ? For reference for others that pin to the latest zfs compatible kernel

@adamcstephens
Copy link
Contributor

adamcstephens commented Sep 6, 2024

I personally recommend pinning to a specific kernel release line, e.g. linuxPackages_6_6. Using zfs.latestCompatibleLinuxPackages can expose you to downgrades, which I consider harmful, due to misalignment between the zfs project and kernel.

For example, imagine 6.6 is the LTS and 6.9 is the latest kernel. When 6.10 is released, the kernel team will drop 6.9 as it is no longer patched upstream. If zfs is not compatible (it's not) on day one of the release, latestCompatibleLinuxPackages will now resolve to 6.6, forcing a downgrade.

In this scenario I'd pin to linuxPackages_6_9. This will force a failure during eval if a kernel you're using is out of support and allow you to make the decision at that time. If a downgrade is acceptable, for something like the kernel I'd suggest to make it explicit.

@bphenriques
Copy link

I personally recommend pinning to a specific kernel release line, e.g. linuxPackages_6_6. Using zfs.latestCompatibleLinuxPackages can expose you to downgrades, which I consider harmful, due to misalignment between the zfs project and kernel.

For example, imagine 6.6 is the LTS and 6.9 is the latest kernel. When 6.10 is released, the kernel team will drop 6.9 as it is no longer patched upstream. If zfs is not compatible (it's not) on day one of the release, latestCompatibleLinuxPackages will now resolve to 6.6, forcing a downgrade.

In this scenario I'd pin to linuxPackages_6_9. This will force a failure during eval if a kernel you're using is out of support and allow you to make the decision at that time. If a downgrade is acceptable, for something like the kernel I'd suggest to make it explicit.

thank you, I hadn't thought on that. Will apply your suggestion.

@eqfae
Copy link

eqfae commented Sep 6, 2024

Does anyone know how to lock the kernel version? zfs is slower for the latest kernel, plus mergers, etc., and cannot be updated for a long time.

Can you elaborate on slower ? For reference for others that pin to the latest zfs compatible kernel

#337617 (comment)

在youtube有评测结果lqx内核为游戏提供最佳的性能 2.2.5-6.9.11是其zfs最新可用的内核
由于不会指定版本目前我使用boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod

There are reviews on youtube with results of the lqx kernel providing the best performance for gaming 2.2.5-6.9.11 is the latest available kernel for its zfs
Since I can't specify the version I currently use boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod

@@ -184,6 +184,7 @@ let

# Add Bash completions.
install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs
'' + optionalString (lib.versionOlder version "2.2.6") ''
Copy link
Contributor

Choose a reason for hiding this comment

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

This has broken the 2.1 build, btw.

/nix/store/ffr5qkpiyl0bdz15w1b8hmqnclw6938h-stdenv-linux/setup: line 229: cd: /nix/store/hn1s5py5wfinj0k1wq7ghhzwv19ahc72-zfs-kernel-2.1.15-6.6.49/share/bash-completion/completions: No such file or directory

Copy link
Contributor

Choose a reason for hiding this comment

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

Yea, this is not conditional on buildUser. In fact, I actually think the line above it isn't even necessary in 2.2.*. Will add this to my zfs fixes pr: #340165

@mweinelt mweinelt added the backport release-24.05 Backport PR automatically label Sep 7, 2024
Copy link
Contributor

github-actions bot commented Sep 7, 2024

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-339696-to-release-24.05 origin/release-24.05
cd .worktree/backport-339696-to-release-24.05
git switch --create backport-339696-to-release-24.05
git cherry-pick -x 636134b8ed2112412c1da441b4cc4d47a24e3bd3

@mweinelt mweinelt removed the backport release-24.05 Backport PR automatically label Sep 7, 2024
@mweinelt
Copy link
Member

mweinelt commented Sep 7, 2024

Can someone take care of the stable backport?

@amarshall
Copy link
Member Author

@mweinelt Yes, I will sometime later today.

@adamcstephens
Copy link
Contributor

adamcstephens commented Sep 7, 2024

@mweinelt to 2.2.6? I think @amarshall was giving it more time but recently did #340074

@amarshall
Copy link
Member Author

Yes I’ll open it later today but will do as draft and let it sit for a few days.

@mweinelt
Copy link
Member

mweinelt commented Sep 7, 2024

Whatever will provide support for 6.10 :)

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

Successfully merging this pull request may close these issues.

8 participants