From 0c68b4c1fde4acebf770801a2b63d7d2e2bb42b2 Mon Sep 17 00:00:00 2001 From: Alena Nikitenko Date: Tue, 28 Dec 2021 16:58:30 +0300 Subject: [PATCH] EX-3342 tests: fix Lustre ver in skip checks in recovery-small 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. Recovery-small tests 110k,136,138,139,143 were modified. Fixes: 80eb31f5367 ("LU-11761 fld: let's caller to retry FLD_QUERY") Fixes: 5bf8c0eaf91 ("LU-12098 mdd: explicitly clear changelogs on deregister") Fixes: 18a53eddc08 ("LU-12846 mdd: return error while delete failed") Fixes: c2d5af902d8 ("LU-13061 osp: check catlog FID after reading in") Fixes: 18a53eddc08 ("LU-12846 mdd: return error while delete failed") Test-Parameters: env=ONLY="110k 136 138 139 143" serverversion=2.10.8 \ serverdistro=el7.6 testlist=recovery-small Test-Parameters: env=ONLY="110k 136 138 139 143" \ clientversion=2.12.6-ddn42 testlist=recovery-small Test-Parameters: env=ONLY="110k 136 138 139 143" \ serverversion=2.12.6-ddn42 testlist=recovery-small Test-Parameters: trivial env=ONLY="110k 136 138 139 143" \ testlist=recovery-small Lustre-change: https://review.whamcloud.com/45947 Lustre-commit: 4a981ce7975a499680bc53c374dd002bb89fb515 Signed-off-by: Alena Nikitenko Change-Id: Id86d1d0fbbb5eca5aec9b6fcbf5baae8941573e1 Reviewed-on: https://review.whamcloud.com/46418 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/tests/recovery-small.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index 7f73cc1..51a5dc8 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -2249,8 +2249,8 @@ run_test 110j "drop update reply during cross-MDT ln" test_110k() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTS" - [[ "$MDS1_VERSION" -ge $(version_code 2.12.55) ]] || - skip "Need MDS version at least 2.12.55" + [[ $MDS1_VERSION -ge $(version_code 2.12.3.1) ]] || + { skip "Need MDS version at least 2.12.3.1"; } umount $MOUNT stop mds2 || error "stop mds2 failed" @@ -2787,9 +2787,9 @@ test_135() { run_test 135 "DOM: open/create resend to return size" test_136() { - remote_mds_nodsh && skip "remote MDS with nodsh" - [[ "$MDS1_VERSION" -ge $(version_code 2.12.52) ]] || - skip "Need MDS version at least 2.12.52" + remote_mds_nodsh && skip "remote MDS with nodsh" && return + [[ $MDS1_VERSION -ge $(version_code 2.12.3.1) ]] || + skip "Need MDS version at least 2.12.3.1" local mdts=$(comma_list $(mdts_nodes)) local MDT0=$(facet_svc $SINGLEMDS) @@ -2872,8 +2872,8 @@ run_test 137 "late resend must be skipped if already applied" test_138() { remote_mds_nodsh && skip "remote MDS with nodsh" [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0 - [[ "$MDS1_VERSION" -ge $(version_code 2.12.59) ]] || - skip "Need server version newer than 2.12.59" + [[ "$MDS1_VERSION" -ge $(version_code 2.12.3.32) ]] || + skip "Need server version newer than 2.12.3.32" zconf_umount_clients $CLIENTS $MOUNT @@ -2897,8 +2897,8 @@ run_test 138 "Umount MDT during recovery" test_139() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0 - [ $MDS1_VERSION -lt $(version_code 2.13.50) ] && - skip "Need MDS version at least 2.13.50" + [ $MDS1_VERSION -lt $(version_code 2.12.3.7) ] && + skip "Need MDS version at least 2.12.3.7" mdt_dev=$(mdsdevname 1) @@ -3015,8 +3015,8 @@ test_142() { run_test 142 "orphan name stub can be cleaned up in startup" test_143() { - [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.13.00) ] && - skip "Need MDS version at least 2.13.00" + [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.12.3.32) ] && + skip "Need MDS version at least 2.12.3.32" [ $PARALLEL == "yes" ] && skip "skip parallel run" local mntpt=$(facet_mntpt $SINGLEMDS) -- 1.8.3.1