From 927812e1e59350dbc3ddcdf8faaa30722bd76c82 Mon Sep 17 00:00:00 2001 From: Alena Nikitenko Date: Fri, 12 Nov 2021 00:11:18 +0300 Subject: [PATCH] EX-3342 tests: correct Lustre version in test skip checks in sanityn Many patches land to the EXAScaler branches as ports from other branches. Sometimes the tests that are included with the ported patches check the version of Lustre to ensure that the feature it tests exists in this version of Lustre. These version values are not always changed when patches are ported from one branch to another. Change Lustre test suite version checks to be relative to this branch. Sanityn tests 43j, 81c and 84 were modified. Fixes: 1c01d0867da ("LU-10235 mdt: mdt_create: check EEXIST without lock") Fixes: 23fa920b0ce ("LU-13437 mdt: rename misses remote LOOKUP lock revoke") Fixes: c4a91e08b1e ("LU-12485 obdclass: 0-nlink race in lu_object_find_at()") Test-Parameters: env=ONLY="43j 81c 84" serverversion=2.10.8 \ serverdistro=el7.6 testlist=sanityn Test-Parameters: env=ONLY="43j 81c 84" clientversion=2.12.6-ddn42 \ testlist=sanityn Test-Parameters: env=ONLY="43j 81c 84" serverversion=2.12.6-ddn42 \ testlist=sanityn Test-Parameters: trivial env=ONLY="43j 81c 84" testlist=sanityn Lustre-change: https://review.whamcloud.com/45537 Lustre-commit: c525d9367976fe38fd6fba6fdda8c3a9df6fd6e1 Signed-off-by: Alena Nikitenko Change-Id: I3116af827889ccc5a23434f9a253f3115b56dfb4 Reviewed-on: https://review.whamcloud.com/46186 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/tests/sanityn.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index b958dbc..2dfe854 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -2228,8 +2228,8 @@ test_43i() { run_test 43i "pdirops: unlink vs remote mkdir" test_43j() { - [[ $MDS1_VERSION -lt $(version_code 2.13.52) ]] && - skip "Need MDS version newer than 2.13.52" + [[ $MDS1_VERSION -lt $(version_code 2.12.3.31) ]] && + skip "Need MDS version newer than 2.12.3.31" mkdir_on_mdt0 $DIR1/$tdir for i in {1..100}; do @@ -4693,8 +4693,8 @@ run_test 81b "rename under striped directory doesn't deadlock" test_81c() { [ $MDSCOUNT -lt 4 ] && skip_env "needs >= 4 MDTs" - [ $MDS1_VERSION -lt $(version_code 2.13.52) ] && - skip "Need MDS version at least 2.13.52" + [ $MDS1_VERSION -lt $(version_code 2.12.3.45) ] && + skip "Need MDS version at least 2.12.3.45" # source is local, source parent is remote $LFS mkdir -i 0 $DIR1/${tdir}_src || error "mkdir ${tdir}_src" @@ -4795,8 +4795,8 @@ test_83() { run_test 83 "access striped directory while it is being created/unlinked" test_84() { - [ $MDS1_VERSION -lt $(version_code 2.12.55) ] && - skip "lustre < 2.12.55 does not contain LU-12485 fix" + [ $MDS1_VERSION -lt $(version_code 2.12.3.1) ] && + skip "lustre < 2.12.3.1 does not contain LU-12485 fix" local mtime -- 1.8.3.1