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

[Backport release-22.05] zfs: 2.1.4 -> 2.1.5 #178830

Merged
merged 2 commits into from
Jun 27, 2022
Merged

[Backport release-22.05] zfs: 2.1.4 -> 2.1.5 #178830

merged 2 commits into from
Jun 27, 2022

Conversation

Madouura
Copy link
Contributor

@Madouura Madouura commented Jun 24, 2022 •
edited
Loading

(cherry picked from commit 8cfcee7)

Description of changes

#178632
Bot failed to automatically backport due to documentation.

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 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@Madouura
zfs: 2.1.4 -> 2.1.5
c0ab5fc 
(cherry picked from commit 8cfcee7)
@Madouura Madouura changed the title zfs: 2.1.4 -> 2.1.5 [backport release-22.05] zfs: 2.1.4 -> 2.1.5 Jun 24, 2022
@Madouura Madouura changed the title [backport release-22.05] zfs: 2.1.4 -> 2.1.5 [Backport release-22.05] zfs: 2.1.4 -> 2.1.5 Jun 24, 2022
@flokli
Copy link
Contributor

flokli commented Jun 24, 2022

Hmmh, this would mean we update ZFS to 2.1.5 in 22.05 already.

Considering the stability of ZFS, I guess this is fine, but then we should have added the release notes to the 22.05 release notes, instead of 22.11?

@Madouura
Copy link
Contributor Author

I'll go ahead and add the release notes to the PR then.
In a separate commit though, since I don't want to taint the cherry-pick.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation labels Jun 24, 2022
@Madouura
Copy link
Contributor Author

Also all tests except nixosTests.zfs pass.

@flokli
Copy link
Contributor

flokli commented Jun 24, 2022

Sorry, I wrote this confusingly.

If we backport this, we effectively make it appear in the 22.05 release - so the release notes on master should also reflect that, and not pretend it'll only ever end up in 22.11.

I propose sending a PR to master that moves it to the 22.05 release notes, and then cherry-pick both commits in this PR.

@Madouura Madouura mentioned this pull request Jun 24, 2022
Merged
13 tasks
@Madouura
Copy link
Contributor Author

Done.

@flokli flokli merged commit 621a3f9 into NixOS:release-22.05 Jun 27, 2022
@Madouura Madouura deleted the release/zfs branch June 27, 2022 03:18
@schwarmco schwarmco mentioned this pull request Jun 29, 2022
Closed
@PetarKirov
Copy link

@Madouura @flokli any ideas why this breaking change [1] was not caught by Hydra? How can we prevent such problems to happen in the future?

[1]: If boot.kernelPackages is set to config.boot.zfs.package.latestCompatibleLinuxPackages, the build fails with the error reported in #179551

PetarKirov added a commit to PetarKirov/dotfiles that referenced this pull request Jul 3, 2022
@PetarKirov
fix(nixos/sys): Switch Linux kernel from latest ZFS supported version…
2623c57 
… to latest LTS kernel

`zfs.package.latestCompatibleLinuxPackages` was recently bumped to 5.18
[0] in nixpkgs nixos-22.05, however that kernel release includes a
change [1] that causes ZFS to fail to compile [2] [3]. To workaround
this, downgrade the kernel to 5.15, until an OpenZFS release that
includes the bug fix [4] is released.

[0]: NixOS/nixpkgs#178830
[1]: https://patchwork.kernel.org/project/linux-kbuild/patch/20210727205855.411487-35-keescook@chromium.org/
[2]: https://github.com/PetarKirov/dotfiles/runs/7166609186?check_suite_focus=true
[3]: openzfs/zfs#13528
[4]: openzfs/zfs@ff7e405
@PetarKirov PetarKirov mentioned this pull request Jul 3, 2022
Merged
PetarKirov added a commit to PetarKirov/dotfiles that referenced this pull request Jul 3, 2022
@PetarKirov
fix(nixos/sys): Switch Linux kernel from latest ZFS supported version…
317843c 
… to latest LTS kernel

`zfs.package.latestCompatibleLinuxPackages` was recently bumped to 5.18
[0] in nixpkgs nixos-22.05, however that kernel release includes a
change [1] that causes ZFS to fail to compile [2] [3]. To workaround
this, downgrade the kernel to 5.15, until an OpenZFS release that
includes the bug fix [4] is released.

[0]: NixOS/nixpkgs#178830
[1]: https://patchwork.kernel.org/project/linux-kbuild/patch/20210727205855.411487-35-keescook@chromium.org/
[2]: https://github.com/PetarKirov/dotfiles/runs/7166609186?check_suite_focus=true
[3]: openzfs/zfs#13528
[4]: openzfs/zfs@ff7e405
PetarKirov added a commit to PetarKirov/dotfiles that referenced this pull request Jul 3, 2022
@PetarKirov
fix(nixos/sys): Switch Linux kernel from latest ZFS supported version…
22a81a3 
… to latest LTS kernel

`zfs.package.latestCompatibleLinuxPackages` was recently bumped to 5.18
[0] in nixpkgs nixos-22.05, however that kernel release includes a
change [1] that causes ZFS to fail to compile [2] [3]. To workaround
this, downgrade the kernel to 5.15, until an OpenZFS release that
includes the bug fix [4] is released.

[0]: NixOS/nixpkgs#178830
[1]: https://patchwork.kernel.org/project/linux-kbuild/patch/20210727205855.411487-35-keescook@chromium.org/
[2]: https://github.com/PetarKirov/dotfiles/runs/7166609186?check_suite_focus=true
[3]: openzfs/zfs#13528
[4]: openzfs/zfs@ff7e405
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz Awaiting requested review from fpletz

@globin globin Awaiting requested review from globin

@hmenke hmenke Awaiting requested review from hmenke

@jcumming jcumming Awaiting requested review from jcumming

@jonringer jonringer Awaiting requested review from jonringer

@wizeman wizeman Awaiting requested review from wizeman

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Madouura @flokli @PetarKirov