From: Patrick Farrell <pfarrell@whamcloud.com>
Date: Wed, 20 Feb 2019 22:46:20 +0000 (-0500)
Subject: LU-10143 tests: Add version check for interop
X-Git-Tag: 2.12.52~12
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=1e63c2f85da17947d78d4b2fb79cab2bd04b2ca5

LU-10143 tests: Add version check for interop

Without the fix for LU-10143, these tests will fail, so add
a version check for interop.

Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: I65eead5d5252ec6abf5d8de68d73e4f9b690d030
Reviewed-on: https://review.whamcloud.com/34285
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Jenkins
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index ff8d25d..3b53bac 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -137,6 +137,9 @@ test_2c() {
 run_test 2c "setstripe replay"
 
 test_2d() {
+	[[ $mds1_FSTYPE = "zfs" ]] &&
+		[[ $MDS1_VERSION -lt $(version_code 2.12.51) ]] &&
+		skip "requires LU-10143 fix on MDS"
 	replay_barrier $SINGLEMDS
 	$LFS setdirstripe -i 0 -c $MDSCOUNT $DIR/$tdir
 	fail $SINGLEMDS
@@ -2651,6 +2654,9 @@ test_80b() {
 run_test 80b "DNE: create remote dir, drop update rep from MDT0, fail MDT1"
 
 test_80c() {
+	[[ $mds1_FSTYPE = "zfs" ]] &&
+		[[ $MDS1_VERSION -lt $(version_code 2.12.51) ]] &&
+		skip "requires LU-10143 fix on MDS"
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0
 	([ $FAILURE_MODE == "HARD" ] &&
 		[ "$(facet_host mds1)" == "$(facet_host mds2)" ]) &&
@@ -2681,6 +2687,9 @@ test_80c() {
 run_test 80c "DNE: create remote dir, drop update rep from MDT1, fail MDT[0,1]"
 
 test_80d() {
+	[[ $mds1_FSTYPE = "zfs" ]] &&
+		[[ $MDS1_VERSION -lt $(version_code 2.12.51) ]] &&
+		skip "requires LU-10143 fix on MDS"
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0
 	local MDTIDX=1
 	local remote_dir=$DIR/$tdir/remote_dir