From 01103eba35e88638d8860457fbdf89b101d4ab67 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Fri, 12 Apr 2024 08:46:44 -0700 Subject: [PATCH] LU-17362 build: Update ZFS version to 2.1.15 Update ZFS version to 2.1.15. The changes are listed in: https://github.com/openzfs/zfs/releases/tag/zfs-2.1.15 Test-Parameters: trivial fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el8.9 serverdistro=el8.9 testlist=sanity Test-Parameters: trivial fstype=zfs mdtcount=4 mdscount=2 \ clientdistro=el9.3 serverdistro=el9.3 testlist=sanity Test-Parameters: optional fstype=zfs testgroup=full-dne-zfs-part-1 Test-Parameters: optional fstype=zfs testgroup=full-dne-zfs-part-2 Test-Parameters: optional fstype=zfs testgroup=full-dne-zfs-part-3 Change-Id: I51532dbf9dbcadf64bb9dbd3b10e88d0cab38ffd Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54769 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Alex Zhuravlev Reviewed-by: Peter Jones Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 2 +- lustre/ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index fa07b0e..b822b1e 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1038,7 +1038,7 @@ build_spl_zfs() { # The spl/zfs spec files expect RPM_BUILD_ROOT to point to the root of the # destination for the rpms export RPM_BUILD_ROOT=$TOPDIR - SPLZFSVER=${SPLZFSVER:-2.1.11} + SPLZFSVER=${SPLZFSVER:-2.1.15} SPLZFSTAG=${SPLZFSTAG:-} # "spl zfs" prior to 0.8.0 # "zfs" for 0.8.0 and later diff --git a/lustre/ChangeLog b/lustre/ChangeLog index b517745..c681530 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -74,7 +74,7 @@ TBD Whamcloud 5.11.0 (vanilla kernel.org) 5.10.0 (openEuler 22.03 LTS) * Recommended e2fsprogs version: 1.47.0-wc6 or newer - * Recommended ZFS version: 2.1.11 + * Recommended ZFS version: 2.1.15 * NFS export disabled when stack size < 8192 (32-bit Lustre clients), since the NFSv4 export of Lustre filesystem with 4K stack may cause a stack overflow. For more information, please refer to bugzilla 17630. -- 1.8.3.1