]> git.proxmox.com Git - zfsonlinux.git/log
zfsonlinux.git
6 months agobump version to 2.2.0-pve2
Thomas Lamprecht [Sun, 12 Nov 2023 15:02:05 +0000 (16:02 +0100)]
bump version to 2.2.0-pve2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agoensure vdev_stat struct layout compat betweem 2.1 and 2.2
Thomas Lamprecht [Sun, 12 Nov 2023 14:59:55 +0000 (15:59 +0100)]
ensure vdev_stat struct layout compat betweem 2.1 and 2.2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agobackport work-around for UBSAN-errors with variable arrays
Thomas Lamprecht [Sun, 12 Nov 2023 10:30:28 +0000 (11:30 +0100)]
backport work-around for UBSAN-errors with variable arrays

Link: https://github.com/openzfs/zfs/pull/15510
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agoadd patch for spurious warning on `zfs mount -a`
Stoiko Ivanov [Thu, 2 Nov 2023 17:33:21 +0000 (18:33 +0100)]
add patch for spurious warning on `zfs mount -a`

reported in our community forum:
https://forum.proxmox.com/threads/135635/#post-60036

the small fix was merged upstream:
https://github.com/openzfs/zfs/pull/15468

minimally tested by building with this patch and running
`zfs mount -a` on an affected system.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
6 months agobump version to 2.2.0-pve1
Thomas Lamprecht [Sun, 15 Oct 2023 10:09:28 +0000 (12:09 +0200)]
bump version to 2.2.0-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agofix #5014 reenable blk-mq optimization
Stoiko Ivanov [Wed, 25 Oct 2023 09:13:11 +0000 (11:13 +0200)]
fix #5014 reenable blk-mq optimization

While I think the huge performance optimization was at some point not
really that huge in practice - the feature sounds like it would
benefit our use-case:
https://github.com/openzfs/zfs/pull/13148

currently the feature is disabled in 2.2.0 (see the second patch),
because of the issues addressed by the first patch

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agod/control: fix depends provided by dpkg-gencontrol
Stoiko Ivanov [Mon, 16 Oct 2023 09:32:20 +0000 (11:32 +0200)]
d/control: fix depends provided by dpkg-gencontrol

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agod/rules: drop bash_completion mangling
Stoiko Ivanov [Mon, 9 Oct 2023 13:20:13 +0000 (15:20 +0200)]
d/rules: drop bash_completion mangling

This was integrated into upstreams autoconf in commit:
e69ade32e116e72d03068c03799924c3f1a15c95
(contrib: bash_completion.d: make install destination vendor
dependent)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agod/lintian: adapt zfs-test overrides to debhelper 13 format
Thomas Lamprecht [Sun, 15 Oct 2023 12:21:30 +0000 (14:21 +0200)]
d/lintian: adapt zfs-test overrides to debhelper 13 format

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agod/copyright: adapt to file moves and deletions
Thomas Lamprecht [Sun, 15 Oct 2023 12:16:28 +0000 (14:16 +0200)]
d/copyright: adapt to file moves and deletions

Lots of targeted commands consisting of a single file as source got
moved a level up from their command-specific sub-directory to cmd/
directory directly.

A handful of build-artefacts like configure/m4 files generated by
auto-tools, was removed from being tracked by git.

Then some stuff was simple unused or broken and got deleted
(vdev_cache, zfs_spa).

Others where replaced (sha256 by general sha2 library, zstreamdump by
zstream).

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agozfsutils-linux: install new trim units, zilstat tool, and new man pages
Thomas Lamprecht [Sun, 15 Oct 2023 11:25:07 +0000 (13:25 +0200)]
zfsutils-linux: install new trim units, zilstat tool, and new man pages

Cater to dh_missing complaints and ship new:
- zilstat tool
- zfs-lock and zfs-unlock manual pages in section 8
- vdevprops manual page in section 7
- systemd template unit files for trimming a specific pool, inclusive
  timers to do so on a weekly and/or monthly basis. Keep those covered
  by our default "no-stop-on-upgrade" rule for the dh_systemd helper.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agod/patches: add context to ZED no-symlink patch
Thomas Lamprecht [Sun, 15 Oct 2023 11:06:15 +0000 (13:06 +0200)]
d/patches: add context to ZED no-symlink patch

Just copy over the existing commit message...

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agod/install: remove manpages for BSD-specific jail/unjail hooks
Thomas Lamprecht [Sun, 15 Oct 2023 10:27:08 +0000 (12:27 +0200)]
d/install: remove manpages for BSD-specific jail/unjail hooks

With ZFS 2.2. they're actually only installed if ZFS is being build
for FreeBSD, so not remvoing them here leads to a missing file error.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agod/rules: add missing quotes to glob passed to find
Thomas Lamprecht [Sun, 15 Oct 2023 10:13:54 +0000 (12:13 +0200)]
d/rules: add missing quotes to glob passed to find

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
6 months agoupdate submodule and patches for 2.2.0
Thomas Lamprecht [Sun, 15 Oct 2023 10:08:06 +0000 (12:08 +0200)]
update submodule and patches for 2.2.0

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
7 months agobackport fix for AMX register breakage
Thomas Lamprecht [Tue, 10 Oct 2023 12:55:48 +0000 (14:55 +0200)]
backport fix for AMX register breakage

vmexit's can cause the AMX registers to "misbehave" which can break
ZFS, even though ZFS doesn't use AMX at all.

This causes crashes and processes hanging forever in uninterruptible
sleep (the infamous D state) on Intel Xeon 4th gen HW, possible other
HW too, but we only got reports on Sapphire Rapids models.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Tested-by: Aaron Lauterer <a.lauterer@proxmox.com>
7 months agobuildsys: improve clean target
Thomas Lamprecht [Tue, 10 Oct 2023 13:44:45 +0000 (15:44 +0200)]
buildsys: improve clean target

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
7 months agobump version to 2.1.13-pve1
Thomas Lamprecht [Thu, 28 Sep 2023 10:22:34 +0000 (12:22 +0200)]
bump version to 2.1.13-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
7 months agoadd basic gitignore
Thomas Lamprecht [Thu, 28 Sep 2023 13:39:53 +0000 (15:39 +0200)]
add basic gitignore

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
7 months agobuildsys: improve DSC target
Thomas Lamprecht [Thu, 28 Sep 2023 13:37:20 +0000 (15:37 +0200)]
buildsys: improve DSC target

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
7 months agobuildsys: align variable names with our commonly used ones
Thomas Lamprecht [Thu, 28 Sep 2023 13:36:35 +0000 (15:36 +0200)]
buildsys: align variable names with our commonly used ones

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
7 months agoupdate zfs submodule to 2.1.13 and refresh patches
Stoiko Ivanov [Thu, 28 Sep 2023 10:37:27 +0000 (12:37 +0200)]
update zfs submodule to 2.1.13 and refresh patches

Sugested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months agobump version to 2.1.12-pve1
Thomas Lamprecht [Tue, 13 Jun 2023 13:25:21 +0000 (15:25 +0200)]
bump version to 2.1.12-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months ago/lib/zfs-linux/trim: don't exit 1 if last pool isn't nvme-only (Closes: #1030316)
Stoiko Ivanov [Tue, 13 Jun 2023 09:57:53 +0000 (11:57 +0200)]
/lib/zfs-linux/trim: don't exit 1 if last pool isn't nvme-only (Closes: #1030316)

(cherry picked from debian-upstream[0]
commit 8ed69adac193f6463832f6ae34b5ded88b8014d8)

[0] https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
11 months agoupdate zfs submodule to 2.1.12
Stoiko Ivanov [Tue, 13 Jun 2023 09:57:52 +0000 (11:57 +0200)]
update zfs submodule to 2.1.12

patches still applied cleanly

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
11 months agobump version to 2.1.11-pve2
Thomas Lamprecht [Sat, 20 May 2023 17:32:26 +0000 (19:32 +0200)]
bump version to 2.1.11-pve2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months agobuildsys: add sbuild convenience target
Thomas Lamprecht [Sat, 20 May 2023 18:26:51 +0000 (20:26 +0200)]
buildsys: add sbuild convenience target

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months agobuildsys: derive upload dist and arch automatically
Thomas Lamprecht [Sat, 20 May 2023 18:25:56 +0000 (20:25 +0200)]
buildsys: derive upload dist and arch automatically

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months agod/copyright: update from debian upstream
Thomas Lamprecht [Sat, 20 May 2023 18:12:22 +0000 (20:12 +0200)]
d/copyright: update from debian upstream

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months agod/control: do not depend on obsolete lsb-base
Thomas Lamprecht [Sat, 20 May 2023 17:59:42 +0000 (19:59 +0200)]
d/control: do not depend on obsolete lsb-base

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months agod/rules: drop --parallel flag, useless for dh-compat >= 10
Thomas Lamprecht [Sat, 20 May 2023 17:54:43 +0000 (19:54 +0200)]
d/rules: drop --parallel flag, useless for dh-compat >= 10

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months agodrop transitionall zfs-dbg package
Thomas Lamprecht [Sat, 20 May 2023 17:54:22 +0000 (19:54 +0200)]
drop transitionall zfs-dbg package

this effectively reverts the commit
755c716 ("d/control: add transitional zfs-dbg package")

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months agobuildsys: generate clean orig source tarball for DSC
Thomas Lamprecht [Sat, 20 May 2023 17:54:10 +0000 (19:54 +0200)]
buildsys: generate clean orig source tarball for DSC

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months agomakefile: convert to use simple parenthesis
Thomas Lamprecht [Sat, 20 May 2023 17:50:28 +0000 (19:50 +0200)]
makefile: convert to use simple parenthesis

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
11 months agobuildsys: use actual DSC file as prerequisite
Thomas Lamprecht [Sat, 20 May 2023 15:25:24 +0000 (17:25 +0200)]
buildsys: use actual DSC file as prerequisite

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agobump version to 2.1.11-pve1
Thomas Lamprecht [Thu, 20 Apr 2023 07:30:56 +0000 (09:30 +0200)]
bump version to 2.1.11-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agoupdate ZFS submodule to 2.1.11 and refresh patches
Thomas Lamprecht [Thu, 20 Apr 2023 07:26:09 +0000 (09:26 +0200)]
update ZFS submodule to 2.1.11 and refresh patches

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
13 months agocherry-pick e063ff177 ("linux 6.3 compat: add another bdev_io_acct case")
Thomas Lamprecht [Mon, 3 Apr 2023 09:48:06 +0000 (11:48 +0200)]
cherry-pick e063ff177 ("linux 6.3 compat: add another bdev_io_acct case")

As among possibly other things, it addresses a patch that got
backported to kernel 6.2.8 too.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
15 months agobump version to 2.1.9-pve1
Thomas Lamprecht [Sat, 28 Jan 2023 14:03:25 +0000 (15:03 +0100)]
bump version to 2.1.9-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
15 months agoupdate zfs submodule to 2.1.9 and refresh patches
Stoiko Ivanov [Thu, 26 Jan 2023 11:06:02 +0000 (12:06 +0100)]
update zfs submodule to 2.1.9 and refresh patches

mostly drop patches we already applied intermittently

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
16 months agobuildsys: fix missing producing target for dbgsym packages
Thomas Lamprecht [Tue, 10 Jan 2023 10:51:37 +0000 (11:51 +0100)]
buildsys: fix missing producing target for dbgsym packages

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
16 months agobump version to 2.1.7-pve3
Thomas Lamprecht [Sat, 7 Jan 2023 12:22:02 +0000 (13:22 +0100)]
bump version to 2.1.7-pve3

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
16 months agoadapt to 6.1 changes for open syscall with TMPFILE option
Thomas Lamprecht [Sat, 7 Jan 2023 12:20:23 +0000 (13:20 +0100)]
adapt to 6.1 changes for open syscall with TMPFILE option

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
16 months agobackport pipe-resize and xattr fix
Thomas Lamprecht [Sat, 7 Jan 2023 12:19:51 +0000 (13:19 +0100)]
backport pipe-resize and xattr fix

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
16 months agobump version to 2.1.7-pve2
Thomas Lamprecht [Mon, 2 Jan 2023 16:07:23 +0000 (17:07 +0100)]
bump version to 2.1.7-pve2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
16 months agofix #4440: cherry-pick patch for mountpoint=legacy on /
Stoiko Ivanov [Mon, 2 Jan 2023 14:25:49 +0000 (15:25 +0100)]
fix #4440: cherry-pick patch for mountpoint=legacy on /

As reported having set 'mountpoint=legacy' on the root dataset (for a
default install this would be 'rpool/ROOT/pve-1') for mounting through
e.g. /etc/fstab breaks booting in initramfs

The cherry-picked patch is already applied to zfs-2.1.8-staging
upstream so will be included in the next zfs point release.

reproduced the issue on a VM with ZFS on root by:
* booting into a PVE 7.3 iso (to have zfs and an inactive
  rpool/ROOT/pve-1)
* `zpool import -ocachefile=none -N -f rpool
* `zfs set mountpoint=legacy rpool/ROOT/pve-1`
* `mount -t zfs rpool/ROOT/pve-1 /mnt
* `echo "rpool/ROOT/pve-1 / zfs defaults 0 0" >> /mnt/etc/fstab`
* `zpool export rpool`
* reboot - the boot breaks with zfs-initramfs 2.1.7-pve1 but works
  with this patch applied

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
17 months agobump version to 2.1.7-pve1
Thomas Lamprecht [Tue, 6 Dec 2022 15:41:34 +0000 (16:41 +0100)]
bump version to 2.1.7-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
17 months agod/control: add libudev-dev and libaio-dev to build-depends
Stoiko Ivanov [Fri, 2 Dec 2022 16:32:53 +0000 (17:32 +0100)]
d/control: add libudev-dev and libaio-dev to build-depends

noticed by lintian on my system (after a new install)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
17 months agotrim: clean up, fix
Stoiko Ivanov [Fri, 2 Dec 2022 16:32:52 +0000 (17:32 +0100)]
trim: clean up, fix

This does:
  * fix get_transp() on non-bash
  * re-indent of the code from #990745
  * fix terminology: it's pool
  * remove -e: I originally actually fixed -e,
    but it turns out literally every bit that could fail
    is already either || : or wasn't by accident (like in the #990745 code)
  * simplify get_transp() and explain why we do it instead of matching nvme path
  * use remove -L from the data we feed to lsblk, zpool w/o -L is measurably faster
  * pipe the devices into while read to match rest of code
  * use read -r in main loop
  * match the userprop with case/esac instead of if tree
  * shellcheck-clean the script

(cherry picked from debian-upstream[0]
commit 769a09407c6b65db981804a05a81ea63d004ebeb)

[0] https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
17 months agoupdate zfs submodule to 2.1.7 and refresh patches
Stoiko Ivanov [Fri, 2 Dec 2022 16:32:51 +0000 (17:32 +0100)]
update zfs submodule to 2.1.7 and refresh patches

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
18 months agoinstall zfs-load-key.service
Stoiko Ivanov [Mon, 17 Oct 2022 18:09:52 +0000 (20:09 +0200)]
install zfs-load-key.service

following upstream shipping it as a symlnk to /dev/null (to mask it)

follows commit b18419d7068b7ebcaa6dfbee85263177feffa711 from
debian-upstream:
https://salsa.debian.org/zfsonlinux-team/zfs/

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
18 months agocherry-pick a few patches from zfs-2.1.7-staging
Stoiko Ivanov [Mon, 17 Oct 2022 18:09:51 +0000 (20:09 +0200)]
cherry-pick a few patches from zfs-2.1.7-staging

While checking the current state of 2.1.6 we noticed that there were
some changes in debian-upstream [0] resulting from a bug-report in
zfs-upstream [1].

Our packages should be unaffected (they do not ship the
init-scripts in the first place).
Since the issue was fixed by zfs-upstream already on the
zfs-2.1.7-staging branch we should include it as well as it might save
users, who somehow got debian-upstream's zfs-packages installed on PVE
some trouble.

The other 2 changes seem small and isolated enough so including them
as well.

[0] https://salsa.debian.org/zfsonlinux-team/zfs/-/commits/master
[1] https://github.com/openzfs/zfs/issues/14010

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
19 months agod/control: recommend bsd-mailx | mailutils for ZED
Thomas Lamprecht [Mon, 17 Oct 2022 11:44:56 +0000 (13:44 +0200)]
d/control: recommend bsd-mailx | mailutils for ZED

so that it actually can send out mail by default

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
19 months agobump version to 2.1.6-pve1
Thomas Lamprecht [Tue, 4 Oct 2022 14:09:22 +0000 (16:09 +0200)]
bump version to 2.1.6-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
19 months agodebian/zfs-initramfs.lintian-overrides add overrides file
Stoiko Ivanov [Tue, 4 Oct 2022 13:48:03 +0000 (15:48 +0200)]
debian/zfs-initramfs.lintian-overrides add overrides file

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
19 months agodebian/lintian-overrides: future-proof
Stoiko Ivanov [Tue, 4 Oct 2022 13:48:02 +0000 (15:48 +0200)]
debian/lintian-overrides: future-proof

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
19 months agoSymlink zpool_influxdb to /bin. (Closes: #1001446)
Stoiko Ivanov [Tue, 4 Oct 2022 13:48:01 +0000 (15:48 +0200)]
Symlink zpool_influxdb to /bin. (Closes: #1001446)

(cherry picked from debian-upstream[0]
commit 4ce9e9b7a221ba1a84a921a34db582a2ef68b950)

[0] https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
19 months agoSymlink zfs, zpool to /bin/ for non-root usage. (Closes: #979437)
Stoiko Ivanov [Tue, 4 Oct 2022 13:48:00 +0000 (15:48 +0200)]
Symlink zfs, zpool to /bin/ for non-root usage. (Closes: #979437)

(cherry picked from debian-upstream[0]
commit 9fe812af0c9fb0382b05b300244f120179e201e7)

[0] https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
19 months agotrim: determine if a device uses nvme transport with lsblk (Closes: #990745)
Stoiko Ivanov [Tue, 4 Oct 2022 13:47:59 +0000 (15:47 +0200)]
trim: determine if a device uses nvme transport with lsblk (Closes: #990745)

Thanks to Miao Wang for get_transp() function

(cherry picked from debian-upstream[0]
commit 1f5433b15e4f7c823983bb90390c4b023f3d1948)

[0] https://salsa.debian.org/zfsonlinux-team/zfs
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
19 months agoupdate zfs submodule to 2.1.6 and refresh patches
Stoiko Ivanov [Tue, 4 Oct 2022 13:47:58 +0000 (15:47 +0200)]
update zfs submodule to 2.1.6 and refresh patches

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
22 months agobump version to 2.1.5-pve1
Thomas Lamprecht [Tue, 28 Jun 2022 14:13:51 +0000 (16:13 +0200)]
bump version to 2.1.5-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
22 months agod/control: add new zfs-dracut package
Stoiko Ivanov [Fri, 24 Jun 2022 12:55:52 +0000 (14:55 +0200)]
d/control: add new zfs-dracut package

following debian upstream (which pulled it in from Ubuntu in
44915cf387d45a123b11a8c24d3f30a8fdbcc532)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
22 months agoBuild with libcurl for new keylocation=https://
Stoiko Ivanov [Fri, 24 Jun 2022 12:55:51 +0000 (14:55 +0200)]
Build with libcurl for new keylocation=https://

following commit da40a1b007d2a99bac95bd67ec6dd7b8e217c0cf from
debian-upstream.

However since some of our rust-packages seem to depend on
libcurl4-gnutls-dev (via librust-curl-sys-dev) we add a
option for the dependency - I would assume that both should work
equally well (the callers are in upstream/lib/libzfs/libzfs_crypto.c)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
22 months agoupdate submodule and patches to ZFS
Stoiko Ivanov [Fri, 24 Jun 2022 12:55:50 +0000 (14:55 +0200)]
update submodule and patches to ZFS

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agobump version to 2.1.4-pve1
Thomas Lamprecht [Thu, 24 Mar 2022 08:28:55 +0000 (09:28 +0100)]
bump version to 2.1.4-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agoupdate zfs submodule to 2.1.4
Thomas Lamprecht [Thu, 24 Mar 2022 08:28:15 +0000 (09:28 +0100)]
update zfs submodule to 2.1.4

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agobump version to 2.1.3-pve1
Thomas Lamprecht [Fri, 11 Mar 2022 15:36:30 +0000 (16:36 +0100)]
bump version to 2.1.3-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agoadd zfs-scrub timers+services to zfsutils-linux
Stoiko Ivanov [Fri, 11 Mar 2022 12:55:09 +0000 (13:55 +0100)]
add zfs-scrub timers+services to zfsutils-linux

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agoupdate submodule and patches to ZFS 2.1.3
Stoiko Ivanov [Fri, 11 Mar 2022 12:55:08 +0000 (13:55 +0100)]
update submodule and patches to ZFS 2.1.3

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agocherry-pick lock-inversion patch for zvol_open
Stoiko Ivanov [Tue, 11 Jan 2022 15:39:36 +0000 (16:39 +0100)]
cherry-pick lock-inversion patch for zvol_open

the changes to zvol_open added to 2.1.2 (for coping with kernel
changes in 5.13) seem to have introduced a lock order inversion [0].

(noticed while reviewing the 2.0.6->2.0.7 changes (the patch was
applied after 2.1.2 was already tagged)

[0] https://github.com/openzfs/zfs/pull/12863
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agobump version to 2.1.2-pve1
Thomas Lamprecht [Tue, 11 Jan 2022 10:31:36 +0000 (11:31 +0100)]
bump version to 2.1.2-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agod/rules: allow abigail to fail
Aron Xu [Thu, 23 Dec 2021 16:22:22 +0000 (17:22 +0100)]
d/rules: allow abigail to fail

(cherry picked from debian upstream [0]
commit 5ae98b5499022c2c127d546a7b5aeb906f6f2a6b)

[0] https://salsa.debian.org/zfsonlinux-team/zfs

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agoupdate submodule and patches to ZFS 2.1.2
Stoiko Ivanov [Thu, 23 Dec 2021 16:22:21 +0000 (17:22 +0100)]
update submodule and patches to ZFS 2.1.2

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agoarcstat/arc_summary: workaround for stats only present with cache device
Stoiko Ivanov [Thu, 11 Nov 2021 17:17:25 +0000 (18:17 +0100)]
arcstat/arc_summary: workaround for stats only present with cache device

This commit updates Thomas' patch to deal with a 2.0 kernel module
with 2.1 arc_summary/arcstat

Tested by adding a cache-device to a zpool and running both commands
to verify no KeyError exception is thrown.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agobump version to 2.1.1-pve3
Thomas Lamprecht [Wed, 10 Nov 2021 08:58:06 +0000 (09:58 +0100)]
bump version to 2.1.1-pve3

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agoupdate arc stat/summary missing l2arc MFU/MRU stats patches
Thomas Lamprecht [Wed, 10 Nov 2021 08:57:42 +0000 (09:57 +0100)]
update arc stat/summary missing l2arc MFU/MRU stats patches

...

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agobump version to 2.1.1-pve2+1
Thomas Lamprecht [Wed, 10 Nov 2021 08:42:14 +0000 (09:42 +0100)]
bump version to 2.1.1-pve2+1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agoarc stat/summary: better fallback for missing l2arc MFU/MRU stats
Thomas Lamprecht [Wed, 10 Nov 2021 08:40:54 +0000 (09:40 +0100)]
arc stat/summary: better fallback for missing l2arc MFU/MRU stats

avoids issues on specific CLI options and is just more thorough.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agobump version to 2.1.1-pve2
Thomas Lamprecht [Wed, 10 Nov 2021 07:11:40 +0000 (08:11 +0100)]
bump version to 2.1.1-pve2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agoarc stat/summary: guard access to l2arc MFU/MRU stats
Thomas Lamprecht [Wed, 10 Nov 2021 07:09:30 +0000 (08:09 +0100)]
arc stat/summary: guard access to l2arc MFU/MRU stats

for better backward compat of 2.1 userspace tooling with 2.0 kernel
    module

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agobuildsys: fix DEBS variable name
Thomas Lamprecht [Tue, 28 Sep 2021 04:58:46 +0000 (06:58 +0200)]
buildsys: fix DEBS variable name

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agobump version to 2.1.1-pve1
Thomas Lamprecht [Tue, 28 Sep 2021 04:16:19 +0000 (06:16 +0200)]
bump version to 2.1.1-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agobump libzpool soname
Stoiko Ivanov [Mon, 27 Sep 2021 18:07:06 +0000 (20:07 +0200)]
bump libzpool soname

following commit ec311430e2fd66492498a1559f56ef25e1192266 ZFS
upstream due to

> Added functions (2):
> - boolean_t zpool_is_draid_spare(const char *);
> - zpool_compat_status_t zpool_load_compat(const char *,
>      boolean_t *, char *, char *);

However since libzfs increased both the current as well as the age,
as there where only addition but no changes of previously existing
ABI, the soname of the library remained at libzfs4.so - following
https://www.debian.org/doc/debian-policy/ch-sharedlibs.html I left
the package name at libzfs4linux

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 [ Thomas: added a bit more context ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agobuildsys: adapt install paths for zfs 2.1.1
Stoiko Ivanov [Mon, 27 Sep 2021 18:07:05 +0000 (20:07 +0200)]
buildsys: adapt install paths for zfs 2.1.1

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agoupdate submodule and patches to ZFS 2.1.1-staging
Stoiko Ivanov [Mon, 27 Sep 2021 18:07:04 +0000 (20:07 +0200)]
update submodule and patches to ZFS 2.1.1-staging

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agobuildsys: add pbs to upload target
Thomas Lamprecht [Wed, 21 Jul 2021 09:12:09 +0000 (11:12 +0200)]
buildsys: add pbs to upload target

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agod/control: add transitional zfs-dbg package
Fabian Grünbichler [Wed, 21 Jul 2021 08:12:46 +0000 (10:12 +0200)]
d/control: add transitional zfs-dbg package

suggesting the new -dbgsym packages without having a strict dependency
on a specific version of the library packages, like the old no longer
built zfs-dbg package had.

this commit can be reverted after the package has been uploaded once, or
kept for one release cycle if we might do the -dbgsym migration in
oldstable as well to avoid the oldstable zfs-dbg package version
overtaking the transitional one here.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2 years agobuild: switch upload target to bullseye
Fabian Grünbichler [Wed, 21 Jul 2021 08:12:45 +0000 (10:12 +0200)]
build: switch upload target to bullseye

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2 years agobump version to 2.0.5-pve1
Thomas Lamprecht [Fri, 9 Jul 2021 16:24:34 +0000 (18:24 +0200)]
bump version to 2.0.5-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 years agoupdate submodule and patches to ZFS 2.0.5
Stoiko Ivanov [Fri, 9 Jul 2021 15:41:18 +0000 (17:41 +0200)]
update submodule and patches to ZFS 2.0.5

fixes #2546

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agodo not restart most services upon upgrade
Stoiko Ivanov [Fri, 9 Jul 2021 15:41:17 +0000 (17:41 +0200)]
do not restart most services upon upgrade

zfs-zed is the only classical daemon, which benefits from a restart,
so restart only zfs-zed.

Noticed during the transition from ZFS 0.8.x to 2.0.0 zvol_wait, which
is called by zfs-volume-wait.service was changed to also output the
redacted_snap property of the datasets. This property does not exist
if the kernelmodule is still 0.8.x, causing an error to be printed to
the journal.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agodrop unused lintian overrides
Stoiko Ivanov [Thu, 17 Jun 2021 13:52:20 +0000 (15:52 +0200)]
drop unused lintian overrides

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agoupdate lintian-overrides
Stoiko Ivanov [Thu, 17 Jun 2021 13:52:19 +0000 (15:52 +0200)]
update lintian-overrides

mostly taken from debian-upstream

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agosync scrub and trim cronjobs with debian upstream
Stoiko Ivanov [Thu, 17 Jun 2021 13:52:18 +0000 (15:52 +0200)]
sync scrub and trim cronjobs with debian upstream

* Pull in the changes to the automatic scrub cronjob from
  debian-upstream [0] commit
  f6d45405df0a2ed2748975667e8ea50714034d13
* Add a script and cronjob for regular trimming of pools
* Change the logic to scrub/trim pools based on a per pool('s root
  dataset property)

pulled the changes in as one commit instead of cherry-picking, since
the planned and reverted debconf questions would have caused
unneccessary churn.

commits identified by running:
`git log --full-diff -- debian/tree/zfsutils-linux/usr/lib/zfs-linux`
in a worktree from [0].

[0] https://salsa.debian.org/zfsonlinux-team/zfs/
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agoRemove /etc/zfs/zed.d on purge
Stoiko Ivanov [Thu, 17 Jun 2021 13:52:17 +0000 (15:52 +0200)]
Remove /etc/zfs/zed.d on purge

(cherry picked from debian-upstream [0] commits
d0ba1164dcf8e566a5134d8fadef4c84d5afdf6c and
3ddeaa236e758e3dee7a9eedac66a001a11953c3)

[0] https://salsa.debian.org/zfsonlinux-team/zfs/
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agoAdjust zed.d symlink-preservation
Stoiko Ivanov [Thu, 17 Jun 2021 13:52:16 +0000 (15:52 +0200)]
Adjust zed.d symlink-preservation

Closes BTS#983401.

 - Overwrite dangling symlinks on install
 - Does not clobber symlinks on removal

Signed-off-by: Antonio Russo <aerusso@aerusso.net>
(cherry picked from commit b024d59f5976ea75ac9a0b48612b7032d24513ee)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agoBump Standards-Version to 4.5.1 (no changes)
Stoiko Ivanov [Thu, 17 Jun 2021 13:52:15 +0000 (15:52 +0200)]
Bump Standards-Version to 4.5.1 (no changes)

(adapted from debian-upstream [0] commit
b8999dc6ed1c821d5ca0e6474d7d57718b700dbf)

[0] https://salsa.debian.org/zfsonlinux-team/zfs/

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agocompat 12 automatically adds initramfs trigger
Stoiko Ivanov [Thu, 17 Jun 2021 13:52:14 +0000 (15:52 +0200)]
compat 12 automatically adds initramfs trigger

Signed-off-by: Antonio Russo <aerusso@aerusso.net>
(cherry picked from commit 1564c05d0dfa30bef120f86529a3f026538e4c4e)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agoBump debhelper compat level to 12.
Stoiko Ivanov [Thu, 17 Jun 2021 13:52:13 +0000 (15:52 +0200)]
Bump debhelper compat level to 12.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2 years agobuildsys: switch to automatic debug packages
Stoiko Ivanov [Thu, 17 Jun 2021 13:52:12 +0000 (15:52 +0200)]
buildsys: switch to automatic debug packages

automatically generated -dbgsym packages has become the default
(see dh_strip(1) and [0]).
While we have no direct need to migrate, it helps in avoiding
debhelper bug 939164 (see [1]), when migrating to debhelper-compat 12.
(alternative option would be to depend on debhelper from backports, or
to skip dh_dwz).

The change is well described in dh_strip(1).

[0] https://wiki.debian.org/AutomaticDebugPackages
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939164
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>