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.3 -> 2.2.4; zfs_unstable: 2.2.3-unstable-2024-04-09 -> 2.2.4; python3Packages.py-libzfs: 22.12.4.2 -> 24.04.0 #308642

Merged
merged 3 commits into from
May 4, 2024

Conversation

amarshall
Copy link
Member

@amarshall amarshall commented May 2, 2024

Description of changes

https://github.com/openzfs/zfs/releases/tag/zfs-2.2.4

Things done

nix-build -A zfs_unstable.passthru.tests -A zfs_2_2.passthru.tests; still performing some testing.

  • 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.05 Release Notes (or backporting 23.05 and 23.11 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.

@amarshall
Copy link
Member Author

amarshall commented May 3, 2024

Result of nixpkgs-review run on x86_64-linux 1

9 packages failed to build:
  • htcondor
  • nixops_unstablePlugins.nixops-libvirtd
  • nixops_unstablePlugins.nixops-libvirtd.dist
  • nixops_unstable_full
  • nixops_unstable_full.dist
  • python311Packages.py-libzfs
  • python311Packages.py-libzfs.dist
  • python312Packages.py-libzfs
  • python312Packages.py-libzfs.dist
89 packages built:
  • appvm
  • booster
  • ceph
  • ceph-client
  • ceph-csi
  • ceph.dev
  • ceph.doc
  • libceph (ceph.lib ,libceph.dev ,libceph.doc ,libceph.lib ,libceph.man)
  • ceph.man
  • check_zfs
  • collectd
  • diffoscope
  • diffoscope.dist
  • diffoscope.man
  • docker-machine-kvm2
  • easysnap
  • facter
  • gnome.gnome-boxes
  • guestfs-tools
  • kdePackages.kpmcore
  • kdePackages.kpmcore.debug
  • kdePackages.kpmcore.dev
  • kdePackages.kpmcore.devtools
  • kdePackages.partitionmanager
  • kdePackages.partitionmanager.debug
  • kdePackages.partitionmanager.dev
  • kdePackages.partitionmanager.devtools
  • libguestfs
  • libguestfs-with-appliance
  • librenms
  • libsForQt5.partitionmanager
  • libvirt
  • libvirt-glib
  • libvirt-glib.dev
  • libvirt-glib.devdoc
  • linuxKernel.packages.linux_4_19.zfs (linuxKernel.packages.linux_4_19.zfs_unstable)
  • linuxKernel.packages.linux_4_19_hardened.zfs (linuxKernel.packages.linux_4_19_hardened.zfs_unstable)
  • linuxKernel.packages.linux_5_10.zfs (linuxKernel.packages.linux_5_10.zfs_unstable)
  • linuxKernel.packages.linux_5_10_hardened.zfs (linuxKernel.packages.linux_5_10_hardened.zfs_unstable)
  • linuxKernel.packages.linux_5_15.zfs (linuxKernel.packages.linux_5_15.zfs_unstable)
  • linuxKernel.packages.linux_5_15_hardened.zfs (linuxKernel.packages.linux_5_15_hardened.zfs_unstable)
  • linuxKernel.packages.linux_5_4.zfs (linuxKernel.packages.linux_5_4.zfs_unstable)
  • linuxKernel.packages.linux_5_4_hardened.zfs (linuxKernel.packages.linux_5_4_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_1.zfs (linuxKernel.packages.linux_6_1.zfs_unstable)
  • linuxKernel.packages.linux_6_1_hardened.zfs (linuxKernel.packages.linux_6_1_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_6.zfs (linuxKernel.packages.linux_6_6.zfs_unstable)
  • linuxKernel.packages.linux_hardened.zfs (linuxKernel.packages.linux_6_6_hardened.zfs ,linuxKernel.packages.linux_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_8.zfs (linuxKernel.packages.linux_6_8.zfs_unstable)
  • linuxKernel.packages.linux_latest_libre.zfs (linuxKernel.packages.linux_latest_libre.zfs_unstable)
  • linuxKernel.packages.linux_libre.zfs (linuxKernel.packages.linux_libre.zfs_unstable)
  • linuxKernel.packages.linux_lqx.zfs (linuxKernel.packages.linux_lqx.zfs_unstable)
  • linuxKernel.packages.linux_xanmod.zfs (linuxKernel.packages.linux_xanmod.zfs_unstable)
  • linuxKernel.packages.linux_xanmod_latest.zfs (linuxKernel.packages.linux_xanmod_latest.zfs_unstable ,linuxKernel.packages.linux_xanmod_stable.zfs ,linuxKernel.packages.linux_xanmod_stable.zfs_unstable)
  • linuxKernel.packages.linux_zen.zfs (linuxKernel.packages.linux_zen.zfs_unstable)
  • mgmt
  • minikube
  • multipass
  • ocamlPackages.ocaml_libvirt
  • perl536Packages.SysVirt
  • perl536Packages.SysVirt.devdoc
  • perl538Packages.SysVirt
  • perl538Packages.SysVirt.devdoc
  • python311Packages.guestfs
  • python311Packages.guestfs.dist
  • python311Packages.libvirt
  • python311Packages.libvirt.dist
  • python312Packages.guestfs
  • python312Packages.guestfs.dist
  • qemu_full
  • qemu_full.debug
  • qemu_full.ga
  • rubyPackages.ruby-libvirt
  • rubyPackages_3_2.ruby-libvirt
  • rubyPackages_3_3.ruby-libvirt
  • samba4Full
  • samba4Full.dev
  • samba4Full.man
  • sanoid
  • vagrant
  • virt-manager
  • virt-manager-qt
  • virt-manager.dist
  • virt-top
  • virt-viewer
  • zfs (zfs_unstable)
  • zfs.dev (zfs_unstable.dev)
  • zfstools
  • zpool-auto-expand-partitions
  • zxfer

The py-libzfs failure seems legitimate and due to an API change—will see if I can make a patch. Haven’t looked at the others yet.

@amarshall amarshall added the 11.by: package-maintainer This PR was created by the maintainer of the package it changes label May 3, 2024
amarshall added 3 commits May 3, 2024 07:43
No pre-release version at this moment, so use now-released 2.2.4.
Now compatible with Linux 6.8.

https://github.com/openzfs/zfs/releases/tag/zfs-2.2.4

Need to patch py-libzfs to support incompatible API change.
@nbraud
Copy link
Contributor

nbraud commented May 3, 2024

The py-libzfs failure seems legitimate and due to an API change—will see if I can make a patch. Haven’t looked at the others yet.

There's a fix upstream... but it's not included in the version you just bumped py-libzfs to, as far as I can tell?

@amarshall
Copy link
Member Author

@amarshall amarshall marked this pull request as ready for review May 3, 2024 11:49
@amarshall amarshall requested a review from adamcstephens May 3, 2024 11:49
@amarshall amarshall changed the title zfs_2_2: 2.2.3 -> 2.2.4; zfs_unstable: 2.2.3-unstable-2024-04-09 -> 2.2.4 zfs_2_2: 2.2.3 -> 2.2.4; zfs_unstable: 2.2.3-unstable-2024-04-09 -> 2.2.4; python3Packages.py-libzfs: 22.12.4.2 -> 24.04.0 May 3, 2024
@amarshall
Copy link
Member Author

@nbraud Indeed, it’s fetchpatch-ed in the zfs update commit as it’s an incompatible change that only works in concert with the zfs update.

@nbraud
Copy link
Contributor

nbraud commented May 3, 2024

@nbraud Indeed, it’s fetchpatch-ed in the zfs update commit as it’s an incompatible change that only works in concert with the zfs update.

Ah thanks. I missed it because I looked at c6a3a06 when it's in a1dcb54... which makes more sense anyhow, that way everything builds on every commit :)

PS: Confirmed py-libzfs builds now

@ofborg ofborg bot requested a review from chuangzhu May 3, 2024 12:16
@nbraud
Copy link
Contributor

nbraud commented May 3, 2024

I have a nixpkgs-review run going, and ceph fails to build now:

/build/ceph-18.2.1/src/common/options/legacy_config_opts.h:5:10: fatal error: mgr_legacy_options.h: No such file or directory
    5 | #include "mgr_legacy_options.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

Not sure how that's related, but it's marked as building correctly on hydra, and I can't see any relevant change to it since nixos-unstable (as of 63c3a29)

@amarshall
Copy link
Member Author

amarshall commented May 3, 2024

I cannot replicate; ceph successfully builds on x86_64-linux on this branch, based off latest master (5c95d72).

@nbraud
Copy link
Contributor

nbraud commented May 3, 2024

I cannot replicate; ceph successfully builds on x86_64-linux on this branch, based off latest master (5c95d72).

Exciting! I had other drvs now failing due to running out of space, so that may have been it (though it would be a strange way for the issue to manifest)
Killed the rebuild run due to that, still OK to merge as far as I'm concerned

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 3, 2024
@Shawn8901
Copy link
Contributor

running 2.2.4 fine on my system, i dont see obvious errors on my end.

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels May 4, 2024
@adamcstephens adamcstephens merged commit 14e704d into NixOS:master May 4, 2024
30 checks passed
Copy link
Contributor

github-actions bot commented May 6, 2024

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

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

git fetch origin release-23.11
git worktree add -d .worktree/backport-308642-to-release-23.11 origin/release-23.11
cd .worktree/backport-308642-to-release-23.11
git switch --create backport-308642-to-release-23.11
git cherry-pick -x c6a3a06e5dec34aaaf80576760a81973644e3864 2cbe0633194e987048207cd79a662ce761f56457 a1dcb54257af49396329dc8467a465b21d7746b9

@numinit
Copy link
Contributor

numinit commented May 6, 2024

Oof. Linux 6.8 had a backport to 23.11. I'll see if I can wade through this one by hand.


# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.2.3-unstable-2024-04-09";
rev = "28520cad2500b60ce8653e431990e33f77ff08f7";
version = "2.2.4";
Copy link
Member

Choose a reason for hiding this comment

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

Since 1f32eb7#diff-fbbd794729847fb904a20232b805e7dd5781e14f8b66654d6afb59220a649cbcR214 we no longer can check enableUnstable if zfs unstable is used. Before this PR I've used (!config.boot.zfs.enabled || config.boot.zfs.package == pkgs.zfs_unstable) to check if linuxPackages_latest can be used, but now I need to add another condition if pkgs.zfs and pkgs.zfs_unstable are equal. IMO it was mistake to drop enableUnstable and require people to do Kaffeesatzläserei.

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we can add a passthru option to indicate if it's the stable or unstable version.

Copy link
Member Author

@amarshall amarshall May 6, 2024

Choose a reason for hiding this comment

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

I’m not sure how this is related to this PR—consider making a new issue to discuss. Anyway:

Using zfs_unstable does not imply linuxPackages_latest can be used, nor does using zfs imply it cannot be used. Instead I suggest using config.boot.zfs.package.passthru.latestCompatibleLinuxPackages to determine this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants