From 3ddcfb5bd6789a0be58b711e3ce33ed63a392a5f Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Wed, 5 Jul 2023 14:32:10 -0600 Subject: [PATCH] LU-16101 tests: skip sanity/27J for more kernels This is a bug in the kernel that is not present in older kernels before commit v5.11-10234-gcbd59c48ae2b (5.12), and is fixed with commit v6.2-rc4-61-g5956592ce337 (6.2). Move this from ALWAYS_EXCEPT (bug that needs to be fixed) to skip (test that is known to fail in some configs but has been fixed). Lustre-change: https://review.whamcloud.com/51567 Lustre-commit: b711af7d243f3773cec3a37f64c0e0aa8bbc363f Fixes: af6f49698a18 ("LU-16101 tests: add sanity/27J to always_except") Test-Parameters: trivial testlist=sanity clientdistro=el9.2 env=ONLY=27J Signed-off-by: Andreas Dilger Change-Id: I8ec0a6d25a90e05672b039cd6c2b2fbf8a3ebbe5 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/51583 Reviewed-by: Alex Deiter Tested-by: jenkins Tested-by: Maloo --- lustre/tests/sanity.sh | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 8df603f..d5b9463 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -72,12 +72,6 @@ if (( $LINUX_VERSION_CODE >= $(version_code 4.18.0) && always_except LU-13063 411 fi -# skip basic ops on file with foreign LOV tests on 5.16.0+ kernels -# until the filemap_read() issue is fixed -if (( $LINUX_VERSION_CODE >= $(version_code 5.16.0) )); then - always_except LU-16101 27J -fi - # 5 12 8 12 15 (min)" [ "$SLOW" = "no" ] && EXCEPT_SLOW="27m 60i 64b 68 71 115 135 136 230d 300o" @@ -112,9 +106,6 @@ if [ -r /etc/SuSE-release ] || [ -r /etc/SUSE-brand ]; then [ $sles_version -lt $(version_code 12.0.0) ] && always_except LU-3703 234 - - [ $sles_version -ge $(version_code 15.4.0) ] && - always_except LU-16101 27J elif [ -r /etc/os-release ]; then if grep -qi ubuntu /etc/os-release; then ubuntu_version=$(version_code $(sed -n -e 's/"//g' \ @@ -2745,9 +2736,15 @@ test_27I() { run_test 27I "check that root dir striping does not break parent dir one" test_27J() { - [[ $MDS1_VERSION -le $(version_code 2.12.51) ]] && + (( $MDS1_VERSION > $(version_code 2.12.51) )) || skip "Need MDS version newer than 2.12.51" + # skip basic ops on file with foreign LOV tests on 5.12-6.2 kernels + # until the filemap_read() issue is fixed by v6.2-rc4-61-g5956592ce337 + (( $LINUX_VERSION_CODE < $(version_code 5.12.0) || + $LINUX_VERSION_CODE >= $(version_code 6.2.0) )) || + skip "Need kernel < 5.12.0 or >= 6.2.0 for filemap_read() fix" + test_mkdir $DIR/$tdir local uuid1=$(cat /proc/sys/kernel/random/uuid) local uuid2=$(cat /proc/sys/kernel/random/uuid) -- 1.8.3.1