Whamcloud - gitweb
LU-18476 tests: fix version check in replay-single.sh/202 53/57253/6
authorEmoly Liu <emoly@whamcloud.com>
Wed, 4 Dec 2024 01:01:43 +0000 (09:01 +0800)
committerOleg Drokin <green@whamcloud.com>
Sat, 18 Jan 2025 22:04:40 +0000 (22:04 +0000)
Separate ddn version from community versino to fix version
check for interop testing in replay-single.sh test_202.

Test-Parameters: trivial testlist=replay-single env=ONLY=202 \
 serverbuildno=4587 serverjob=lustre-master serverdistro=el8.10
Test-Parameters: trivial testlist=replay-single env=ONLY=202 \
 serverbuildno=94 serverjob=lustre-b2_15 serverdistro=el8.10
Test-Parameters: trivial testlist=replay-single env=ONLY=202 \
 serverbuildno=616 serverjob=lustre-b_es5_2 serverdistro=el7.9

Fixes: c66a7dea85 ("LU-18435 lod: recover layout generation from replay")
Signed-off-by: Emoly Liu <emoly@whamcloud.com>
Change-Id: I7a13804380477ad24d08ad97db3e2ef701f444c9
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57253
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
lustre/tests/replay-single.sh

index 0263011..2c39951 100755 (executable)
@@ -5354,11 +5354,20 @@ test_202() {
        local td=$DIR/$tdir
        local tf=$td/$tfile
 
-       (( $MDS1_VERSION >= $(version_code 2.16.0) )) ||
-          (( $MDS1_VERSION < $(version_code v2_15_55-64-g13557aa869) &&
-          $MDS1_VERSION >= $(version_code 2.14.0-ddn178) )) ||
-          (( $MDS1_VERSION < $(version_code 2.14.0-ddn87-14-gf1bd967799) )) ||
-               skip "need MDS with LU-18416 fix for layout version"
+       if ! do_facet $SINGLEMDS $LCTL get_param version | grep "ddn"; then
+               # master and b2_15
+               (( $MDS1_VERSION >= $(version_code v2_16_50-35-gc66a7dea85) )) ||
+               (( $MDS1_VERSION < $(version_code v2_15_55-64-g13557aa869) &&
+                  $MDS1_VERSION >= $(version_code v2_15_6-RC1) )) ||
+                       skip "need MDS with LU-18435 fix for layout version"
+       else
+               # b_es6_0 and b_es5_2
+               (( $MDS1_VERSION >= $(version_code 2.14.0-ddn180) )) ||
+               (( $MDS1_VERSION < $(version_code 2.14.0-ddn86-14-gf1bd967799) &&
+                  $MDS1_VERSION >= $(version_code 2.14.0-ddn1) )) ||
+               (( $MDS1_VERSION < $(version_code 2.12.9-ddn19-4-g3455e9100f) )) ||
+                       skip "need MDS with LU-18435 fix for layout version"
+       fi
 
        mkdir_on_mdt0 $td || error "can't mkdir"
        $LFS setstripe -E128M -c1 -Eeof -c2 $td || error "can't setstripe"