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: 0.8.4 -> 0.8.5 #99965

Merged
merged 1 commit into from Oct 19, 2020
Merged

zfs: 0.8.4 -> 0.8.5 #99965

merged 1 commit into from Oct 19, 2020

Conversation

@hmenke
Copy link
Contributor

@hmenke hmenke commented Oct 7, 2020

Motivation for this change

Mostly bugfixes: https://github.com/openzfs/zfs/releases/tag/zfs-0.8.5

Most notably, the __vmalloc patch has been merged into mainline and was therefore removed from the Nix expression.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@hmenke
Copy link
Contributor Author

@hmenke hmenke commented Oct 8, 2020

Result of nixpkgs-review pr 99965 1

52 packages failed to build:
  • bareos
  • ceph
  • ceph-client
  • collectd
  • collectd-data
  • docker-machine-kvm
  • docker-machine-kvm2
  • easysnap
  • gnome3.gnome-boxes
  • grub2
  • grub2_efi
  • grub2_pvgrub_image
  • grub2_xen
  • libceph
  • libguestfs
  • libguestfs-with-appliance
  • libvirt
  • libvirt-glib
  • libvirt_5_9_0
  • libvmi
  • minikube
  • minishift
  • nixops
  • nixopsUnstable
  • nixops_1_6_1
  • ocamlPackages.ocaml_libvirt
  • os-prober
  • perl530Packages.SysVirt
  • perl532Packages.SysVirt
  • python27Packages.guestfs
  • python27Packages.libvirt
  • python37Packages.guestfs
  • python37Packages.libvirt
  • python38Packages.guestfs
  • python38Packages.libvirt
  • rubyPackages.ruby-libvirt
  • rubyPackages_2_5.ruby-libvirt
  • rubyPackages_2_7.ruby-libvirt
  • samba4Full
  • sanoid
  • terraform-full
  • terraform-provider-libvirt (terraform-providers.libvirt)
  • terraform_0_11-full
  • terragrunt
  • vagrant
  • virtmanager (virt-manager)
  • virtmanager-qt (virt-manager-qt)
  • virt-top
  • virtviewer (virt-viewer)
  • virtlyst
  • zfs
  • zfstools
17 packages built:
  • linuxPackages-libre.zfs
  • linuxPackages.zfs
  • linuxPackages_4_14.zfs
  • linuxPackages_4_19.zfs
  • linuxPackages_4_4.zfs
  • linuxPackages_4_9.zfs
  • linuxPackages_5_7.zfs
  • linuxPackages_5_8.zfs
  • linuxPackages_hardened.zfs
  • linuxPackages_latest-libre.zfs
  • linuxPackages_latest_hardened.zfs
  • linuxPackages_latest_xen_dom0.zfs
  • linuxPackages_latest_xen_dom0_hardened.zfs
  • linuxPackages_testing_bcachefs.zfs
  • linuxPackages_xen_dom0.zfs
  • linuxPackages_xen_dom0_hardened.zfs
  • linuxPackages_zen.zfs
@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 8, 2020

please address build failure:

builder for '/nix/store/r8gv15g1vq50vs5wrwf9npk50gzdmglm-zfs-user-0.8.5.drv' failed with exit code 1; last 10 log lines:
  substituteStream(): WARNING: pattern 'zfs-import-cache.service' doesn't match anything in file '/nix/store/s7f85wblnjx04amif5k0p7083hfb61mx-zfs-user-0.8.5/etc/systemd/system/zfs-zed.service'
  substituteStream(): WARNING: pattern 'zfs-import-cache.service' doesn't match anything in file '/nix/store/s7f85wblnjx04amif5k0p7083hfb61mx-zfs-user-0.8.5/etc/systemd/system/zfs.target'
  install: creating directory '/nix/store/s7f85wblnjx04amif5k0p7083hfb61mx-zfs-user-0.8.5/share/bash-completion'
  install: creating directory '/nix/store/s7f85wblnjx04amif5k0p7083hfb61mx-zfs-user-0.8.5/share/bash-completion/completions'
  'contrib/bash_completion.d/zfs' -> '/nix/store/s7f85wblnjx04amif5k0p7083hfb61mx-zfs-user-0.8.5/share/bash-completion/completions/zfs'
  post-installation fixup
  Moving /nix/store/s7f85wblnjx04amif5k0p7083hfb61mx-zfs-user-0.8.5/lib/pkgconfig to /nix/store/xn0z69cxh4ardyl7zq89gvdsxf6826zh-zfs-user-0.8.5-dev/lib/pkgconfig
  rmdir: failed to remove '/nix/store/s7f85wblnjx04amif5k0p7083hfb61mx-zfs-user-0.8.5/lib': Directory not empty
  Moving /nix/store/gryks8p55h34b6jqighzqh2hjfknhhrd-zfs-user-0.8.5-lib/lib/pkgconfig to /nix/store/xn0z69cxh4ardyl7zq89gvdsxf6826zh-zfs-user-0.8.5-dev/lib/pkgconfig
  mv: cannot overwrite non-directory '/nix/store/xn0z69cxh4ardyl7zq89gvdsxf6826zh-zfs-user-0.8.5-dev/lib/pkgconfig' with directory '/nix/store/gryks8p55h34b6jqighzqh2hjfknhhrd-zfs-user-0.8.5-lib/lib/pkgconfig'
Copy link
Contributor

@jonringer jonringer left a comment

above

@hmenke hmenke force-pushed the hmenke:zfs branch from c0f8032 to 59406bb Oct 8, 2020
@hmenke
Copy link
Contributor Author

@hmenke hmenke commented Oct 8, 2020

Result of nixpkgs-review pr 99965 1

2 packages failed to build:
  • bareos
  • virtmanager-qt (virt-manager-qt)
68 packages built:
  • ceph
  • ceph-client
  • collectd
  • collectd-data
  • docker-machine-kvm
  • docker-machine-kvm2
  • easysnap
  • gnome3.gnome-boxes
  • grub2
  • grub2_efi
  • grub2_pvgrub_image
  • grub2_xen
  • libceph
  • libguestfs
  • libguestfs-with-appliance
  • libvirt
  • libvirt-glib
  • libvirt_5_9_0
  • libvmi
  • linuxPackages-libre.zfs
  • linuxPackages.zfs
  • linuxPackages_4_14.zfs
  • linuxPackages_4_19.zfs
  • linuxPackages_4_4.zfs
  • linuxPackages_4_9.zfs
  • linuxPackages_5_7.zfs
  • linuxPackages_5_8.zfs
  • linuxPackages_hardened.zfs
  • linuxPackages_latest-libre.zfs
  • linuxPackages_latest_hardened.zfs
  • linuxPackages_latest_xen_dom0.zfs
  • linuxPackages_latest_xen_dom0_hardened.zfs
  • linuxPackages_testing_bcachefs.zfs
  • linuxPackages_xen_dom0.zfs
  • linuxPackages_xen_dom0_hardened.zfs
  • linuxPackages_zen.zfs
  • minikube
  • minishift
  • nixops
  • nixopsUnstable
  • nixops_1_6_1
  • ocamlPackages.ocaml_libvirt
  • os-prober
  • perl530Packages.SysVirt
  • perl532Packages.SysVirt
  • python27Packages.guestfs
  • python27Packages.libvirt
  • python37Packages.guestfs
  • python37Packages.libvirt
  • python38Packages.guestfs
  • python38Packages.libvirt
  • rubyPackages.ruby-libvirt
  • rubyPackages_2_5.ruby-libvirt
  • rubyPackages_2_7.ruby-libvirt
  • samba4Full
  • sanoid
  • terraform-full
  • terraform-provider-libvirt (terraform-providers.libvirt)
  • terraform_0_11-full
  • terragrunt
  • vagrant
  • virtmanager (virt-manager)
  • virt-top
  • virtviewer (virt-viewer)
  • virtlyst
  • zfs
  • zfsUnstable
  • zfstools
@hmenke
Copy link
Contributor Author

@hmenke hmenke commented Oct 8, 2020

@ofborg test zfs.stable zfs.unstable

Testing unstable as well, because the change in postInstall theoretically affects it as well.

@hmenke
Copy link
Contributor Author

@hmenke hmenke commented Oct 8, 2020

bareos could not be built but it's marked as broken anyway.

virtmanager-qt doesn't build as well, but I doubt that this is due to ZFS. Here is the log output:

builder for '/nix/store/ic3yq25h21k6g8dqjywyshayqj4hrgcl-virt-manager-qt-0.71.95.drv' failed with exit code 2; last 10 log lines:
  [  2%] Building CXX object CMakeFiles/qt5-remote-viewer.dir/src/vm_viewer/main.cpp.o
  In file included from /build/source/src/vm_viewer/krdc_vnc_qtonly/Machine_View.h:28,
                   from /build/source/src/vm_viewer/vnc/vnc_viewer_only.h:5,
                   from /build/source/src/vm_viewer/main.cpp:6:
  /build/source/src/vm_viewer/krdc_vnc_qtonly/vncview.h:64:24: error: 'DotCursorState' has not been declared
     64 |     void showDotCursor(DotCursorState state);
        |                        ^~~~~~~~~~~~~~
  make[2]: *** [CMakeFiles/qt5-remote-viewer.dir/build.make:352: CMakeFiles/qt5-remote-viewer.dir/src/vm_viewer/main.cpp.o] Error 1
  make[1]: *** [CMakeFiles/Makefile2:97: CMakeFiles/qt5-remote-viewer.dir/all] Error 2
  make: *** [Makefile:149: all] Error 2
builder for '/nix/store/dxvp2gg10bvdhcas6c22jvl94ky7pr1f-bareos-17.2.7.drv' failed with exit code 2; last 10 log lines:
    550 |       if (glfs_ftruncate(m_gfd, 0) != 0) {
        |                                  ^
  In file included from ../backends/gfapi_device.h:31,
                   from gfapi_device.c:34:
  /nix/store/7icjj170dwglm9hc6h4j60hflk2vkkwi-glusterfs-7.6/include/glusterfs/api/glfs.h:768:1: note: declared here
    768 | glfs_ftruncate(glfs_fd_t *fd, off_t length, struct glfs_stat *prestat,
        | ^~~~~~~~~~~~~~
  make[1]: *** [Makefile:217: gfapi_device.lo] Error 1
  make[1]: Leaving directory '/build/bareos-17.2.7-src/src/stored/backends'
  make: *** [GNUmakefile:167: src/stored/backends] Error 2
@hmenke
Copy link
Contributor Author

@hmenke hmenke commented Oct 14, 2020

@jonringer Could you please take a look again?

@nixos-discourse
Copy link

@nixos-discourse nixos-discourse commented Oct 19, 2020

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/342

@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 19, 2020

@GrahamcOfBorg test zfs

Copy link
Contributor

@jonringer jonringer left a comment

LGTM

failures are broken on target branch

builder for '/nix/store/g0pwdpndk41kqmqjwnq1i9df1skib0yb-ceph-15.2.5.drv' failed with exit code 2; last 10 log lines:
  [ 86%] Building C object lib/CMakeFiles/libzstd_static.dir/build/ceph-15.2.5/src/zstd/lib/deprecated/zbuff_decompress.c.o
  [ 89%] Building C object lib/CMakeFiles/libzstd_static.dir/build/ceph-15.2.5/src/zstd/lib/decompress/huf_decompress.c.o
  [ 93%] Building C object lib/CMakeFiles/libzstd_static.dir/build/ceph-15.2.5/src/zstd/lib/compress/zstd_ldm.c.o
  [ 96%] Building C object lib/CMakeFiles/libzstd_static.dir/build/ceph-15.2.5/src/zstd/lib/compress/zstd_lazy.c.o
  [100%] Linking C static library libzstd.a
  [100%] Built target libzstd_static
  [  8%] Performing install step for 'zstd_ext'
  [  8%] Completed 'zstd_ext'
  [  8%] Built target zstd_ext
  make: *** [Makefile:160: all] Error 2
cannot build derivation '/nix/store/qqh7g7yhsp5psm37akxbzkxmb6ck4g5a-ceph-client-15.2.5.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/0x435nwkvjngpz8z2x9vs2yphkw7iwy9-samba-4.12.6.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/q5vi6p1i83md834zrrfidgvq8sw1iv9q-env.drv': 3 dependencies couldn't be built
[28 built (1 failed)]
error: build of '/nix/store/q5vi6p1i83md834zrrfidgvq8sw1iv9q-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/99965
7 packages marked as broken and skipped:
bareos linuxPackages_5_7.zfs linuxPackages_5_7.zfsStable linuxPackages_hardkernel_4_14.zfs linuxPackages_hardkernel_4_14.zfsStable linuxPackages_hardkernel_latest.zfs linuxPackages_hardkernel_latest.zfsStable

1 package blacklisted:
tests.nixos-functions.nixosTest-test

4 packages failed to build:
ceph ceph-client libceph sambaFull

66 packages built:
collectd collectd-data docker-machine-kvm docker-machine-kvm2 easysnap gnome3.gnome-boxes grub2 grub2_efi grub2_pvgrub_image grub2_xen haskellPackages.libvirt-hs haskellPackages.libzfs libguestfs libguestfs-with-appliance libvirt libvirt-glib libvirt_5_9_0 libvmi linuxPackages-libre.zfs linuxPackages.zfs linuxPackages_4_14.zfs linuxPackages_4_19.zfs linuxPackages_4_4.zfs linuxPackages_4_9.zfs linuxPackages_5_8.zfs linuxPackages_hardened.zfs linuxPackages_latest-libre.zfs linuxPackages_latest.zfs linuxPackages_latest_hardened.zfs linuxPackages_latest_xen_dom0.zfs linuxPackages_latest_xen_dom0_hardened.zfs linuxPackages_testing_bcachefs.zfs linuxPackages_xen_dom0.zfs linuxPackages_xen_dom0_hardened.zfs linuxPackages_zen.zfs minikube minishift nixops nixopsUnstable nixops_1_6_1 os-prober perl530Packages.SysVirt perl532Packages.SysVirt python27Packages.guestfs python27Packages.libvirt python37Packages.guestfs python37Packages.libvirt python38Packages.guestfs python38Packages.libvirt rubyPackages.ruby-libvirt rubyPackages_2_5.ruby-libvirt rubyPackages_2_7.ruby-libvirt sanoid terraform-full terraform-providers.libvirt terraform_0_11-full terragrunt vagrant virt-manager virt-manager-qt virt-top virt-viewer virtlyst zfs zfsUnstable zfstools
@jonringer jonringer merged commit cabb90e into NixOS:master Oct 19, 2020
23 checks passed
23 checks passed
tests tests
Details
action
Details
Evaluation Performance Report Evaluator Performance Report
Details
Wait for ofborg
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="59406bb"; rev="59406bb5d73c0d06b05daf8b9511571d59621264"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="59406bb"; rev="59406bb5d73c0d06b05daf8b9511571d59621264"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="59406bb"; rev="59406bb5d73c0d06b05daf8b9511571d59621264"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="59406bb"; rev="59406bb5d73c0d06b05daf8b9511571d59621264"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="59406bb"; rev="59406bb5d73c0d06b05daf8b9511571d59621264"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="59406bb"; rev="59406bb5d73c0d06b05daf8b9511571d59621264"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="59406bb"; rev="59406bb5d73c0d06b05daf8b9511571d59621264"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.zfs on aarch64-linux Success
Details
tests.zfs on x86_64-linux Success
Details
tests.zfs.stable, tests.zfs.unstable on aarch64-linux Success
Details
tests.zfs.stable, tests.zfs.unstable on x86_64-linux Success
Details
zfs, zfs.passthru.tests on aarch64-linux Success
Details
zfs, zfs.passthru.tests on x86_64-linux Success
Details
@priegger
Copy link
Contributor

@priegger priegger commented Nov 27, 2020

Since linuxPackages_latest is 5.9 now on 20.09, zfs is marked as broken:
error: Package ‘zfs-kernel-0.8.4-5.9.11’ in /nix/store/lf9697rp18zdqb7hfcg3f1a0bi6ljr03-nixos-20.09.2076.ffb3aab257e/nixos/pkgs/os-specific/linux/zfs/default.nix:179 is marked as broken, refusing to evaluate.

Should this be backported?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.