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>
This commit is contained in:
parent
cb19e379cd
commit
f17f9da9f3
@ -1,12 +1,45 @@
|
|||||||
#!/bin/sh -eu
|
#!/bin/sh -eu
|
||||||
|
|
||||||
# Scrub all healthy pools that are not already scrubbing.
|
# directly exit successfully when zfs module is not loaded
|
||||||
|
if ! [ -d /sys/module/zfs ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# [auto] / enable / disable
|
||||||
|
PROPERTY_NAME="org.debian:periodic-scrub"
|
||||||
|
|
||||||
|
get_property () {
|
||||||
|
# Detect the ${PROPERTY_NAME} property on a given pool.
|
||||||
|
# We are abusing user-defined properties on the root dataset,
|
||||||
|
# since they're not available on pools https://github.com/openzfs/zfs/pull/11680
|
||||||
|
# TODO: use zpool user-defined property when such feature is available.
|
||||||
|
pool="$1"
|
||||||
|
zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null || return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
scrub_if_not_scrub_in_progress () {
|
||||||
|
pool="$1"
|
||||||
|
if ! zpool status "${pool}" | grep -q "scrub in progress"; then
|
||||||
|
# Ignore errors and continue with scrubbing other pools.
|
||||||
|
zpool scrub "${pool}" || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Scrub all healthy pools that are not already scrubbing as per their configs.
|
||||||
zpool list -H -o health,name 2>&1 | \
|
zpool list -H -o health,name 2>&1 | \
|
||||||
awk 'BEGIN {FS="\t"} {if ($1 ~ /^ONLINE/) print $2}' | \
|
awk -F'\t' '$1 == "ONLINE" {print $2}' | \
|
||||||
while read pool
|
while read pool
|
||||||
do
|
do
|
||||||
if ! zpool status "$pool" | grep -q "scrub in progress"
|
# read user-defined config
|
||||||
then
|
ret=$(get_property "${pool}")
|
||||||
zpool scrub "$pool"
|
if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
|
||||||
|
:
|
||||||
|
elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ] || [ "enable" = "${ret}" ]; then
|
||||||
|
scrub_if_not_scrub_in_progress "${pool}"
|
||||||
|
else
|
||||||
|
cat > /dev/stderr <<EOF
|
||||||
|
$0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
|
||||||
|
$0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
|
||||||
|
EOF
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
60
debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim
vendored
Executable file
60
debian/tree/zfsutils-linux/usr/lib/zfs-linux/trim
vendored
Executable file
@ -0,0 +1,60 @@
|
|||||||
|
#!/bin/sh -eu
|
||||||
|
|
||||||
|
# directly exit successfully when zfs module is not loaded
|
||||||
|
if ! [ -d /sys/module/zfs ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# [auto] / enable / disable
|
||||||
|
PROPERTY_NAME="org.debian:periodic-trim"
|
||||||
|
|
||||||
|
get_property () {
|
||||||
|
# Detect the ${PROPERTY_NAME} property on a given pool.
|
||||||
|
# We are abusing user-defined properties on the root dataset,
|
||||||
|
# since they're not available on pools https://github.com/openzfs/zfs/pull/11680
|
||||||
|
# TODO: use zpool user-defined property when such feature is available.
|
||||||
|
pool="$1"
|
||||||
|
zfs get -H -o value "${PROPERTY_NAME}" "${pool}" 2>/dev/null || return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
trim_if_not_already_trimming () {
|
||||||
|
pool="$1"
|
||||||
|
if ! zpool status "${pool}" | grep -q "trimming"; then
|
||||||
|
# Ignore errors (i.e. HDD pools),
|
||||||
|
# and continue with trimming other pools.
|
||||||
|
zpool trim "${pool}" || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
zpool_is_nvme_only () {
|
||||||
|
zpool=$1
|
||||||
|
# get a list of devices attached to the specified zpool
|
||||||
|
zpool list -vHPL "${zpool}" |
|
||||||
|
awk -F'\t' '$2 ~ /^\/dev\// {
|
||||||
|
if($2 !~ /^\/dev\/nvme/)
|
||||||
|
exit 1
|
||||||
|
}'
|
||||||
|
}
|
||||||
|
|
||||||
|
# TRIM all healthy pools that are not already trimming as per their configs.
|
||||||
|
zpool list -H -o health,name 2>&1 | \
|
||||||
|
awk -F'\t' '$1 == "ONLINE" {print $2}' | \
|
||||||
|
while read pool
|
||||||
|
do
|
||||||
|
# read user-defined config
|
||||||
|
ret=$(get_property "${pool}")
|
||||||
|
if [ $? -ne 0 ] || [ "disable" = "${ret}" ]; then
|
||||||
|
:
|
||||||
|
elif [ "enable" = "${ret}" ]; then
|
||||||
|
trim_if_not_already_trimming "${pool}"
|
||||||
|
elif [ "-" = "${ret}" ] || [ "auto" = "${ret}" ]; then
|
||||||
|
if zpool_is_nvme_only "${pool}"; then
|
||||||
|
trim_if_not_already_trimming "${pool}"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
cat > /dev/stderr <<EOF
|
||||||
|
$0: [WARNING] illegal value "${ret}" for property "${PROPERTY_NAME}" of ZFS dataset "${pool}".
|
||||||
|
$0: Acceptable choices for this property are: auto, enable, disable. The default is auto.
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
done
|
5
debian/zfsutils-linux.cron.d
vendored
5
debian/zfsutils-linux.cron.d
vendored
@ -1,4 +1,7 @@
|
|||||||
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
||||||
|
|
||||||
|
# TRIM the first Sunday of every month.
|
||||||
|
24 0 1-7 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/trim ]; then /usr/lib/zfs-linux/trim; fi
|
||||||
|
|
||||||
# Scrub the second Sunday of every month.
|
# Scrub the second Sunday of every month.
|
||||||
24 0 8-14 * * root [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ] && /usr/lib/zfs-linux/scrub
|
24 0 8-14 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ]; then /usr/lib/zfs-linux/scrub; fi
|
||||||
|
Loading…
Reference in New Issue
Block a user