LU-11208 tests: add version check to sanity tests

[fs/lustre-release.git] / lustre / tests / sanity.sh

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 1e0196c..e78788a 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2270,8 +2270,10 @@ test_27F() { # LU-5346/LU-7975
 run_test 27F "Client resend delayed layout creation with non-zero size"
 
 test_27G() { #LU-10629
-       [ -n "$FILESET" ] && skip "SKIP due to FILESET set" && return
-       remote_mds_nodsh && skip "remote MDS with nodsh" && return
+       [ $MDS1_VERSION -lt $(version_code 2.11.51) ] &&
+               skip "Need MDS version at least 2.11.51"
+       [ -n "$FILESET" ] && skip "SKIP due to FILESET set"
+       remote_mds_nodsh && skip "remote MDS with nodsh"
        local POOL=${POOL:-testpool}
        local ostrange="0 0 1"
 
@@ -6752,6 +6754,7 @@ test_65m() {
 run_test 65m "normal user can't set filesystem default stripe"
 
 test_65n() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
        [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.12.50) ]] ||
                skip "Need MDS version at least 2.12.50"
        [[ $PARALLEL != "yes" ]] || skip "skip parallel run"
@@ -13063,6 +13066,7 @@ run_test 161c "check CL_RENME[UNLINK] changelog record flags"
 
 test_161d() {
        remote_mds_nodsh && skip "remote MDS with nodsh"
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
 
        local pid
        local fid
@@ -15803,7 +15807,7 @@ test_239A() { # was test_239
        mkdir -p $DIR/$tdir
        createmany -o $DIR/$tdir/f- 5000
        unlinkmany $DIR/$tdir/f- 5000
-       [ $MDS1_VERSION -gt $(version_code 2.10.53) ] &&
+       [ $MDS1_VERSION -gt $(version_code 2.10.4) ] &&
                do_nodes $list "lctl set_param -n osp.*.force_sync=1"
        changes=$(do_nodes $list "lctl get_param -n osp.*MDT*.sync_changes \
                        osp.*MDT*.sync_in_flight" | calc_sum)
@@ -16694,7 +16698,7 @@ test_255c() {
                cancel_lru_locks osc
 
                count=$($LCTL get_param -n \
-                      ldlm.namespaces.$FSNAME-OST0000*osc-f*.lock_unused_count)
+                      ldlm.namespaces.$FSNAME-OST0000*osc-[-0-9a-f]*.lock_unused_count)
 
                lockahead_test -d $DIR/$tdir -t $i -f $tfile
                rc=$?
@@ -16703,7 +16707,7 @@ test_255c() {
                fi
 
                new_count=$($LCTL get_param -n \
-                      ldlm.namespaces.$FSNAME-OST0000*osc-f*.lock_unused_count)
+                      ldlm.namespaces.$FSNAME-OST0000*osc-[-0-9a-f]*.lock_unused_count)
                difference="$((new_count - count))"
 
                # Test 15 output is divided by 100 to map down to valid return
@@ -16802,6 +16806,7 @@ test_257() {
        stop $facet || error "stop MDS failed"
        start $facet $(mdsdevname $((mdtidx + 1))) $MDS_MOUNT_OPTS ||
                error "start MDS fail"
+       wait_recovery_complete $facet
 }
 run_test 257 "xattr locks are not lost"
 
@@ -17504,14 +17509,13 @@ test_272a() {
        $LFS migrate -E 256K -L mdt -E -1 -c2 $dom ||
                error "failed to migrate to the same DoM component"
 
-       [ $($LFS getstripe -c $dom) -eq 2 ] ||
-               error "layout was not changed silently"
-
        local new_md5=$(md5sum $dom)
 
-       [ "$old_md5" != "$new_md5" ] &&
+       [ "$old_md5" == "$new_md5" ] ||
                error "md5sum differ: $old_md5, $new_md5"
-       return 0
+
+       [ $($LFS getstripe -c $dom) -eq 2 ] ||
+               error "migrate stripe count bad: $(LFS getstripe -c $dom) != 2"
 }
 run_test 272a "DoM migration: new layout with the same DOM component"
 
@@ -18500,7 +18504,7 @@ test_311() {
 
        do_nodes $mdts "$LCTL set_param -n \
                        osp.*OST0000*.max_create_count=$max_count"
-       [ $(lustre_version_code $facet) -lt $(version_code 2.11.56) ] &&
+       [ $MDS1_VERSION -lt $(version_code 2.12.51) ] &&
                do_nodes $mdts "$LCTL set_param -n \
                                osp.*OST0000*.create_count=$count"
        do_nodes $mdts "$LCTL get_param osp.*OST0000*.create_count" |
@@ -18683,6 +18687,8 @@ test_316() {
 run_test 316 "lfs mv"
 
 test_317() {
+       [ $MDS1_VERSION -lt $(version_code 2.11.53) ] &&
+               skip "Need MDS version at least 2.11.53"
        local trunc_sz
        local grant_blk_size
 
@@ -19052,6 +19058,7 @@ test_404() { # LU-6601
 run_test 404 "validate manual {de}activated works properly for OSPs"
 
 test_405() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
        [ $MDS1_VERSION -lt $(version_code 2.6.92) -o \
        [ $CLIENT_VERSION -lt $(version_code 2.6.99) ] &&
                skip "Layout swap lock is not supported"
@@ -20105,6 +20112,7 @@ test_806() {
 run_test 806 "Verify Lazy Size on MDS"
 
 test_807() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
        [ $MDS1_VERSION -lt $(version_code 2.11.52) ] &&
                skip "Need MDS version at least 2.11.52"