Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Thomas Lamprecht
|
484fdeae51 |
@@ -13,7 +13,7 @@ libpam-zfs_${ZFSPKGVER}_amd64.deb \
|
||||
libuutil3linux_${ZFSPKGVER}_amd64.deb \
|
||||
libzfs4linux_${ZFSPKGVER}_amd64.deb \
|
||||
libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb \
|
||||
libzpool5linux_${ZFSPKGVER}_amd64.deb \
|
||||
libzpool4linux_${ZFSPKGVER}_amd64.deb \
|
||||
zfs-test_${ZFSPKGVER}_amd64.deb \
|
||||
zfsutils-linux_${ZFSPKGVER}_amd64.deb \
|
||||
zfs-zed_${ZFSPKGVER}_amd64.deb
|
||||
@@ -26,13 +26,13 @@ python3-pyzfs_${ZFSPKGVER}_amd64.deb \
|
||||
pyzfs-doc_${ZFSPKGVER}_all.deb \
|
||||
spl_${ZFSPKGVER}_all.deb \
|
||||
zfs-initramfs_${ZFSPKGVER}_all.deb
|
||||
DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
|
||||
ZFS_DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
|
||||
|
||||
ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
|
||||
|
||||
all: deb
|
||||
.PHONY: deb
|
||||
deb: ${DEBS}
|
||||
deb: ${ZFS_DEBS}
|
||||
.PHONY: dsc
|
||||
dsc: ${ZFS_DSC}
|
||||
|
||||
@@ -52,11 +52,11 @@ submodule:
|
||||
${ZFSSRC}/README.md: submodule
|
||||
|
||||
.PHONY: zfs
|
||||
zfs: ${DEBS}
|
||||
zfs: ${ZFS_DEBS}
|
||||
${ZFS_DEB2}: ${ZFS_DEB1}
|
||||
${ZFS_DEB1}: ${ZFSDIR}
|
||||
cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
|
||||
lintian ${DEBS}
|
||||
lintian ${ZFS_DEBS}
|
||||
|
||||
${ZFS_DSC}: ${ZFSDIR}
|
||||
tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
|
||||
|
||||
Vendored
+3
-23
@@ -1,28 +1,8 @@
|
||||
zfs-linux (2.1.3-pve1) bullseye; urgency=medium
|
||||
zfs-linux (2.0.6-pve1) bullseye; urgency=medium
|
||||
|
||||
* update ZFS to 2.1.3
|
||||
* update ZFS to 2.0.6
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Fri, 11 Mar 2022 16:36:22 +0100
|
||||
|
||||
zfs-linux (2.1.2-pve1) bullseye; urgency=medium
|
||||
|
||||
* update ZFS to 2.1.2
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 11 Jan 2022 11:31:34 +0100
|
||||
|
||||
zfs-linux (2.1.1-pve3) bullseye; urgency=medium
|
||||
|
||||
* zfs-utils: arc stat/summary: guard access to l2arc MFU/MRU stats to avoid
|
||||
bogus exception when checking the ARC stats/summary on a older, 2.0 based
|
||||
ZFS kernel module with the newer, 2.1 based, user space tools.
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Wed, 10 Nov 2021 09:58:31 +0100
|
||||
|
||||
zfs-linux (2.1.1-pve1) bullseye; urgency=medium
|
||||
|
||||
* update ZFS to 2.1.1
|
||||
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 28 Sep 2021 06:16:14 +0200
|
||||
-- Proxmox Support Team <support@proxmox.com> Tue, 28 Sep 2021 07:36:23 +0200
|
||||
|
||||
zfs-linux (2.0.5-pve1) bullseye; urgency=medium
|
||||
|
||||
|
||||
Vendored
+4
-4
@@ -70,7 +70,7 @@ Depends: libssl-dev | libssl1.0-dev,
|
||||
libuutil3linux (= ${binary:Version}),
|
||||
libzfs4linux (= ${binary:Version}),
|
||||
libzfsbootenv1linux (= ${binary:Version}),
|
||||
libzpool5linux (= ${binary:Version}),
|
||||
libzpool4linux (= ${binary:Version}),
|
||||
${misc:Depends}
|
||||
Provides: libnvpair-dev, libuutil-dev
|
||||
Description: OpenZFS filesystem development files for Linux
|
||||
@@ -78,7 +78,7 @@ Description: OpenZFS filesystem development files for Linux
|
||||
libraries of OpenZFS filesystem.
|
||||
.
|
||||
This package includes the development files of libnvpair3, libuutil3,
|
||||
libzpool5 and libzfs4, libzfsbootenv1.
|
||||
libzpool4 and libzfs4.
|
||||
|
||||
Package: libzfs4linux
|
||||
Section: contrib/libs
|
||||
@@ -106,7 +106,7 @@ Description: OpenZFS filesystem library for Linux
|
||||
.
|
||||
The zfsbootenv library provides support for modifying ZFS label information.
|
||||
|
||||
Package: libzpool5linux
|
||||
Package: libzpool4linux
|
||||
Section: contrib/libs
|
||||
Architecture: linux-any
|
||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
||||
@@ -274,7 +274,7 @@ Suggests: libnvpair3linux-dbgsym,
|
||||
libuutil3linux-dbgsym,
|
||||
libzfs4linux-dbgsym,
|
||||
libzfsbootenv1linux-dbgsym,
|
||||
libzpool5linux-dbgsym,
|
||||
libzpool4linux-dbgsym,
|
||||
zfs-test-dbgsym,
|
||||
zfsutils-linux-dbgsym,
|
||||
zfs-zed-dbgsym,
|
||||
|
||||
@@ -10,7 +10,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
1 file changed, 29 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
|
||||
index 20064a0fb..4d5f545ad 100644
|
||||
index b3c1befaa..660d8ccb9 100644
|
||||
--- a/config/zfs-meta.m4
|
||||
+++ b/config/zfs-meta.m4
|
||||
@@ -1,9 +1,10 @@
|
||||
@@ -67,4 +67,4 @@ index 20064a0fb..4d5f545ad 100644
|
||||
+ elif test ! -f ".nogitrelease" && git rev-parse --git-dir > /dev/null 2>&1; then
|
||||
_match="${ZFS_META_NAME}-${ZFS_META_VERSION}"
|
||||
_alias=$(git describe --match=${_match} 2>/dev/null)
|
||||
_release=$(echo ${_alias}|sed "s/${ZFS_META_NAME}//"|cut -f3- -d'-'|tr - _)
|
||||
_release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')
|
||||
|
||||
@@ -14,15 +14,15 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
|
||||
index d3c083f7e..b1c8c7b9d 100644
|
||||
index f0317e23e..9a5e9cb17 100644
|
||||
--- a/etc/systemd/system/zfs-import-scan.service.in
|
||||
+++ b/etc/systemd/system/zfs-import-scan.service.in
|
||||
@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
-ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
|
||||
+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none $ZPOOL_IMPORT_OPTS
|
||||
-ExecStart=@sbindir@/zpool import -aN -o cachefile=none
|
||||
+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none
|
||||
|
||||
[Install]
|
||||
WantedBy=zfs-import.target
|
||||
|
||||
+13
-4
@@ -9,14 +9,23 @@ behavior of mdadm.
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
cmd/zed/zed.d/zed.rc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
cmd/zed/zed.d/zed.rc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
|
||||
index 9ac77f929..672617f54 100644
|
||||
index df560f921..4ce7af744 100644
|
||||
--- a/cmd/zed/zed.d/zed.rc
|
||||
+++ b/cmd/zed/zed.d/zed.rc
|
||||
@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root"
|
||||
@@ -15,7 +15,7 @@
|
||||
# Email will only be sent if ZED_EMAIL_ADDR is defined.
|
||||
# Disabled by default; uncomment to enable.
|
||||
#
|
||||
-#ZED_EMAIL_ADDR="root"
|
||||
+ZED_EMAIL_ADDR="root"
|
||||
|
||||
##
|
||||
# Name or path of executable responsible for sending notifications via email;
|
||||
@@ -41,7 +41,7 @@
|
||||
##
|
||||
# Minimum number of seconds between notifications for a similar event.
|
||||
#
|
||||
|
||||
+2
-3
@@ -16,10 +16,10 @@ Forwarded: no need
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
|
||||
index 2c8173b3e..ad39292e4 100644
|
||||
index 8b2d0c200..118c96547 100644
|
||||
--- a/cmd/zed/zed.d/Makefile.am
|
||||
+++ b/cmd/zed/zed.d/Makefile.am
|
||||
@@ -49,7 +49,7 @@ install-data-hook:
|
||||
@@ -48,6 +48,6 @@ install-data-hook:
|
||||
for f in $(zedconfdefaults); do \
|
||||
test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
|
||||
-L "$(DESTDIR)$(zedconfdir)/$${f}" || \
|
||||
@@ -27,4 +27,3 @@ index 2c8173b3e..ad39292e4 100644
|
||||
+ echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
|
||||
done
|
||||
chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
|
||||
|
||||
|
||||
+4
-4
@@ -28,11 +28,11 @@ index 3788543b0..c7ee4ae9a 100755
|
||||
|
||||
typeset -i cnt=0
|
||||
diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
|
||||
index 370f5382e..661fbe85d 100755
|
||||
index f89cb3b31..375d483f7 100755
|
||||
--- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
|
||||
+++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
|
||||
@@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
|
||||
# OpenZFS issue #7432
|
||||
# ZoL issue #7432
|
||||
log_must zfs set compression=on xattr=sa $TESTPOOL/$TESTFS2
|
||||
log_must touch /$TESTPOOL/$TESTFS2/attrs
|
||||
-log_must eval "python -c 'print \"a\" * 4096' | \
|
||||
@@ -41,10 +41,10 @@ index 370f5382e..661fbe85d 100755
|
||||
log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2
|
||||
|
||||
diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
|
||||
index 551ed15db..bd30488ea 100755
|
||||
index 394fe95bb..43560aac5 100755
|
||||
--- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
|
||||
+++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
|
||||
@@ -88,7 +88,7 @@ log_must zfs snapshot $POOL/fs@c
|
||||
@@ -93,7 +93,7 @@ log_must zfs snapshot $POOL/fs@c
|
||||
# 4. Create an empty file and add xattrs to it to exercise reclaiming a
|
||||
# dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
|
||||
log_must zfs set compression=on xattr=sa $POOL/fs
|
||||
|
||||
@@ -31,7 +31,7 @@ index e4056a92c..030611419 100644
|
||||
enable zfs-mount.service
|
||||
enable zfs-share.service
|
||||
diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
|
||||
index 5e65e1db4..8e6baeb68 100644
|
||||
index c374a52ac..25d1b99d7 100644
|
||||
--- a/etc/systemd/system/Makefile.am
|
||||
+++ b/etc/systemd/system/Makefile.am
|
||||
@@ -7,6 +7,7 @@ systemdunit_DATA = \
|
||||
|
||||
@@ -8,44 +8,47 @@ Originally-By: Antonio Russo <aerusso@aerusso.net>
|
||||
|
||||
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
||||
---
|
||||
man/Makefile.am | 2 +-
|
||||
man/man1/Makefile.am | 2 +-
|
||||
man/man8/Makefile.am | 1 +
|
||||
man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
3 files changed, 3 insertions(+), 2 deletions(-)
|
||||
rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
|
||||
|
||||
diff --git a/man/Makefile.am b/man/Makefile.am
|
||||
index 8ab1b7572..8b3dbe633 100644
|
||||
--- a/man/Makefile.am
|
||||
+++ b/man/Makefile.am
|
||||
@@ -8,7 +8,6 @@ dist_man_MANS = \
|
||||
man1/ztest.1 \
|
||||
man1/raidz_test.1 \
|
||||
man1/zvol_wait.1 \
|
||||
- man1/arcstat.1 \
|
||||
\
|
||||
man5/vdev_id.conf.5 \
|
||||
\
|
||||
@@ -21,6 +20,7 @@ dist_man_MANS = \
|
||||
man7/zpoolconcepts.7 \
|
||||
man7/zpoolprops.7 \
|
||||
\
|
||||
+ man8/arcstat.8 \
|
||||
man8/fsck.zfs.8 \
|
||||
man8/mount.zfs.8 \
|
||||
man8/vdev_id.8 \
|
||||
diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
|
||||
index 8d7457a3e..101af7b6c 100644
|
||||
--- a/man/man1/Makefile.am
|
||||
+++ b/man/man1/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
-dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
|
||||
+dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1
|
||||
EXTRA_DIST = cstyle.1
|
||||
|
||||
if BUILD_LINUX
|
||||
diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
|
||||
index 07f6aefa6..a757b1c62 100644
|
||||
--- a/man/man8/Makefile.am
|
||||
+++ b/man/man8/Makefile.am
|
||||
@@ -1,6 +1,7 @@
|
||||
include $(top_srcdir)/config/Substfiles.am
|
||||
|
||||
dist_man_MANS = \
|
||||
+ arcstat.8 \
|
||||
fsck.zfs.8 \
|
||||
mount.zfs.8 \
|
||||
vdev_id.8 \
|
||||
diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
|
||||
similarity index 99%
|
||||
rename from man/man1/arcstat.1
|
||||
rename to man/man8/arcstat.8
|
||||
index a69cd8937..dfe9c971b 100644
|
||||
index ca508b49c..0aa81849a 100644
|
||||
--- a/man/man1/arcstat.1
|
||||
+++ b/man/man8/arcstat.8
|
||||
@@ -13,7 +13,7 @@
|
||||
.\" Copyright (c) 2015 by Delphix. All rights reserved.
|
||||
.\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
|
||||
.\"
|
||||
.Dd May 26, 2021
|
||||
-.Dt ARCSTAT 1
|
||||
+.Dt ARCSTAT 8
|
||||
.Os
|
||||
.
|
||||
.Sh NAME
|
||||
-.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS
|
||||
+.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS
|
||||
.SH NAME
|
||||
arcstat \- report ZFS ARC and L2ARC statistics
|
||||
.SH SYNOPSIS
|
||||
|
||||
@@ -1,134 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Valmiky Arquissandas <kayvlim@gmail.com>
|
||||
Date: Fri, 8 Oct 2021 16:32:27 +0100
|
||||
Subject: [PATCH] arcstat: Fix integer division with python3
|
||||
|
||||
The arcstat script requests compatibility with python2 and python3, but
|
||||
PEP 238 modified the / operator and results in erroneous output when
|
||||
run under python3.
|
||||
|
||||
This commit replaces instances of / with //, yielding the expected
|
||||
result in both versions of Python.
|
||||
|
||||
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
|
||||
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
|
||||
Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
|
||||
Signed-off-by: Valmiky Arquissandas <foss@kayvlim.com>
|
||||
Closes #12603
|
||||
(cherry picked from commit 2d02bba23d83ae8fede8d281edc255f01ccd28e9)
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
cmd/arcstat/arcstat.in | 66 +++++++++++++++++++++---------------------
|
||||
1 file changed, 33 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
|
||||
index 9e7c52a6c..cd9a803a2 100755
|
||||
--- a/cmd/arcstat/arcstat.in
|
||||
+++ b/cmd/arcstat/arcstat.in
|
||||
@@ -441,73 +441,73 @@ def calculate():
|
||||
|
||||
v = dict()
|
||||
v["time"] = time.strftime("%H:%M:%S", time.localtime())
|
||||
- v["hits"] = d["hits"] / sint
|
||||
- v["miss"] = d["misses"] / sint
|
||||
+ v["hits"] = d["hits"] // sint
|
||||
+ v["miss"] = d["misses"] // sint
|
||||
v["read"] = v["hits"] + v["miss"]
|
||||
- v["hit%"] = 100 * v["hits"] / v["read"] if v["read"] > 0 else 0
|
||||
+ v["hit%"] = 100 * v["hits"] // v["read"] if v["read"] > 0 else 0
|
||||
v["miss%"] = 100 - v["hit%"] if v["read"] > 0 else 0
|
||||
|
||||
- v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) / sint
|
||||
- v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) / sint
|
||||
+ v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) // sint
|
||||
+ v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) // sint
|
||||
|
||||
v["dread"] = v["dhit"] + v["dmis"]
|
||||
- v["dh%"] = 100 * v["dhit"] / v["dread"] if v["dread"] > 0 else 0
|
||||
+ v["dh%"] = 100 * v["dhit"] // v["dread"] if v["dread"] > 0 else 0
|
||||
v["dm%"] = 100 - v["dh%"] if v["dread"] > 0 else 0
|
||||
|
||||
- v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) / sint
|
||||
+ v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) // sint
|
||||
v["pmis"] = (d["prefetch_data_misses"] +
|
||||
- d["prefetch_metadata_misses"]) / sint
|
||||
+ d["prefetch_metadata_misses"]) // sint
|
||||
|
||||
v["pread"] = v["phit"] + v["pmis"]
|
||||
- v["ph%"] = 100 * v["phit"] / v["pread"] if v["pread"] > 0 else 0
|
||||
+ v["ph%"] = 100 * v["phit"] // v["pread"] if v["pread"] > 0 else 0
|
||||
v["pm%"] = 100 - v["ph%"] if v["pread"] > 0 else 0
|
||||
|
||||
v["mhit"] = (d["prefetch_metadata_hits"] +
|
||||
- d["demand_metadata_hits"]) / sint
|
||||
+ d["demand_metadata_hits"]) // sint
|
||||
v["mmis"] = (d["prefetch_metadata_misses"] +
|
||||
- d["demand_metadata_misses"]) / sint
|
||||
+ d["demand_metadata_misses"]) // sint
|
||||
|
||||
v["mread"] = v["mhit"] + v["mmis"]
|
||||
- v["mh%"] = 100 * v["mhit"] / v["mread"] if v["mread"] > 0 else 0
|
||||
+ v["mh%"] = 100 * v["mhit"] // v["mread"] if v["mread"] > 0 else 0
|
||||
v["mm%"] = 100 - v["mh%"] if v["mread"] > 0 else 0
|
||||
|
||||
v["arcsz"] = cur["size"]
|
||||
v["size"] = cur["size"]
|
||||
v["c"] = cur["c"]
|
||||
- v["mfu"] = d["mfu_hits"] / sint
|
||||
- v["mru"] = d["mru_hits"] / sint
|
||||
- v["mrug"] = d["mru_ghost_hits"] / sint
|
||||
- v["mfug"] = d["mfu_ghost_hits"] / sint
|
||||
- v["eskip"] = d["evict_skip"] / sint
|
||||
- v["el2skip"] = d["evict_l2_skip"] / sint
|
||||
- v["el2cach"] = d["evict_l2_cached"] / sint
|
||||
- v["el2el"] = d["evict_l2_eligible"] / sint
|
||||
- v["el2mfu"] = d["evict_l2_eligible_mfu"] / sint
|
||||
- v["el2mru"] = d["evict_l2_eligible_mru"] / sint
|
||||
- v["el2inel"] = d["evict_l2_ineligible"] / sint
|
||||
- v["mtxmis"] = d["mutex_miss"] / sint
|
||||
+ v["mfu"] = d["mfu_hits"] // sint
|
||||
+ v["mru"] = d["mru_hits"] // sint
|
||||
+ v["mrug"] = d["mru_ghost_hits"] // sint
|
||||
+ v["mfug"] = d["mfu_ghost_hits"] // sint
|
||||
+ v["eskip"] = d["evict_skip"] // sint
|
||||
+ v["el2skip"] = d["evict_l2_skip"] // sint
|
||||
+ v["el2cach"] = d["evict_l2_cached"] // sint
|
||||
+ v["el2el"] = d["evict_l2_eligible"] // sint
|
||||
+ v["el2mfu"] = d["evict_l2_eligible_mfu"] // sint
|
||||
+ v["el2mru"] = d["evict_l2_eligible_mru"] // sint
|
||||
+ v["el2inel"] = d["evict_l2_ineligible"] // sint
|
||||
+ v["mtxmis"] = d["mutex_miss"] // sint
|
||||
|
||||
if l2exist:
|
||||
- v["l2hits"] = d["l2_hits"] / sint
|
||||
- v["l2miss"] = d["l2_misses"] / sint
|
||||
+ v["l2hits"] = d["l2_hits"] // sint
|
||||
+ v["l2miss"] = d["l2_misses"] // sint
|
||||
v["l2read"] = v["l2hits"] + v["l2miss"]
|
||||
- v["l2hit%"] = 100 * v["l2hits"] / v["l2read"] if v["l2read"] > 0 else 0
|
||||
+ v["l2hit%"] = 100 * v["l2hits"] // v["l2read"] if v["l2read"] > 0 else 0
|
||||
|
||||
v["l2miss%"] = 100 - v["l2hit%"] if v["l2read"] > 0 else 0
|
||||
v["l2asize"] = cur["l2_asize"]
|
||||
v["l2size"] = cur["l2_size"]
|
||||
- v["l2bytes"] = d["l2_read_bytes"] / sint
|
||||
+ v["l2bytes"] = d["l2_read_bytes"] // sint
|
||||
|
||||
v["l2pref"] = cur["l2_prefetch_asize"]
|
||||
v["l2mfu"] = cur["l2_mfu_asize"]
|
||||
v["l2mru"] = cur["l2_mru_asize"]
|
||||
v["l2data"] = cur["l2_bufc_data_asize"]
|
||||
v["l2meta"] = cur["l2_bufc_metadata_asize"]
|
||||
- v["l2pref%"] = 100 * v["l2pref"] / v["l2asize"]
|
||||
- v["l2mfu%"] = 100 * v["l2mfu"] / v["l2asize"]
|
||||
- v["l2mru%"] = 100 * v["l2mru"] / v["l2asize"]
|
||||
- v["l2data%"] = 100 * v["l2data"] / v["l2asize"]
|
||||
- v["l2meta%"] = 100 * v["l2meta"] / v["l2asize"]
|
||||
+ v["l2pref%"] = 100 * v["l2pref"] // v["l2asize"]
|
||||
+ v["l2mfu%"] = 100 * v["l2mfu"] // v["l2asize"]
|
||||
+ v["l2mru%"] = 100 * v["l2mru"] // v["l2asize"]
|
||||
+ v["l2data%"] = 100 * v["l2data"] // v["l2asize"]
|
||||
+ v["l2meta%"] = 100 * v["l2meta"] // v["l2asize"]
|
||||
|
||||
v["grow"] = 0 if cur["arc_no_grow"] else 1
|
||||
v["need"] = cur["arc_need_free"]
|
||||
-112
@@ -1,112 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
Date: Wed, 10 Nov 2021 09:29:47 +0100
|
||||
Subject: [PATCH] arc stat/summary: guard access to l2arc MFU/MRU stats
|
||||
|
||||
commit 085321621e79a75bea41c2b6511da6ebfbf2ba0a added printing MFU
|
||||
and MRU stats for 2.1 user space tools, but those keys are not
|
||||
available in the 2.0 module. That means it may break the arcstat and
|
||||
arc_summary tools after upgrade to 2.1 (user space), before a reboot
|
||||
to the new 2.1 ZFS kernel-module happened, due to python raising a
|
||||
KeyError on the dict access then.
|
||||
|
||||
Move those two keys to a .get accessor with `0` as fallback, as it
|
||||
should be better to show some possible wrong data for new stat-keys
|
||||
than throwing an exception.
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
|
||||
also move l2_mfu_asize l2_mru_asize l2_prefetch_asize
|
||||
l2_bufc_data_asize l2_bufc_metadata_asize to .get accessor
|
||||
(these are only present with a cache device in the pool)
|
||||
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
||||
---
|
||||
cmd/arc_summary/arc_summary3 | 28 ++++++++++++++--------------
|
||||
cmd/arcstat/arcstat.in | 14 +++++++-------
|
||||
2 files changed, 21 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/cmd/arc_summary/arc_summary3 b/cmd/arc_summary/arc_summary3
|
||||
index 7b28012ed..fe6a6d9e2 100755
|
||||
--- a/cmd/arc_summary/arc_summary3
|
||||
+++ b/cmd/arc_summary/arc_summary3
|
||||
@@ -617,13 +617,13 @@ def section_arc(kstats_dict):
|
||||
prt_i1('L2 cached evictions:', f_bytes(arc_stats['evict_l2_cached']))
|
||||
prt_i1('L2 eligible evictions:', f_bytes(arc_stats['evict_l2_eligible']))
|
||||
prt_i2('L2 eligible MFU evictions:',
|
||||
- f_perc(arc_stats['evict_l2_eligible_mfu'],
|
||||
+ f_perc(arc_stats.get('evict_l2_eligible_mfu', 0), # 2.0 module compat
|
||||
arc_stats['evict_l2_eligible']),
|
||||
- f_bytes(arc_stats['evict_l2_eligible_mfu']))
|
||||
+ f_bytes(arc_stats.get('evict_l2_eligible_mfu', 0)))
|
||||
prt_i2('L2 eligible MRU evictions:',
|
||||
- f_perc(arc_stats['evict_l2_eligible_mru'],
|
||||
+ f_perc(arc_stats.get('evict_l2_eligible_mru', 0), # 2.0 module compat
|
||||
arc_stats['evict_l2_eligible']),
|
||||
- f_bytes(arc_stats['evict_l2_eligible_mru']))
|
||||
+ f_bytes(arc_stats.get('evict_l2_eligible_mru', 0)))
|
||||
prt_i1('L2 ineligible evictions:',
|
||||
f_bytes(arc_stats['evict_l2_ineligible']))
|
||||
print()
|
||||
@@ -765,20 +765,20 @@ def section_l2arc(kstats_dict):
|
||||
f_perc(arc_stats['l2_hdr_size'], arc_stats['l2_size']),
|
||||
f_bytes(arc_stats['l2_hdr_size']))
|
||||
prt_i2('MFU allocated size:',
|
||||
- f_perc(arc_stats['l2_mfu_asize'], arc_stats['l2_asize']),
|
||||
- f_bytes(arc_stats['l2_mfu_asize']))
|
||||
+ f_perc(arc_stats.get('l2_mfu_asize', 0), arc_stats['l2_asize']),
|
||||
+ f_bytes(arc_stats.get('l2_mfu_asize', 0))) # 2.0 module compat
|
||||
prt_i2('MRU allocated size:',
|
||||
- f_perc(arc_stats['l2_mru_asize'], arc_stats['l2_asize']),
|
||||
- f_bytes(arc_stats['l2_mru_asize']))
|
||||
+ f_perc(arc_stats.get('l2_mru_asize', 0), arc_stats['l2_asize']),
|
||||
+ f_bytes(arc_stats.get('l2_mru_asize', 0))) # 2.0 module compat
|
||||
prt_i2('Prefetch allocated size:',
|
||||
- f_perc(arc_stats['l2_prefetch_asize'], arc_stats['l2_asize']),
|
||||
- f_bytes(arc_stats['l2_prefetch_asize']))
|
||||
+ f_perc(arc_stats.get('l2_prefetch_asize', 0), arc_stats['l2_asize']),
|
||||
+ f_bytes(arc_stats.get('l2_prefetch_asize',0))) # 2.0 module compat
|
||||
prt_i2('Data (buffer content) allocated size:',
|
||||
- f_perc(arc_stats['l2_bufc_data_asize'], arc_stats['l2_asize']),
|
||||
- f_bytes(arc_stats['l2_bufc_data_asize']))
|
||||
+ f_perc(arc_stats.get('l2_bufc_data_asize', 0), arc_stats['l2_asize']),
|
||||
+ f_bytes(arc_stats.get('l2_bufc_data_asize', 0))) # 2.0 module compat
|
||||
prt_i2('Metadata (buffer content) allocated size:',
|
||||
- f_perc(arc_stats['l2_bufc_metadata_asize'], arc_stats['l2_asize']),
|
||||
- f_bytes(arc_stats['l2_bufc_metadata_asize']))
|
||||
+ f_perc(arc_stats.get('l2_bufc_metadata_asize', 0), arc_stats['l2_asize']),
|
||||
+ f_bytes(arc_stats.get('l2_bufc_metadata_asize', 0))) # 2.0 module compat
|
||||
|
||||
print()
|
||||
prt_1('L2ARC breakdown:', f_hits(l2_access_total))
|
||||
diff --git a/cmd/arcstat/arcstat.in b/cmd/arcstat/arcstat.in
|
||||
index cd9a803a2..ea45dc602 100755
|
||||
--- a/cmd/arcstat/arcstat.in
|
||||
+++ b/cmd/arcstat/arcstat.in
|
||||
@@ -482,8 +482,8 @@ def calculate():
|
||||
v["el2skip"] = d["evict_l2_skip"] // sint
|
||||
v["el2cach"] = d["evict_l2_cached"] // sint
|
||||
v["el2el"] = d["evict_l2_eligible"] // sint
|
||||
- v["el2mfu"] = d["evict_l2_eligible_mfu"] // sint
|
||||
- v["el2mru"] = d["evict_l2_eligible_mru"] // sint
|
||||
+ v["el2mfu"] = d.get("evict_l2_eligible_mfu", 0) // sint
|
||||
+ v["el2mru"] = d.get("evict_l2_eligible_mru", 0) // sint
|
||||
v["el2inel"] = d["evict_l2_ineligible"] // sint
|
||||
v["mtxmis"] = d["mutex_miss"] // sint
|
||||
|
||||
@@ -498,11 +498,11 @@ def calculate():
|
||||
v["l2size"] = cur["l2_size"]
|
||||
v["l2bytes"] = d["l2_read_bytes"] // sint
|
||||
|
||||
- v["l2pref"] = cur["l2_prefetch_asize"]
|
||||
- v["l2mfu"] = cur["l2_mfu_asize"]
|
||||
- v["l2mru"] = cur["l2_mru_asize"]
|
||||
- v["l2data"] = cur["l2_bufc_data_asize"]
|
||||
- v["l2meta"] = cur["l2_bufc_metadata_asize"]
|
||||
+ v["l2pref"] = cur.get("l2_prefetch_asize", 0)
|
||||
+ v["l2mfu"] = cur.get("l2_mfu_asize", 0)
|
||||
+ v["l2mru"] = cur.get("l2_mru_asize", 0)
|
||||
+ v["l2data"] = cur.get("l2_bufc_data_asize", 0)
|
||||
+ v["l2meta"] = cur.get("l2_bufc_metadata_asize", 0)
|
||||
v["l2pref%"] = 100 * v["l2pref"] // v["l2asize"]
|
||||
v["l2mfu%"] = 100 * v["l2mfu"] // v["l2asize"]
|
||||
v["l2mru%"] = 100 * v["l2mru"] // v["l2asize"]
|
||||
Vendored
-2
@@ -7,5 +7,3 @@
|
||||
0007-Use-installed-python3.patch
|
||||
0008-Add-systemd-unit-for-importing-specific-pools.patch
|
||||
0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
|
||||
0010-arcstat-Fix-integer-division-with-python3.patch
|
||||
0011-arc-stat-summary-guard-access-to-l2arc-MFU-MRU-stats.patch
|
||||
|
||||
Vendored
+1
-1
@@ -50,7 +50,7 @@ override_dh_auto_test:
|
||||
override_dh_auto_test:
|
||||
ifeq (amd64,$(DEB_HOST_ARCH))
|
||||
# Upstream provides an ABI guarantee that we validate here
|
||||
-$(MAKE) checkabi
|
||||
$(MAKE) checkabi
|
||||
endif
|
||||
|
||||
# The dh_auto_test rule is disabled because
|
||||
|
||||
Vendored
+4
-13
@@ -9,9 +9,6 @@ lib/systemd/system/zfs-import@.service
|
||||
lib/systemd/system/zfs-import.target
|
||||
lib/systemd/system/zfs-import.service
|
||||
lib/systemd/system/zfs-mount.service
|
||||
lib/systemd/system/zfs-scrub-monthly@.timer
|
||||
lib/systemd/system/zfs-scrub-weekly@.timer
|
||||
lib/systemd/system/zfs-scrub@.service
|
||||
lib/systemd/system/zfs-share.service
|
||||
lib/systemd/system/zfs-volume-wait.service
|
||||
lib/systemd/system/zfs-volumes.target
|
||||
@@ -31,7 +28,6 @@ sbin/zstreamdump
|
||||
usr/bin/zvol_wait
|
||||
usr/lib/modules-load.d/ lib/
|
||||
usr/lib/zfs-linux/zpool.d/
|
||||
usr/lib/zfs-linux/zpool_influxdb
|
||||
usr/sbin/arc_summary
|
||||
usr/sbin/arcstat
|
||||
usr/sbin/dbufstat
|
||||
@@ -39,14 +35,7 @@ usr/share/bash-completion/completions
|
||||
usr/share/man/man8/arcstat.8
|
||||
usr/share/man/man1/zhack.1
|
||||
usr/share/man/man1/zvol_wait.1
|
||||
usr/share/man/man4/zfs.4
|
||||
usr/share/man/man4/spl.4
|
||||
usr/share/man/man5/
|
||||
usr/share/man/man7/zfsconcepts.7
|
||||
usr/share/man/man7/zfsprops.7
|
||||
usr/share/man/man7/zpoolconcepts.7
|
||||
usr/share/man/man7/zpoolprops.7
|
||||
usr/share/man/man7/zpool-features.7
|
||||
usr/share/man/man8/fsck.zfs.8
|
||||
usr/share/man/man8/mount.zfs.8
|
||||
usr/share/man/man8/vdev_id.8
|
||||
@@ -90,6 +79,8 @@ usr/share/man/man8/zfs-userspace.8
|
||||
usr/share/man/man8/zfs-wait.8
|
||||
usr/share/man/man8/zfs.8
|
||||
usr/share/man/man8/zfs_ids_to_path.8
|
||||
usr/share/man/man8/zfsconcepts.8
|
||||
usr/share/man/man8/zfsprops.8
|
||||
usr/share/man/man8/zgenhostid.8
|
||||
usr/share/man/man8/zpool-add.8
|
||||
usr/share/man/man8/zpool-attach.8
|
||||
@@ -103,7 +94,6 @@ usr/share/man/man8/zpool-export.8
|
||||
usr/share/man/man8/zpool-get.8
|
||||
usr/share/man/man8/zpool-history.8
|
||||
usr/share/man/man8/zpool-import.8
|
||||
usr/share/man/man8/zpool_influxdb.8
|
||||
usr/share/man/man8/zpool-initialize.8
|
||||
usr/share/man/man8/zpool-iostat.8
|
||||
usr/share/man/man8/zpool-labelclear.8
|
||||
@@ -124,6 +114,7 @@ usr/share/man/man8/zpool-trim.8
|
||||
usr/share/man/man8/zpool-upgrade.8
|
||||
usr/share/man/man8/zpool-wait.8
|
||||
usr/share/man/man8/zpool.8
|
||||
usr/share/man/man8/zpoolconcepts.8
|
||||
usr/share/man/man8/zpoolprops.8
|
||||
usr/share/man/man8/zstream.8
|
||||
usr/share/man/man8/zstreamdump.8
|
||||
usr/share/zfs/compatibility.d/
|
||||
|
||||
+1
-1
Submodule upstream updated: ef83e07db5...ef686e96ec
Reference in New Issue
Block a user