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-23.11] zfs_2_2: 2.2.3 -> 2.2.4; zfs_unstable: 2.2.3-unstable-2024-04-09 -> 2.2.4 #309454

Merged
merged 2 commits into from
May 13, 2024
Merged

[Backport release-23.11] zfs_2_2: 2.2.3 -> 2.2.4; zfs_unstable: 2.2.3-unstable-2024-04-09 -> 2.2.4 #309454

merged 2 commits into from
May 13, 2024
+16 −7

Conversation

numinit
Copy link
Contributor

@numinit numinit commented May 6, 2024 •
edited
Loading

Description of changes

Manual backport of #308642 to 23.11 since Linux 6.8 was backported too.

Things done

nix-build zfsUnstable.passthru.tests -A zfs.passthru.tests

nix-build -A python3Packages.py-libzfs

More tests pending.

  • 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.

@numinit numinit requested a review from adamcstephens May 6, 2024 04:12
@numinit numinit force-pushed the backport-308642-to-release-23.11 branch from 71d2596 to ef03087 Compare May 6, 2024 04:17
@numinit numinit requested review from amarshall and nbraud May 6, 2024 04:19
numinit
numinit commented May 6, 2024
View reviewed changes
pkgs/development/python-modules/py-libzfs/default.nix
hash = "sha256-6r5hQ/o7c4vq4Tfh0l1WbeK3AuPvi+1wzkwkIn1qEes=";
})
];

nativeBuildInputs = [ cython ];
Copy link
Contributor Author

Choose a reason for hiding this comment

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

main difference was cython vs cython_0

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

risicle commented May 6, 2024

Not a show stopper, but you have rather managed to muddle up the contents of the commits compared to cherry-pick references, e.g. moved the fetchpatch addition from one commit to another.

@numinit
Copy link
Contributor Author

numinit commented May 7, 2024

Thanks, I think I know what happened here.

@numinit numinit force-pushed the backport-308642-to-release-23.11 branch from ef03087 to cec5812 Compare May 7, 2024 01:53
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 7, 2024
@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label May 8, 2024
@nbraud
Copy link
Contributor

nbraud commented May 12, 2024

The cherry-pick refs are still wrong, but this still looks otherwise OK.

@numinit
Copy link
Contributor Author

numinit commented May 12, 2024 •
edited
Loading

I just used:

git cherry-pick -x c6a3a06e5dec34aaaf80576760a81973644e3864 2cbe0633194e987048207cd79a662ce761f56457 a1dcb54257af49396329dc8467a465b21d7746b9

And then fixed the patches prior to each git cherry-pick --continue.

I wonder if it's because it signed the merge commits with my GPG key afterwards...

@adamcstephens
Copy link
Contributor

This is a big jump for the python library. Is this necessary for the zfs version updates?

@numinit
Copy link
Contributor Author

numinit commented May 13, 2024

I thought about excluding it, but #308642 (comment) seemed to imply it was necessary.

@amarshall
Copy link
Member

amarshall commented May 13, 2024 •
edited
Loading

The patch for py-libzfs is definitely necessary, I didn’t try applying it to any older version.

@numinit
Copy link
Contributor Author

numinit commented May 13, 2024

Let me give that a shot then. :-)

@amarshall @numinit
zfs_unstable: 2.2.3-unstable-2024-04-09 -> 2.2.4
9231b3f 
No pre-release version at this moment, so use now-released 2.2.4.

(cherry picked from commit 2cbe063)
@amarshall @numinit
zfs_2_2: 2.2.3 -> 2.2.4
8bc3807 
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.

(cherry picked from commit a1dcb54)
@numinit
Copy link
Contributor Author

numinit commented May 13, 2024

It looks like it applies and builds fine. Re-running the NixOS tests just to be sure.

@numinit numinit force-pushed the backport-308642-to-release-23.11 branch from cec5812 to 8bc3807 Compare May 13, 2024 01:53
@numinit
Copy link
Contributor Author

numinit commented May 13, 2024

All good. Pushed it up without the GPG sigs, we'll see if that works this time.

@numinit numinit changed the title [Backport release-23.11] 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 [Backport release-23.11] zfs_2_2: 2.2.3 -> 2.2.4; zfs_unstable: 2.2.3-unstable-2024-04-09 -> 2.2.4 May 13, 2024
@wegank wegank removed the 12.approvals: 2 This PR was reviewed and approved by two reputable people label May 13, 2024
@adamcstephens
Copy link
Contributor

@ofborg build zfsUnstable.passthru.tests zfs.passthru.tests

@adamcstephens adamcstephens merged commit 8a4282c into NixOS:release-23.11 May 13, 2024
21 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crertel crertel crertel approved these changes

@nbraud nbraud nbraud approved these changes

@adamcstephens adamcstephens Awaiting requested review from adamcstephens

@amarshall amarshall Awaiting requested review from amarshall

Assignees
No one assigned
Labels
6.topic: python 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.
7 participants
@numinit @risicle @nbraud @adamcstephens @amarshall @crertel @wegank