X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-dom.sh;h=3666ef1302cf2b2a45951eb6ec0cec2183b2235b;hb=2007ab4709acaef0397df15c9f4cf4387844ba9c;hp=a95d62bf6f5bc4a5ffe97bc6afd9d0e4199a40b6;hpb=910ed44d1f3844ae3f76a3594dbd1a09b5892643;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-dom.sh b/lustre/tests/sanity-dom.sh
index a95d62b..3666ef1 100644
--- a/lustre/tests/sanity-dom.sh
+++ b/lustre/tests/sanity-dom.sh
@@ -10,7 +10,7 @@ ONLY=${ONLY:-"$*"}
 
 LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
-init_test_env $@
+init_test_env "$@"
 init_logging
 
 # bug number for skipped test:
@@ -67,14 +67,14 @@ test_3() {
 	# Write on one node to the DoM stripe and then truncate to over DoM size
 	dd if=/dev/zero of=$DIR1/$tfile bs=$((DOM_SIZE-100)) count=1 ||
 		return 1
-	truncate $DIR1/$tfile $((DOM_SIZE+700)) || return 2
+	$TRUNCATE $DIR1/$tfile $((DOM_SIZE+700)) || return 2
 	# read on the second node inside DoM stripe to take a lock data from
 	# the first client
 	dd if=$DIR2/$tfile of=/dev/null bs=4096 count=1 seek=1 || return 3
 	$CHECKSTAT -t file -s $((DOM_SIZE+700)) $DIR2/$tfile ||
 		error "Wrong size after first truncate $tfile on first node"
 	# now do local truncate over DoM size and check size is correct
-	truncate $DIR2/$tfile $((DOM_SIZE+500)) || return 4
+	$TRUNCATE $DIR2/$tfile $((DOM_SIZE+500)) || return 4
 	$CHECKSTAT -t file -s $((DOM_SIZE+500)) $DIR2/$tfile ||
 		error "Wrong size after second truncate on the same node"
 	$CHECKSTAT -t file -s $((DOM_SIZE+500)) $DIR1/$tfile ||
@@ -172,15 +172,23 @@ test_fsx() {
 	local file1=$DIR1/$tfile
 	local file2=$DIR2/$tfile
 
+	check_set_fallocate
+
 	touch $file1
-	fsx -c 50 -p 100 -N 1000 -l $((DOM_SIZE*2)) -S 0 -d -d $file1 $file2
+	$FSX -c 50 -p 100 -N 1000 -l $((DOM_SIZE*2)) -S 0 -d -d $file1 $file2
 }
 run_test fsx "Dual-mount fsx with DoM files"
 
 test_sanity()
 {
-	SANITY_ONLY=${SANITY_ONLY:-"36 39 40 41 42d 42e 43 46 56r 101e 119a \
-				    131 150 155a 155b 155c 155d 207 241 251"}
+	local testlist="36 39 40 41 42d 42e 43 46 56r 101e 119a \
+			131 150a 155a 155b 155c 155d 207 241 251"
+
+	# Fallocate tests
+	(( $MDS1_VERSION >= $(version_code 2.14.52) )) &&
+		testlist+=" 150b 150bb 150c 150d 150f 150g"
+
+	SANITY_ONLY=${SANITY_ONLY:-$testlist}
 	SANITY_REPEAT=${SANITY_REPEAT:-1}
 	# XXX: to fix 45. Add 42a, c when LU-9693 fixed.
 	# Add 42b when LU-6493 fixed
@@ -193,8 +201,14 @@ run_test sanity "Run sanity with Data-on-MDT files"
 
 test_sanityn()
 {
-	SANITYN_ONLY=${SANITYN_ONLY:-"1 2 4 5 6 7 8 9 10 11 12 14 17 19 20 \
-				      23 27 39 51a 51c 51d"}
+	local testlist="1 2 4 5 6 7 8 9 10 11 12 14 17 19 20 \
+			23 27 39 51a 51c 51d"
+
+	if [[ $MDS1_VERSION -ge $(version_code 2.13.55) ]]; then
+		testlist+=" 107"
+	fi
+
+	SANITYN_ONLY=${SANITYN_ONLY:-$testlist}
 	SANITYN_REPEAT=${SANITYN_REPEAT:-1}
 	# XXX: to fix 60
 	ONLY=$SANITYN_ONLY ONLY_REPEAT=$SANITYN_REPEAT OSC="mdc" DOM="yes" \
@@ -204,6 +218,8 @@ test_sanityn()
 }
 run_test sanityn "Run sanityn with Data-on-MDT files"
 
-complete $SECONDS
+complete_test $SECONDS
 check_and_cleanup_lustre
-exit_status
+declare -a logs=($ONLY)
+logs=("${logs[@]/#/$TMP/}")
+exit_status "$(echo "${logs[@]/%/.log}")"