Skip to content

zfs-2.3.1 patchset #17114

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

Merged
merged 46 commits into from
Mar 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
54eec0f
ZTS: remove empty zpool_add--allow-ashift-mismatch test
robn Jan 7, 2025
675b49d
FreeBSD: Use ashift in vdev_check_boot_reserve()
amotin Jan 11, 2025
fabdd50
zinject: count matches and injections for each handler
robn Jan 13, 2025
8eba6a5
Makefile.in: pass ARCH for modules_install as well
robn Jan 14, 2025
404254b
style: remove unnecessary spaces in sa.h
LittleNewton Jan 17, 2025
c36faf6
Update RELEASES.md LTS release to 2.2
tonyhutter Jan 17, 2025
083d322
zfs-destroy.8: Fix minor formatting typo
concussious Jan 20, 2025
e6c98d1
Fix several typos in the man pages
tas50 Jan 21, 2025
198621f
ZTS: reimplement kstat helper function
robn Jan 16, 2025
6edbbe0
ZTS: update existing kstat users to new helper
robn Jan 15, 2025
cf55fde
ZTS: remove get_arcstat
robn Jan 15, 2025
0dfcfe0
zinject: make iotype extendable
robn Jan 8, 2025
a28f5a9
zinject: add "probe" device injection type
robn Jan 8, 2025
42bad93
FreeBSD: Add setting of the VFCF_FILEREV flag
rmacklem Jan 23, 2025
6e99112
Make the vfs.zfs.vdev.raidz_impl sysctl cross-platform
asomers Jan 29, 2025
0e21e47
Update pin_user_pages() calls for Direct I/O
bwatkinson Jan 30, 2025
1aa4351
Add recursive dataset mounting and unmounting support to pam_zfs_key …
jkolo Jan 31, 2025
67f0469
Avoid ARC buffer transfrom operations in prefetch
JkshirsagarMaxlinear Feb 1, 2025
3b5c3f5
zio: lock parent zios when updating wait counts on reexecute
robn Feb 4, 2025
51bec16
Linux 6.14: dops->d_revalidate now takes four args
robn Feb 5, 2025
3266d4d
Linux 6.14: BLK_MQ_F_SHOULD_MERGE was removed
robn Feb 5, 2025
d1b0c4e
Clarify documentation of `zfs destroy` on snapshots (#17021)
mnrx Feb 5, 2025
a77b639
Fix typos in zpool_do_scrub() error messages (#17028)
0mp Feb 5, 2025
2adca17
Expand fragmentation table to reflect larger possibile allocation sizes
pcd1193182 Feb 6, 2025
a0f8d3c
Add kstats tracking gang allocations
pcd1193182 Feb 6, 2025
7784947
optimize recv_fix_encryption_hierarchy()
gamanakis Feb 6, 2025
001ab59
Fix "make install" with DESTDIR set (#16995)
kohlschuetter Feb 8, 2025
0be3b26
zio: do no-op injections just before handing off to vdevs
robn Feb 8, 2025
8487b6c
Update the dataset name in handle after zfs_rename (#17040)
Feb 11, 2025
c4fa9c2
Free memory in an error path in spl-kmem-cache.c
vandanarungta Feb 12, 2025
55b2155
Linux 6.12 compat: Rename range_tree_* to zfs_range_tree_*
IvanVolosyuk Jan 30, 2025
1bdce04
range_tree: convert remaining range_* defs to zfs_range_*
robn Feb 10, 2025
f2ab5b8
Fix metaslab group fragmentation math (#17037)
amotin Feb 18, 2025
af062c4
vdev_file: unify FreeBSD and Linux implementations (#17046)
robn Feb 20, 2025
e085d66
Fix wrong free function in arc_hdr_decrypt
tuxoko Feb 22, 2025
7ea899b
vdev_file: make FLUSH and TRIM asynchronous
robn Feb 22, 2025
92d1686
include: move zio_priority_t into zfs.h
robn Feb 22, 2025
b4ce059
suspend_resume_single: clear pool errors on fail
robn Feb 23, 2025
c2668b2
Better fill empty metaslabs
amotin Feb 25, 2025
383256c
spa: fix signature mismatch for spa_boot_init as eventhandler required
aokblast Feb 25, 2025
7e72312
Don't try to get mg of hole vdev in removal
pcd1193182 Feb 25, 2025
637f918
arc: avoid possible deadlock in arc_read
ixhamza Feb 25, 2025
f741c84
zpool: allow relative vdev paths
tonyhutter Feb 25, 2025
acfd651
Linux 6.13 compat: META (#17098)
tonyhutter Feb 27, 2025
91bc626
Add 'zfs-qemu-packages' workflow for RPM building
tonyhutter Mar 5, 2025
f3e4043
Tag zfs-2.3.1
tonyhutter Mar 5, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/checkstyle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
run: |
# for x in lxd core20 snapd; do sudo snap remove $x; done
sudo apt-get purge -y snapd google-chrome-stable firefox
ONLY_DEPS=1 .github/workflows/scripts/qemu-3-deps.sh ubuntu22
ONLY_DEPS=1 .github/workflows/scripts/qemu-3-deps-vm.sh ubuntu22
sudo apt-get install -y cppcheck devscripts mandoc pax-utils shellcheck
sudo python -m pipx install --quiet flake8
# confirm that the tools are installed
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/scripts/qemu-2-start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,15 @@ sudo virt-install \
--disk $DISK,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
--import --noautoconsole >/dev/null

# Give the VMs hostnames so we don't have to refer to them with
# hardcoded IP addresses.
#
# vm0: Initial VM we install dependencies and build ZFS on.
# vm1..2 Testing VMs
for i in {0..9} ; do
echo "192.168.122.1$i vm$i" | sudo tee -a /etc/hosts
done

# in case the directory isn't there already
mkdir -p $HOME/.ssh

Expand Down
232 changes: 232 additions & 0 deletions .github/workflows/scripts/qemu-3-deps-vm.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
#!/usr/bin/env bash

######################################################################
# 3) install dependencies for compiling and loading
#
# $1: OS name (like 'fedora41')
######################################################################

set -eu

function archlinux() {
echo "##[group]Running pacman -Syu"
sudo btrfs filesystem resize max /
sudo pacman -Syu --noconfirm
echo "##[endgroup]"

echo "##[group]Install Development Tools"
sudo pacman -Sy --noconfirm base-devel bc cpio cryptsetup dhclient dkms \
fakeroot fio gdb inetutils jq less linux linux-headers lsscsi nfs-utils \
parted pax perf python-packaging python-setuptools qemu-guest-agent ksh \
samba sysstat rng-tools rsync wget xxhash
echo "##[endgroup]"
}

function debian() {
export DEBIAN_FRONTEND="noninteractive"

echo "##[group]Running apt-get update+upgrade"
sudo apt-get update -y
sudo apt-get upgrade -y
echo "##[endgroup]"

echo "##[group]Install Development Tools"
sudo apt-get install -y \
acl alien attr autoconf bc cpio cryptsetup curl dbench dh-python dkms \
fakeroot fio gdb gdebi git ksh lcov isc-dhcp-client jq libacl1-dev \
libaio-dev libattr1-dev libblkid-dev libcurl4-openssl-dev libdevmapper-dev \
libelf-dev libffi-dev libmount-dev libpam0g-dev libselinux-dev libssl-dev \
libtool libtool-bin libudev-dev libunwind-dev linux-headers-$(uname -r) \
lsscsi nfs-kernel-server pamtester parted python3 python3-all-dev \
python3-cffi python3-dev python3-distlib python3-packaging \
python3-setuptools python3-sphinx qemu-guest-agent rng-tools rpm2cpio \
rsync samba sysstat uuid-dev watchdog wget xfslibs-dev xxhash zlib1g-dev
echo "##[endgroup]"
}

function freebsd() {
export ASSUME_ALWAYS_YES="YES"

echo "##[group]Install Development Tools"
sudo pkg install -y autoconf automake autotools base64 checkbashisms fio \
gdb gettext gettext-runtime git gmake gsed jq ksh93 lcov libtool lscpu \
pkgconf python python3 pamtester pamtester qemu-guest-agent rsync xxhash
sudo pkg install -xy \
'^samba4[[:digit:]]+$' \
'^py3[[:digit:]]+-cffi$' \
'^py3[[:digit:]]+-sysctl$' \
'^py3[[:digit:]]+-packaging$'
echo "##[endgroup]"
}

# common packages for: almalinux, centos, redhat
function rhel() {
echo "##[group]Running dnf update"
echo "max_parallel_downloads=10" | sudo -E tee -a /etc/dnf/dnf.conf
sudo dnf clean all
sudo dnf update -y --setopt=fastestmirror=1 --refresh
echo "##[endgroup]"

echo "##[group]Install Development Tools"

# Alma wants "Development Tools", Fedora 41 wants "development-tools"
if ! sudo dnf group install -y "Development Tools" ; then
echo "Trying 'development-tools' instead of 'Development Tools'"
sudo dnf group install -y development-tools
fi

sudo dnf install -y \
acl attr bc bzip2 cryptsetup curl dbench dkms elfutils-libelf-devel fio \
gdb git jq kernel-rpm-macros ksh libacl-devel libaio-devel \
libargon2-devel libattr-devel libblkid-devel libcurl-devel libffi-devel \
ncompress libselinux-devel libtirpc-devel libtool libudev-devel \
libuuid-devel lsscsi mdadm nfs-utils openssl-devel pam-devel pamtester \
parted perf python3 python3-cffi python3-devel python3-packaging \
kernel-devel python3-setuptools qemu-guest-agent rng-tools rpcgen \
rpm-build rsync samba sysstat systemd watchdog wget xfsprogs-devel xxhash \
zlib-devel
echo "##[endgroup]"
}

function tumbleweed() {
echo "##[group]Running zypper is TODO!"
sleep 23456
echo "##[endgroup]"
}

# Install dependencies
case "$1" in
almalinux8)
echo "##[group]Enable epel and powertools repositories"
sudo dnf config-manager -y --set-enabled powertools
sudo dnf install -y epel-release
echo "##[endgroup]"
rhel
echo "##[group]Install kernel-abi-whitelists"
sudo dnf install -y kernel-abi-whitelists
echo "##[endgroup]"
;;
almalinux9|centos-stream9|centos-stream10)
echo "##[group]Enable epel and crb repositories"
sudo dnf config-manager -y --set-enabled crb
sudo dnf install -y epel-release
echo "##[endgroup]"
rhel
echo "##[group]Install kernel-abi-stablelists"
sudo dnf install -y kernel-abi-stablelists
echo "##[endgroup]"
;;
archlinux)
archlinux
;;
debian*)
echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
debian
echo "##[group]Install Debian specific"
sudo apt-get install -yq linux-perf dh-sequence-dkms
echo "##[endgroup]"
;;
fedora*)
rhel
sudo dnf install -y libunwind-devel
;;
freebsd*)
freebsd
;;
tumbleweed)
tumbleweed
;;
ubuntu*)
debian
echo "##[group]Install Ubuntu specific"
sudo apt-get install -yq linux-tools-common libtirpc-dev \
linux-modules-extra-$(uname -r)
if [ "$1" != "ubuntu20" ]; then
sudo apt-get install -yq dh-sequence-dkms
fi
echo "##[endgroup]"
echo "##[group]Delete Ubuntu OpenZFS modules"
for i in $(find /lib/modules -name zfs -type d); do sudo rm -rvf $i; done
echo "##[endgroup]"
;;
esac

# This script is used for checkstyle + zloop deps also.
# Install only the needed packages and exit - when used this way.
test -z "${ONLY_DEPS:-}" || exit 0

# Start services
echo "##[group]Enable services"
case "$1" in
freebsd*)
# add virtio things
echo 'virtio_load="YES"' | sudo -E tee -a /boot/loader.conf
for i in balloon blk console random scsi; do
echo "virtio_${i}_load=\"YES\"" | sudo -E tee -a /boot/loader.conf
done
echo "fdescfs /dev/fd fdescfs rw 0 0" | sudo -E tee -a /etc/fstab
sudo -E mount /dev/fd
sudo -E touch /etc/zfs/exports
sudo -E sysrc mountd_flags="/etc/zfs/exports"
echo '[global]' | sudo -E tee /usr/local/etc/smb4.conf >/dev/null
sudo -E service nfsd enable
sudo -E service qemu-guest-agent enable
sudo -E service samba_server enable
;;
debian*|ubuntu*)
sudo -E systemctl enable nfs-kernel-server
sudo -E systemctl enable qemu-guest-agent
sudo -E systemctl enable smbd
;;
*)
# All other linux distros
sudo -E systemctl enable nfs-server
sudo -E systemctl enable qemu-guest-agent
sudo -E systemctl enable smb
;;
esac
echo "##[endgroup]"

# Setup Kernel cmdline
CMDLINE="console=tty0 console=ttyS0,115200n8"
CMDLINE="$CMDLINE selinux=0"
CMDLINE="$CMDLINE random.trust_cpu=on"
CMDLINE="$CMDLINE no_timer_check"
case "$1" in
almalinux*|centos*|fedora*)
GRUB_CFG="/boot/grub2/grub.cfg"
GRUB_MKCONFIG="grub2-mkconfig"
CMDLINE="$CMDLINE biosdevname=0 net.ifnames=0"
echo 'GRUB_SERIAL_COMMAND="serial --speed=115200"' \
| sudo tee -a /etc/default/grub >/dev/null
;;
ubuntu24)
GRUB_CFG="/boot/grub/grub.cfg"
GRUB_MKCONFIG="grub-mkconfig"
echo 'GRUB_DISABLE_OS_PROBER="false"' \
| sudo tee -a /etc/default/grub >/dev/null
;;
*)
GRUB_CFG="/boot/grub/grub.cfg"
GRUB_MKCONFIG="grub-mkconfig"
;;
esac

case "$1" in
archlinux|freebsd*)
true
;;
*)
echo "##[group]Edit kernel cmdline"
sudo sed -i -e '/^GRUB_CMDLINE_LINUX/d' /etc/default/grub || true
echo "GRUB_CMDLINE_LINUX=\"$CMDLINE\"" \
| sudo tee -a /etc/default/grub >/dev/null
sudo $GRUB_MKCONFIG -o $GRUB_CFG
echo "##[endgroup]"
;;
esac

# reset cloud-init configuration and poweroff
sudo cloud-init clean --logs
sleep 2 && sudo poweroff &
exit 0
Loading
Loading