[pve-devel] [PATCH zfsonlinux 0/3] update to 2.1.1

Stoiko Ivanov s.ivanov at proxmox.com
Mon Sep 27 20:07:03 CEST 2021


Changes from the RFC sent 20 days ago:
* ZFS 2.1.1 was tagged upstream
* the abi-tracking changes were ported to 2.1-release, rendering the ported
  patches superfluous

Tested with the upcoming 5.13 kernel on 2 VMs with storage-replication:
* created a snapshot before the upgrade on one machine,
* upgraded both nodes
* rebooted
* migrated container
* rolled back to the snapshot

all working as expected

Original cover-letter for the RFC:
This patchset updates our packaging for the changes of ZFS 2.1

Sending as RFC because:
* I'm still not 100% sure my solution to the ABI-changes and updated
  package names is correct
* It's based on the current tip of upstream's zfs-2.1.1-staging branch,
  which yet needs to be tagged

I'm intentionally omitting most of patch 4/5 - since it's 2MB of xml-abi
definition diffs - I'll gladly resent if somebody wants this - else the
commit is on my staff repository.

The upgrade was straight-forward - only small issues were regarding the
incompatibile abigail-tools versions (1.8 (bullseye) produces different
output to before, thus `make checkabi` failed initially).

Additionally the bump of the libzfs and libzpool library versions in
ec311430e2fd66492498a1559f56ef25e1192266 should not result in the libzfs
package name to be changed as well (libzfs increased it's current and age
parameter - which still leaves the soname at libzfs.so.4 when building on
my machine.

Did some minimal tests in a virtual 2-node test-cluster of mine with
storage replication for one VM (snapshotting, migrating, upgrading the
zpool, migrating back) - all seemed ok.



Stoiko Ivanov (3):
  update submodule and patches to ZFS 2.1.1-staging
  buildsys: adapt install paths for zfs 2.1.1
  bump libzpool soname

 Makefile                                      |  2 +-
 debian/control                                |  8 +--
 ...ibzpool4linux.docs => libzpool5linux.docs} |  0
 ...x.install.in => libzpool5linux.install.in} |  0
 ...rides => libzpool5linux.lintian-overrides} |  0
 ...ith-d-dev-disk-by-id-in-scan-service.patch |  6 +-
 .../0006-dont-symlink-zed-scripts.patch       |  5 +-
 .../patches/0007-Use-installed-python3.patch  |  4 +-
 ...-move-manpage-arcstat-1-to-arcstat-8.patch | 61 +++++++++----------
 debian/zfsutils-linux.install                 | 14 +++--
 upstream                                      |  2 +-
 11 files changed, 53 insertions(+), 49 deletions(-)
 rename debian/{libzpool4linux.docs => libzpool5linux.docs} (100%)
 rename debian/{libzpool4linux.install.in => libzpool5linux.install.in} (100%)
 rename debian/{libzpool4linux.lintian-overrides => libzpool5linux.lintian-overrides} (100%)

-- 
2.30.2






More information about the pve-devel mailing list