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

[24.05] Backport fix for ceph with dmcrypt #338630

Merged
merged 6 commits into from
Sep 1, 2024
Merged

[24.05] Backport fix for ceph with dmcrypt #338630

merged 6 commits into from
Sep 1, 2024

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Aug 31, 2024 •
edited
Loading

Description of changes

Fixes #335684 (comment) by backporting:

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.

For review @benaryorg

superherointj and others added 6 commits August 31, 2024 13:31
@superherointj @nh2
ceph: fix build
5002624 
Failure: https://hydra.nixos.org/build/265092568/nixlog/2/tail
(cherry picked from commit c4cdd4a)
@nh2
ceph: Add patch to fix Python packaging import (runtime semi-crash).
e71c31f 
See NixOS#330226 (comment)

(cherry picked from commit 6db7ec1)
@nh2
ceph: Add patch to fix broken cryptsetup version parsing. Fixes NixOS…
c5b65fe 
…#334227

(cherry picked from commit e0751fa)
@nh2
ceph: Fix missing patch for Ceph with dmcrypt. Fixes NixOS#334975
5710927 
(cherry picked from commit 234267e)
@benaryorg @nh2
tests/ceph: bluestore, dmcrypt, and IPv6 test
31e4951 
Signed-off-by: benaryorg <binary@benary.org>

(cherry picked from commit 0cd631e)

The cherry-pick required

    -addresses = [ { Address = "${ip}/128"; } ];
    +addresses = [ { addressConfig.Address = "${ip}/128"; } ];

to account for the fact that the test was written for master commit

    c4fd7cf nixos/networkd: get rid of *Config attributes in lists

which is not in this branch.
@nh2
ceph.tests: Fix maintainer eval
d05b6e3 
(cherry picked from commit def05db)
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Aug 31, 2024
@nh2 nh2 mentioned this pull request Aug 31, 2024
Merged
13 tasks
@nh2
Copy link
Contributor Author

nh2 commented Aug 31, 2024

The Check cherry-picks message

Warning: Difference between 31e495125b71cd77b90f99e0cb4e19f3b97ed217 and original 0cd631e61f7ec34287faea382a9311419c2ca869 may warrant inspection:

is expected as explained in the commit message / shown by that check's details.

@nh2
Copy link
Contributor Author

nh2 commented Aug 31, 2024

vm-test-run-basic-single-node-ceph-cluster-bluestore-dmcrypt passes here, so this looks generally good to me.

@ofborg ofborg bot requested review from krav, johanot and adevress August 31, 2024 15:18
@benaryorg
Copy link
Contributor

Okay, Ceph has successfully compiled and works with d05b6e3.

By the way sorry for the trouble with the maintainer/nixpkgs stuff, I was hesitant to do that precisely because I wasn't in the maintainer list yet. Took me a bit to sift through all the PRs, nixpkgs docs, and whatnot, but #338657 should be good to go (if you intend to get this in here of course, I don't mind not being a maintainer until 24.11 rolls around ^^").

@nh2
Copy link
Contributor Author

nh2 commented Sep 1, 2024

sorry for the trouble with the maintainer/nixpkgs stuff, I was hesitant to do that precisely because I wasn't in the maintainer list yet. Took me a bit to sift through all the PRs, nixpkgs docs, and whatnot, but #338657 should be good to go

No problem at all, glad to have you as co-maintainer! The more NixOS Ceph users, the more reliable life we'll all have!

(if you intend to get this in here of course, I don't mind not being a maintainer until 24.11 rolls around ^^").

For new maintainers I just merged you to master, that will be easiest.

Merging the backport.

@nh2 nh2 merged commit 114af9a into NixOS:release-24.05 Sep 1, 2024
31 of 34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krav krav Awaiting requested review from krav

@johanot johanot Awaiting requested review from johanot

@adevress adevress Awaiting requested review from adevress

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

Successfully merging this pull request may close these issues.
3 participants
@nh2 @benaryorg @superherointj