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

zfsUnstable: 2.1.13 -> 2.2.0-rc4 #246163

Merged
merged 1 commit into from
Sep 15, 2023
Merged

zfsUnstable: 2.1.13 -> 2.2.0-rc4 #246163

merged 1 commit into from
Sep 15, 2023

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Jul 30, 2023 •
edited
Loading

Description of changes

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/)
  • 23.11 Release Notes (or backporting 23.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.

@Mic92 Mic92 mentioned this pull request Jul 30, 2023
Closed
12 tasks
@Mic92 Mic92 marked this pull request as draft July 30, 2023 08:35
@ofborg ofborg bot requested review from jcumming, globin and jonringer July 30, 2023 08:43
@Mic92 Mic92 marked this pull request as ready for review July 30, 2023 08:59
@Mic92 Mic92 force-pushed the zfs-unstable branch 2 times, most recently from a6340eb to 3492f63 Compare July 30, 2023 09:17
@adamcstephens
Copy link
Contributor

There is some discussion in duplicate #245330 about waiting until 2.2.0 is released before updating zfsUnstable.

@RaitoBezarius
Copy link
Member

I chatted about it with Mic92 in private FWIW.

yu-re-ka
yu-re-ka reviewed Jul 31, 2023
View reviewed changes
Copy link
Contributor

@yu-re-ka yu-re-ka left a comment

Choose a reason for hiding this comment

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

zfs 2.2.0 will also add armv7l to the cpu targets block; please add isAarch32 in meta.platforms accordingly

@RaitoBezarius
Copy link
Member

I would prefer we go for #246300 first, then we can consider this open until 2.2.0-rcX is run enough by our maintainers I'd say?

@RaitoBezarius RaitoBezarius mentioned this pull request Aug 2, 2023
Closed
12 tasks
@RaitoBezarius
Copy link
Member

openzfs/zfs#15140 FWIW

@Mic92
Copy link
Member Author

Mic92 commented Aug 4, 2023

Works well so far on my machine.

@Mic92
Copy link
Member Author

Mic92 commented Sep 11, 2023

Updated to latest rc, which also fixes openzfs/zfs#15140

@adamcstephens
Copy link
Contributor

adamcstephens commented Sep 11, 2023 •
edited
Loading

Commit and PR title are both incorrect. 2.1.13 and 2.2.0-rc4

I've applied the kernel module to one of my systems running 6.1.x, but getting a failure from extra-utils when trying to overlay the user space tools. Unsure if that is related to this PR or not, and is not a helpful failure.

patching /nix/store/1vkvigd0ggmx83gqrr5swnpq383g7wdn-extra-utils/lib/libdevmapper.so.1.02...
patching /nix/store/1vkvigd0ggmx83gqrr5swnpq383g7wdn-extra-utils/lib/libbrotlidec.so.1...
testing patched programs...
hello world
253
mdadm - v4.2 - 2021-12-30

@Mic92 Mic92 changed the title zfsUnstable: 2.1.12 -> 2.2.0-rc3 zfsUnstable: 2.1.12 -> 2.2.0-rc4 Sep 11, 2023
@RaitoBezarius RaitoBezarius changed the title zfsUnstable: 2.1.12 -> 2.2.0-rc4 zfsUnstable: 2.1.13 -> 2.2.0-rc4 Sep 12, 2023
@RaitoBezarius
Copy link
Member

RaitoBezarius commented Sep 12, 2023 •
edited
Loading

I think the PR should allow 6.5 kernel or did I miss something?
EDIT: actually no :-(

@RaitoBezarius
Copy link
Member

@ofborg build zfs

@RaitoBezarius RaitoBezarius merged commit 71d33c6 into NixOS:master Sep 15, 2023
13 of 14 checks passed
@Mic92 Mic92 deleted the zfs-unstable branch September 16, 2023 11:02
@adamcstephens
Copy link
Contributor

Yes, this is still failing to build stage1 for me.

extra-utils> ++ /nix/store/icqhklalv093a6psh6hiv7c8dqlwa9wd-extra-utils/bin/zfs --help
extra-utils> + exitHandler
extra-utils> + exitCode=127
extra-utils> + set +e

─❯ /nix/store/icqhklalv093a6psh6hiv7c8dqlwa9wd-extra-utils/bin/zfs --help
/nix/store/icqhklalv093a6psh6hiv7c8dqlwa9wd-extra-utils/bin/zfs: symbol lookup error: /nix/store/icqhklalv093a6psh6hiv7c8dqlwa9wd-extra-utils/bin/zfs: undefined symbol: sa_protocol_names

@Mic92
Copy link
Member Author

Mic92 commented Sep 16, 2023

Interesting. I am using

Yes, this is still failing to build stage1 for me.

extra-utils> ++ /nix/store/icqhklalv093a6psh6hiv7c8dqlwa9wd-extra-utils/bin/zfs --help
extra-utils> + exitHandler
extra-utils> + exitCode=127
extra-utils> + set +e

─❯ /nix/store/icqhklalv093a6psh6hiv7c8dqlwa9wd-extra-utils/bin/zfs --help
/nix/store/icqhklalv093a6psh6hiv7c8dqlwa9wd-extra-utils/bin/zfs: symbol lookup error: /nix/store/icqhklalv093a6psh6hiv7c8dqlwa9wd-extra-utils/bin/zfs: undefined symbol: sa_protocol_names

Cannot reproduce this issue. I found an error in the test, that I fixed here: #255484

@adamcstephens
Copy link
Contributor

adamcstephens commented Sep 16, 2023 •
edited
Loading

Ok, I narrowed it down to the zfsutil filesystem option when used on a filesystem needed for boot (e.g. /, /nix).

Here's a pared down config that will fail:

nixosConfigurations.testzfs = inputs.nixpkgs.lib.nixosSystem {
        system = "x86_64-linux";
        modules = [
          (inputs.nixpkgs + "/nixos/modules/profiles/qemu-guest.nix")
          {
            boot.zfs.enableUnstable = true;
            boot.supportedFilesystems = ["zfs"];
            networking.hostId = "12345678";
            fileSystems."/" = {
              device = "zpool/nixos/root";
              fsType = "zfs";
              options = ["zfsutil" "X-mount.mkdir"];
            };
            boot.loader.systemd-boot.enable = true;
          }
        ];
      };

@Mic92
Copy link
Member Author

Mic92 commented Sep 17, 2023

Found the issue:

In extra-utils for the initrd we do: stripDirs "$STRIP" "$RANLIB" "lib bin" "-s"
This is causing that the sa_protocol_names gets dropped from the shared object.

@Mic92
Copy link
Member Author

Mic92 commented Sep 17, 2023

Update this is not the actual issue. But here is the fix: #255583

@SuperSandro2000 SuperSandro2000 mentioned this pull request Oct 8, 2023
Closed
12 tasks
SuperSandro2000
SuperSandro2000 reviewed Oct 8, 2023
View reviewed changes
pkgs/os-specific/linux/zfs/unstable.nix
Comment on lines +19 to +20
then linuxKernel.packages.linux_6_4
else linuxKernel.packages.linux_6_1;
Copy link
Member

Choose a reason for hiding this comment

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

This is inconsistent with the rest of the file

Copy link
Contributor

Choose a reason for hiding this comment

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

Why are you nitpicking a formatting inconsistency 3 weeks after a PR was merged?

Copy link
Member

Choose a reason for hiding this comment

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

Because I only stumbled upon this PR yesterday when I dug up my old zfsUnstable bump PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adamcstephens adamcstephens adamcstephens left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@yu-re-ka yu-re-ka yu-re-ka left review comments

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@jcumming jcumming Awaiting requested review from jcumming

@globin globin Awaiting requested review from globin

@jonringer jonringer Awaiting requested review from jonringer

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Mic92 @adamcstephens @RaitoBezarius @SuperSandro2000 @yu-re-ka