LU-17525 tests: fix sanity hash 2.15 interop

Fix test version checks for interop testing for DNE directory hash
usage in sanity with 2.15 servers.  This incorrectly was assuming
that the CRUSH2 dir hash was included in the 2.15.0 release, but it
was not backported to that branch, and only landed in 2.15.51.

Exclude UDIO interop failures, which are fixed via LU-17525.

Fixes: 1ac4b9598a ("LU-15720 dne: add crush2 hash type")
Test-Parameters: trivial testlist=sanity serverversion=2.15.4 serverdistro=el8.9 env=SANITY_EXCEPT="56 119 398"
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: If2097ebc30c7c4dbce88af7774ce3c0e8fb3cb75
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55076
Tested-by: Maloo <maloo@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Patrick Farrell <patrick.farrell@oracle.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e34b3ba..c1c7f9d 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -6955,6 +6955,8 @@ test_newerXY_base() {
        local ref
        local negref
 
+       stack_trap "rm -rf $DIR/$tdir $DIR/$tfile*" RETURN EXIT
+
        if [ $y == "t" ]; then
                if [ $x == "b" ]; then
                        ref=\"$(do_facet mds1 date +"%Y-%m-%d\ %H:%M:%S")\"
@@ -6998,8 +7000,6 @@ test_newerXY_base() {
        nums=$(eval $cmd | wc -l)
        [ $nums -eq $expected ] || { ls -lauR --full-time $dir ;
                error "'$cmd' wrong: found $nums between, expected $expected"; }
-
-       rm -rf $DIR/*
 }
 
 test_56oc() {
@@ -23237,8 +23237,8 @@ run_test 230w "non-recursive mode dir migration"
 
 test_230x() {
        (( MDSCOUNT > 1 )) || skip "needs >= 2 MDTs"
-       (( MDS1_VERSION >= $(version_code 2.15.0) )) ||
-               skip "Need MDS version at least 2.15.0"
+       (( MDS1_VERSION >= $(version_code v2_15_52-83-g6aee406c84) )) ||
+               skip "Need MDS >= 2.15.53 for migrate space check"
 
        mkdir -p $DIR/$tdir || error "mkdir failed"
        createmany -d $DIR/$tdir/sub 100 || error "createmany failed"
@@ -26462,7 +26462,7 @@ test_300i() {
        local dircnt=$($LFS find -H fnv_1a_64,crush $DIR/$tdir/hashdir | wc -l)
        (( $dircnt == 2 )) || error "lfs find striped dir got $dircnt != 2"
 
-       if (( $MDS1_VERSION > $(version_code 2.15.0) )); then
+       if (( $MDS1_VERSION > $(version_code v2_15_50-185-g1ac4b9598a) )); then
                $LFS mkdir -i0 -c$MDSCOUNT -H crush2 $DIR/$tdir/hashdir/d3 ||
                        error "create crush2 dir $tdir/hashdir/d3 failed"
                $LFS find -H crush2 $DIR/$tdir/hashdir

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index fc06109..22387a6 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -9942,7 +9942,7 @@ test_mkdir() {
        local overstripe_count
        local stripe_command="-c"
 
-       (( $MDS1_VERSION > $(version_code 2.15.0) )) &&
+       (( $MDS1_VERSION > $(version_code v2_15_50-185-g1ac4b9598a) )) &&
                hash_name+=("crush2")
 
        while getopts "c:C:H:i:p" opt; do