From: Aurelien Degremont <degremoa@amazon.com>
Date: Fri, 13 May 2022 12:42:38 +0000 (+0000)
Subject: LU-15854 tests: fix version check for sanity test_64
X-Git-Tag: 2.15.51~125
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=14de17ad90341e302dfe57a720c225b614caea6a;p=fs%2Flustre-release.git

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.

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/47343
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Mike Pershin <mpershin@whamcloud.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index e9776d9..33096bd 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -8966,6 +8966,9 @@ test_64g() {
 run_test 64g "grant shrink on MDT"
 
 test_64h() {
+	(( $OST1_VERSION >= $(version_code 2.14.56) )) ||
+		skip "need OST at least 2.14.56 to avoid grant shrink on read"
+
 	local instance=$($LFS getname -i $DIR)
 	local osc_tgt="$FSNAME-OST0000-osc-$instance"
 	local num_exps=$(do_facet ost1 \
@@ -9020,8 +9023,8 @@ test_64h() {
 run_test 64h "grant shrink on read"
 
 test_64i() {
-	(( $OST1_VERSION >= $(version_code 2.14.55) )) ||
-		skip "need OST at least 2.14.55 to avoid grant shrink on replay"
+	(( $OST1_VERSION >= $(version_code 2.14.56) )) ||
+		skip "need OST at least 2.14.56 to avoid grant shrink on replay"
 
 	[ $PARALLEL == "yes" ] && skip "skip parallel run"
 	remote_ost_nodsh && skip "remote OSTs with nodsh"