From: Mikhal Pershin <mike.pershin@intel.com>
Date: Tue, 14 Nov 2017 19:40:21 +0000 (+0300)
Subject: LU-10176 tests: limit DoM tests to new servers only
X-Git-Tag: 2.10.56~20
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2f09984f3f332a9d13ed202b9a40e8195f28e33e;p=fs%2Flustre-release.git

LU-10176 tests: limit DoM tests to new servers only

Run DoM tests only if server has support for DoM by checking
its version is 2.10.55 at least.

Signed-off-by: Mikhal Pershin <mike.pershin@intel.com>
Change-Id: I79f26cd3c80fbfc4bf48ddc3fcc762248d491034
Reviewed-on: https://review.whamcloud.com/30085
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index b2d4820..836fbfc 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -15185,6 +15185,10 @@ run_test 260 "Check mdc_close fail"
 
 ### Data-on-MDT sanity tests ###
 test_270a() {
+
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	# create DoM file
 	local dom=$DIR/$tdir/dom_file
 	local tmp=$DIR/$tdir/tmp_file
@@ -15280,6 +15284,9 @@ test_270a() {
 run_test 270a "DoM: basic functionality tests"
 
 test_270b() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	local dom=$DIR/$tdir/dom_file
 	local max_size=1048576
 
@@ -15302,6 +15309,9 @@ test_270b() {
 run_test 270b "DoM: maximum size overflow checks for DoM-only file"
 
 test_270c() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	mkdir -p $DIR/$tdir
 	$LFS setstripe -E 1024K -L mdt $DIR/$tdir
 
@@ -15328,6 +15338,9 @@ test_270c() {
 run_test 270c "DoM: DoM EA inheritance tests"
 
 test_270d() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	mkdir -p $DIR/$tdir
 	$LFS setstripe -E 1024K -L mdt $DIR/$tdir
 
@@ -15347,6 +15360,9 @@ test_270d() {
 run_test 270d "DoM: change striping from DoM to RAID0"
 
 test_270e() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	mkdir -p $DIR/$tdir/dom
 	mkdir -p $DIR/$tdir/norm
 	DOMFILES=20
@@ -15385,6 +15401,9 @@ test_270e() {
 run_test 270e "DoM: lfs find with DoM files test"
 
 test_270f() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	local mdtname=${FSNAME}-MDT0000-mdtlov
 	local dom=$DIR/$tdir/dom_file
 	local dom_limit_saved=$(do_facet mds1 $LCTL get_param -n \
@@ -15443,6 +15462,9 @@ test_270f() {
 run_test 270f "DoM: maximum DoM stripe size checks"
 
 test_271a() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	local dom=$DIR/$tdir/dom
 
 	mkdir -p $DIR/$tdir
@@ -15461,6 +15483,9 @@ test_271a() {
 run_test 271a "DoM: data is cached for read after write"
 
 test_271b() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	local dom=$DIR/$tdir/dom
 
 	mkdir -p $DIR/$tdir
@@ -15481,6 +15506,9 @@ test_271b() {
 run_test 271b "DoM: no glimpse RPC for stat (DoM only file)"
 
 test_271ba() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	local dom=$DIR/$tdir/dom
 
 	mkdir -p $DIR/$tdir
@@ -15508,6 +15536,9 @@ test_271c() {
 	# test to be enabled with lock_convert
 	skip "skipped until lock convert will be implemented" && return
 
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	local dom=$DIR/$tdir/dom
 
 	mkdir -p $DIR/$tdir
diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index 456d311..b3c874d 100755
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -4010,6 +4010,9 @@ run_test 93 "alloc_rr should not allocate on same ost"
 # Data-on-MDT tests
 test_100a() {
 	skip "Reserved for glimpse-ahead" && return
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	mkdir -p $DIR/$tdir
 
 	$LFS setstripe -E 1024K -L mdt -E EOF $DIR/$tdir/dom
@@ -4032,6 +4035,9 @@ test_100a() {
 run_test 100a "DoM: glimpse RPCs for stat without IO lock (DoM only file)"
 
 test_100b() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	mkdir -p $DIR/$tdir
 
 	$LFS setstripe -E 1024K -L mdt -E EOF $DIR/$tdir/dom
@@ -4053,6 +4059,9 @@ test_100b() {
 run_test 100b "DoM: no glimpse RPC for stat with IO lock (DoM only file)"
 
 test_100c() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	mkdir -p $DIR/$tdir
 
 	$LFS setstripe -E 1024K -L mdt -E EOF $DIR/$tdir/dom
@@ -4073,6 +4082,9 @@ test_100c() {
 run_test 100c "DoM: write vs stat without IO lock (combined file)"
 
 test_100d() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	mkdir -p $DIR/$tdir
 
 	$LFS setstripe -E 1024K -L mdt -E EOF $DIR/$tdir/dom
@@ -4095,6 +4107,9 @@ test_100d() {
 run_test 100d "DoM: write+truncate vs stat without IO lock (combined file)"
 
 test_101a() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	$LFS setstripe -E 1024K -L mdt -E EOF $DIR1/$tfile
 	# to get layout
 	$CHECKSTAT -t file $DIR1/$tfile
@@ -4117,6 +4132,9 @@ test_101a() {
 run_test 101a "Discard DoM data on unlink"
 
 test_101b() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	$LFS setstripe -E 1024K -L mdt -E EOF $DIR1/$tfile
 	touch $DIR1/${tfile}_2
 	# to get layout
@@ -4139,6 +4157,9 @@ test_101b() {
 run_test 101b "Discard DoM data on rename"
 
 test_101c() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
+		skip "Need MDS version at least 2.10.55" && return
+
 	$LFS setstripe -E 1024K -L mdt -E EOF $DIR1/$tfile
 	# to get layout
 	$CHECKSTAT -t file $DIR1/$tfile