LU-16075 kernel: kernel update RHEL8.6 [4.18.0-372.19.1.el8_6]

Update RHEL8.6 kernel to 4.18.0-372.19.1.el8_6.

Lustre-change: https://review.whamcloud.com/48116
Lustre-commit: 872308001bf43ae3f190ceea11850f2f4eb8b7b3

Test-Parameters: trivial fstype=ldiskfs \
clientdistro=el8.6 serverdistro=el8.6 testlist=sanity

Test-Parameters: trivial fstype=zfs \
clientdistro=el8.6 serverdistro=el8.6 testlist=sanity

Change-Id: I8e0fbdab54d36512c4c4cbdbc97c580994ebcbd3
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/48315
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 3f3ae98..eee667e 100755 (executable)
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -466,6 +466,8 @@ download_srpm() {
        local srpm=$2
        local force="${3:-false}"
 
+       [[ ! -s "$KERNELDIR/$srpm" ]] || return 0
+
        # let the download_file handle the concurrency
        if $DOWNLOAD; then
                local location
@@ -490,6 +492,9 @@ download_debuginfo_common() {
        local rpm=$1
        local force="${2:-false}"
 
+       [[ ! -s "$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH/$rpm" ]] ||
+               return 0
+
        # let the download_file handle the concurrency
        if $DOWNLOAD; then
                # get the location from a distro specific method if it exists

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index d2ab0be..64ce2ac 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -3,7 +3,7 @@ TBD Whamcloud
        * See https://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
          for currently supported client and server kernel versions.
        * Server primary kernels built and tested during release cycle:
-         4.18.0-372.9.1.el8   (RHEL8.6)
+         4.18.0-372.19.1.el8  (RHEL8.6)
        * Other server kernels known to build and work at some point (others may also work):
          3.10.0-862.14.4.el7  (RHEL7.5)
          3.10.0-957.27.2.el7  (RHEL7.6)
@@ -27,7 +27,7 @@ TBD Whamcloud
        * ldiskfs needs an ldiskfs patch series for that kernel, ZFS does not
        * Client primary kernels built and tested during release cycle:
          5.14.0-70.22.1.el9   (RHEL9.0)
-         4.18.0-372.9.1.el8   (RHEL8.6)
+         4.18.0-372.19.1.el8  (RHEL8.6)
          5.4.0-37             (Ubuntu 20.04)
          5.14.21-150400.24.18 (SLES15 SP4)
        * Other clients known to build on these kernels at some point (others may also work):
@@ -57,7 +57,7 @@ TBD Whamcloud
          5.11.0-31            (Ubuntu 20.04.3 HWE)
          5.11.0               (vanilla kernel.org)
        * Recommended e2fsprogs version: 1.46.2.wc5 or newer
-       * Recommended ZFS version: 2.1.2
+       * Recommended ZFS version: 2.1.5
        * 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.
@@ -123,7 +123,7 @@ TBD Whamcloud
          5.11.0-31            (Ubuntu 20.04.3 HWE)
          5.11.0               (vanilla kernel.org)
        * Recommended e2fsprogs version: 1.46.2.wc5 or newer
-       * Recommended ZFS version: 2.1.5
+       * Recommended ZFS version: 2.1.2
        * 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.

diff --git a/lustre/kernel_patches/targets/4.18-rhel8.6.target.in b/lustre/kernel_patches/targets/4.18-rhel8.6.target.in
index adbc80d..f0bba47 100644 (file)
--- a/lustre/kernel_patches/targets/4.18-rhel8.6.target.in
+++ b/lustre/kernel_patches/targets/4.18-rhel8.6.target.in
@@ -1,5 +1,5 @@
 lnxmaj="4.18.0"
-lnxrel="372.9.1.el8"
+lnxrel="372.19.1.el8_6"
 
 KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
 SERIES=4.18-rhel8.6.series

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 1874431..f75e25f 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -23,6 +23,6 @@ PATCH SERIES FOR SERVER KERNELS:
 4.18-rhel8.3.series     4.18.0-240.22.1.el8  (RHEL 8.3)
 4.18-rhel8.4.series     4.18.0-305.25.1.el8  (RHEL 8.4)
 4.18-rhel8.5.series     4.18.0-348.2.1.el8   (RHEL 8.5)
-4.18-rhel8.6.series     4.18.0-372.9.1.el8   (RHEL 8.6)
+4.18-rhel8.6.series     4.18.0-372.19.1.el8  (RHEL 8.6)
 
 See lustre/ChangeLog for supported client kernel versions.