LU-15854 tests: fix version check for sanity test_64

Add missing or proper server version check for interop
testing for sanity test 64i and 64h.

Lustre-change: https://review.whamcloud.com/47343/
Lustre-commit: TBD (63832046a5c78a2425f1f07e2ec3f7beb9b0561e)

Test-Parameters: trivial testlist=sanity env=ONLY=64
Fixes: 38c78ac ("LU-9704 grant: ignore grant info on read resend")
Fixes: 4894683 ("LU-14124 target: set OBD_MD_FLGRANT in read's reply")
Change-Id: Iec21a407f467db3e9cb197d0a1436ea4e821bef2
Signed-off-by: Aurelien Degremont <degremoa@amazon.com>
Reviewed-on: https://review.whamcloud.com/47345
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 7528e64..498df7b 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7186,6 +7186,9 @@ test_64f() {
 run_test 64f "check grant consumption (with grant allocation)"
 
 test_64h() {
+       (( $OST1_VERSION >= $(version_code 2.12.8) )) ||
+               skip "need OST at least 2.12.8 to avoid grant shrink on read"
+
        local cli=$($LFS getname $DIR); cli=${cli%% *}; cli=${cli#*-}
        local osc_tgt="$FSNAME-OST0000-osc-$cli"
        local num_exps=$(do_facet ost1 \
@@ -7245,8 +7248,8 @@ test_64i() {
        local cgb
        local testid=${TESTNAME/_/ }
 
-       (( $OST1_VERSION >= $(version_code 2.12.7) )) ||
-               skip "need OST at least 2.12.7 to avoid grant shrink on replay"
+       (( $OST1_VERSION >= $(version_code 2.12.8) )) ||
+               skip "need OST at least 2.12.8 to avoid grant shrink on replay"
 
        [ $PARALLEL == "yes" ] && skip "skip parallel run"
        remote_ost_nodsh && skip "remote OSTs with nodsh"