X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-dom.sh;h=2cfe0ee42635fe2f75642976fd8d07e0fd83ea52;hp=2ebccc32a594504122245b7b7205153885c93585;hb=980f8741339f2bece106f6955b0b076d35211850;hpb=37d6d157a2a94e022f2e153c9191aa559daec321

diff --git a/lustre/tests/sanity-dom.sh b/lustre/tests/sanity-dom.sh
index 2ebccc3..2cfe0ee 100644
--- a/lustre/tests/sanity-dom.sh
+++ b/lustre/tests/sanity-dom.sh
@@ -19,8 +19,8 @@ ALWAYS_EXCEPT="$SANITY_DOM_EXCEPT"
 
 build_test_filter
 
-[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.56) ]] ||
-	{ skip "Need MDS version at least 2.10.56"; exit 0; }
+[[ "$MDS1_VERSION" -ge $(version_code 2.10.56) ]] ||
+	skip "Need MDS version at least 2.10.56"
 
 OPENFILE=${OPENFILE:-openfile}
 MOUNT_2=${MOUNT_2:-"yes"}
@@ -106,6 +106,55 @@ test_4() {
 }
 run_test 4 "DoM: glimpse doesn't produce duplicated locks"
 
+test_5() {
+	local before=$(date +%s)
+	local evict
+
+	dd if=/dev/zero of=$DIR/$tfile bs=4096 count=1 || return 1
+
+	multiop_bg_pause $DIR/$tfile O_Ac || return 1
+	setxattr=$!
+
+	multiop_bg_pause $DIR/$tfile O_Tc || return 1
+	truncate=$!
+
+	multiop $DIR2/$tfile Ow10 || return 1
+
+	getfattr -d $DIR2/$tfile
+
+#define OBD_FAIL_LLITE_TRUNCATE_INODE_PAUSE        0x1415
+	$LCTL set_param fail_loc=0x80001415 fail_val=5
+	kill -USR1 $truncate
+	sleep 1
+	multiop $DIR2/$tfile Ow10 &
+	sleep 1
+	kill -USR1 $setxattr
+
+	wait
+
+	evict=$(do_facet client $LCTL get_param mdc.$FSNAME-MDT*.state |
+	  awk -F"[ [,]" '/EVICTED ]$/ { if (mx<$5) {mx=$5;} } END { print mx }')
+
+	[ -z "$evict" ] || [[ $evict -le $before ]] ||
+		(do_facet client $LCTL get_param mdc.$FSNAME-MDT*.state;
+			error "eviction happened: $evict before:$before")
+}
+run_test 5 "DoM truncate deadlock"
+
+test_6() {
+	$MULTIOP $DIR1/$tfile Oz40960w100_z200w100c &
+	MULTIPID=$!
+
+	# let MULTIPID to create the file
+	sleep 1
+	$MULTIOP $DIR2/$tfile oO_RDWR:Tw100c
+	kill -USR1 $MULTIPID
+	wait
+	$MULTIOP $DIR2/$tfile oO_RDWR:z400w100c
+	$CHECKSTAT -s 500 $DIR2/$tfile || error "wrong size"
+}
+run_test 6 "Race two writes, check file size"
+
 test_fsx() {
 	local file1=$DIR1/$tfile
 	local file2=$DIR2/$tfile
@@ -119,10 +168,10 @@ test_sanity()
 {
 	# XXX: to fix 45. Add 42a, c when LU-9693 fixed.
 	# Add 42b when LU-6493 fixed
-	# Enable 39k when LU-10496 fixed
 	ONLY="36 39 40 41 42d 42e 43 46 56r 101e 119a 131 150 155a 155b 155c \
-		155d 207 241 251" \
-		EXCEPT=39k OSC="mdc" DOM="yes" bash sanity.sh
+		155d 207 241 251" OSC="mdc" DOM="yes" bash sanity.sh
+
+	return 0
 }
 run_test sanity "Run sanity with Data-on-MDT files"
 
@@ -131,6 +180,8 @@ test_sanityn()
 	# XXX: to fix 60
 	ONLY="1 2 4 5 6 7 8 9 10 11 12 14 17 19 20 23 27 39 51a 51c 51d" \
 		OSC="mdc" DOM="yes" bash sanityn.sh
+
+	return 0
 }
 run_test sanityn "Run sanityn with Data-on-MDT files"