X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanityn.sh;h=e22911a28d79e65ab09c2904a4e06f24e88ce86d;hp=8c332a4d3bb88062008c2cc4ef65db61756daca1;hb=743b85a32e24cff0c77dff739691043970a0901e;hpb=1cb9e85039c8df5fbe061aad3b0666c59ff7aa4e

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index 8c332a4..e22911a 100755
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -3,8 +3,9 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 3192 LU-1205 15528/3811 9977 15528/11549 18080
-ALWAYS_EXCEPT="                14b  18c     19         28   29          35    $SANITYN_EXCEPT"
+# bug number for skipped test: 9977/LU-7105
+#		LU-7105
+ALWAYS_EXCEPT=" 28	$SANITYN_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 SRCDIR=$(dirname $0)
@@ -30,11 +31,12 @@ CLEANUP=${CLEANUP:-:}
 SETUP=${SETUP:-:}
 init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+get_lustre_env
 init_logging
 
 if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
-# bug number for skipped test:        LU-2189 LU-2776
-	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 36      51a"
+# bug number for skipped test:
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT "
 # LU-2829 / LU-2887 - make allowances for ZFS slowness
 	TEST33_NFILES=${TEST33_NFILES:-1000}
 fi
@@ -48,6 +50,8 @@ TRACE=${TRACE:-""}
 
 check_and_setup_lustre
 
+OSC=${OSC:-"osc"}
+
 assert_DIR
 rm -rf $DIR1/[df][0-9]* $DIR1/lnk $DIR/[df].${TESTSUITE}*
 
@@ -61,38 +65,29 @@ check_runas_id $RUNAS_ID $RUNAS_GID $RUNAS
 
 build_test_filter
 
-mkdir -p $MOUNT2
-mount_client $MOUNT2
-
-test_1a() {
-	touch $DIR1/f1
-	[ -f $DIR2/f1 ] || error
-}
-run_test 1a "check create on 2 mtpt's =========================="
-
-test_1b() {
-	chmod 777 $DIR2/f1
-	$CHECKSTAT -t file -p 0777 $DIR1/f1 || error
-	chmod a-x $DIR2/f1
-}
-run_test 1b "check attribute updates on 2 mtpt's ==============="
+test_1() {
+	touch $DIR1/$tfile
+	[ -f $DIR2/$tfile ] || error "Check create"
+	chmod 777 $DIR2/$tfile
+	$CHECKSTAT -t file -p 0777 $DIR1/$tfile ||
+		error "Check attribute update for 0777"
 
-test_1c() {
-	$CHECKSTAT -t file -p 0666 $DIR1/f1 || error
-}
-run_test 1c "check after remount attribute updates on 2 mtpt's ="
+	chmod a-x $DIR2/$tfile
+	$CHECKSTAT -t file -p 0666 $DIR1/$tfile ||
+		error "Check attribute update for 0666"
 
-test_1d() {
-	rm $DIR2/f1
-	$CHECKSTAT -a $DIR1/f1 || error
+	rm $DIR2/$tfile
+	$CHECKSTAT -a $DIR1/$tfile ||
+		error "Check unlink - removes file on other mountpoint"
 }
-run_test 1d "unlink on one mountpoint removes file on other ===="
+run_test 1 "Check attribute updates on 2 mount points"
 
 test_2a() {
 	touch $DIR1/f2a
 	ls -l $DIR2/f2a
 	chmod 777 $DIR2/f2a
-	$CHECKSTAT -t file -p 0777 $DIR1/f2a || error
+	$CHECKSTAT -t file -p 0777 $DIR1/f2a ||
+		error "Either not file type or perms not 0777"
 }
 run_test 2a "check cached attribute updates on 2 mtpt's ========"
 
@@ -100,20 +95,23 @@ test_2b() {
 	touch $DIR1/f2b
 	ls -l $DIR2/f2b
 	chmod 777 $DIR1/f2b
-	$CHECKSTAT -t file -p 0777 $DIR2/f2b || error
+	$CHECKSTAT -t file -p 0777 $DIR2/f2b ||
+		error "Either not file type or perms not 0777"
 }
 run_test 2b "check cached attribute updates on 2 mtpt's ========"
 
 # NEED TO SAVE ROOT DIR MODE
 test_2c() {
 	chmod 777 $DIR1
-	$CHECKSTAT -t dir -p 0777 $DIR2 || error
+	$CHECKSTAT -t dir -p 0777 $DIR2 ||
+		error "Either not dir type or perms not 0777"
 }
 run_test 2c "check cached attribute updates on 2 mtpt's root ==="
 
 test_2d() {
 	chmod 755 $DIR1
-	$CHECKSTAT -t dir -p 0755 $DIR2 || error
+	$CHECKSTAT -t dir -p 0755 $DIR2 ||
+		error "Either not file type or perms not 0775"
 }
 run_test 2d "check cached attribute updates on 2 mtpt's root ==="
 
@@ -122,7 +120,8 @@ test_2e() {
         ls -l $DIR1
         ls -l $DIR2
         chmod 777 $DIR1
-        $RUNAS dd if=/dev/zero of=$DIR2/$tfile count=1 || error
+		$RUNAS dd if=/dev/zero of=$DIR2/$tfile count=1 ||
+			error "dd failed"
 }
 run_test 2e "check chmod on root is propagated to others"
 
@@ -169,7 +168,7 @@ test_2g() {
 	local block2=$(stat $DIR2/$tfile | awk '/Blocks/ {print $4} ')
 	echo "$DIR1/$tfile has $block1 blocks"
 	echo "$DIR2/$tfile has $block2 blocks"
-	[ $block1 -eq $block2 ] || error
+	[ $block1 -eq $block2 ] || error "$block1 not equal to $block2"
 }
 run_test 2g "check blocks update on sync write"
 
@@ -189,7 +188,8 @@ run_test 4 "fstat validation on multiple mount points =========="
 test_5() {
 	mcreate $DIR1/f5
 	$TRUNCATE $DIR2/f5 100
-	$CHECKSTAT -t file -s 100 $DIR1/f5 || error
+	$CHECKSTAT -t file -s 100 $DIR1/f5 ||
+		error "Either not file type or size not equal to 100 bytes"
 	rm $DIR1/f5
 }
 run_test 5 "create a file on one mount, truncate it on the other"
@@ -213,7 +213,7 @@ test_8() {
 }
 run_test 8 "remove of open special file on other node =========="
 
-test_9() {
+test_9a() {
 	MTPT=1
 	local dir
 	> $DIR2/f9
@@ -225,7 +225,23 @@ test_9() {
 	[ "`cat $DIR1/f9`" = "abcdefghijkl" ] || \
 		error "`od -a $DIR1/f9` != abcdefghijkl"
 }
-run_test 9 "append of file with sub-page size on multiple mounts"
+run_test 9a "append of file with sub-page size on multiple mounts"
+
+#LU-10681 - tiny writes & appending to sparse striped file
+test_9b() {
+	[[ $OSTCOUNT -ge 2 ]] || { skip "needs >= 2 OSTs"; return; }
+
+	$LFS setstripe -c 2 -S 1M $DIR/$tfile
+	echo "foo" >> $DIR/$tfile
+	dd if=/dev/zero of=$DIR2/$tfile bs=1M count=1 seek=1 conv=notrunc ||
+		error "sparse dd $DIR2/$tfile failed"
+	echo "foo" >> $DIR/$tfile
+
+	data=$(dd if=$DIR2/$tfile bs=1 count=3 skip=$((2 * 1048576)) conv=notrunc)
+	echo "Data read (expecting 'foo')": $data
+	[ "$data" = "foo" ] || error "append to sparse striped file failed"
+}
+run_test 9b "append to striped sparse file"
 
 test_10a() {
 	MTPT=1
@@ -268,94 +284,85 @@ test_11() {
 	$DIR2/d11/f
 	RC=$?
 	kill -USR1 $MULTIPID
-	wait $MULTIPID || error
+	wait $MULTIPID || error "wait for PID $MULTIPID failed"
 	[ $RC -eq 0 ] && error || true
 }
 run_test 11 "execution of file opened for write should return error ===="
 
 test_12() {
-       DIR=$DIR DIR2=$DIR2 sh lockorder.sh
+	DIR=$DIR DIR2=$DIR2 sh lockorder.sh
 }
-run_test 12 "test lock ordering (link, stat, unlink) ==========="
+run_test 12 "test lock ordering (link, stat, unlink)"
 
 test_13() {	# bug 2451 - directory coherency
-	test_mkdir $DIR1/d13 || error
-       cd $DIR1/d13 || error
-       ls
-       ( touch $DIR1/d13/f13 ) # needs to be a separate shell
-       ls
-       rm -f $DIR2/d13/f13 || error
-       ls 2>&1 | grep f13 && error "f13 shouldn't return an error (1)" || true
-       # need to run it twice
-       ( touch $DIR1/d13/f13 ) # needs to be a separate shell
-       ls
-       rm -f $DIR2/d13/f13 || error
-       ls 2>&1 | grep f13 && error "f13 shouldn't return an error (2)" || true
-}
-run_test 13 "test directory page revocation ===================="
+	test_mkdir $DIR1/d13
+	cd $DIR1/d13 || error "cd to $DIR1/d13 failed"
+	ls
+	( touch $DIR1/d13/f13 ) # needs to be a separate shell
+	ls
+	rm -f $DIR2/d13/f13 || error "Cannot remove $DIR2/d13/f13"
+	ls 2>&1 | grep f13 && error "f13 shouldn't return an error (1)" || true
+	# need to run it twice
+	( touch $DIR1/d13/f13 ) # needs to be a separate shell
+	ls
+	rm -f $DIR2/d13/f13 || error "Cannot remove $DIR2/d13/f13"
+	ls 2>&1 | grep f13 && error "f13 shouldn't return an error (2)" || true
+}
+run_test 13 "test directory page revocation"
 
 test_14aa() {
-	test_mkdir -p $DIR1/$tdir
+	test_mkdir $DIR1/$tdir
 	cp -p /bin/ls $DIR1/$tdir/$tfile
 	multiop_bg_pause $DIR1/$tdir/$tfile Ow_c || return 1
 	MULTIPID=$!
 
 	$DIR2/$tdir/$tfile && error || true
-	kill -USR1 $MULTIPID
-	wait $MULTIPID || return 2
+	kill $MULTIPID
 }
 run_test 14aa "execution of file open for write returns -ETXTBSY"
 
 test_14ab() {
-	test_mkdir -p $DIR1/d14
-	cp -p `which multiop` $DIR1/d14/multiop || error "cp failed"
-        MULTIOP_PROG=$DIR1/d14/multiop multiop_bg_pause $TMP/test14.junk O_c || return 1
-        MULTIOP_PID=$!
-        $MULTIOP $DIR2/d14/multiop Oc && error "expected error, got success"
-        kill -USR1 $MULTIOP_PID || return 2
-        wait $MULTIOP_PID || return 3
-        rm $TMP/test14.junk $DIR1/d14/multiop || error "removing multiop"
+	test_mkdir $DIR1/$tdir
+	cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed"
+	$DIR1/$tdir/sleep 60 &
+	SLEEP_PID=$!
+	$MULTIOP $DIR2/$tdir/sleep Oc && error "expected error, got success"
+	kill $SLEEP_PID
 }
 run_test 14ab "open(RDWR) of executing file returns -ETXTBSY"
 
 test_14b() { # bug 3192, 7040
-	test_mkdir -p $DIR1/d14
-	cp -p `which multiop` $DIR1/d14/multiop || error "cp failed"
-        MULTIOP_PROG=$DIR1/d14/multiop multiop_bg_pause $TMP/test14.junk O_c || return 1
-        MULTIOP_PID=$!
-        $TRUNCATE $DIR2/d14/multiop 0 && kill -9 $MULTIOP_PID && \
+	test_mkdir $DIR1/$tdir
+	cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed"
+	$DIR1/$tdir/sleep 60 &
+	SLEEP_PID=$!
+	$TRUNCATE $DIR2/$tdir/sleep 60 && kill -9 $SLEEP_PID && \
 		error "expected truncate error, got success"
-        kill -USR1 $MULTIOP_PID || return 2
-        wait $MULTIOP_PID || return 3
-	cmp `which multiop` $DIR1/d14/multiop || error "binary changed"
-	rm $TMP/test14.junk $DIR1/d14/multiop || error "removing multiop"
+	kill $SLEEP_PID
+	cmp $(which sleep) $DIR1/$tdir/sleep || error "binary changed"
 }
 run_test 14b "truncate of executing file returns -ETXTBSY ======"
 
 test_14c() { # bug 3430, 7040
-	test_mkdir -p $DIR1/d14
-	cp -p `which multiop` $DIR1/d14/multiop || error "cp failed"
-	MULTIOP_PROG=$DIR1/d14/multiop multiop_bg_pause $TMP/test14.junk O_c || return 1
-        MULTIOP_PID=$!
-	cp /etc/hosts $DIR2/d14/multiop && error "expected error, got success"
-	kill -USR1 $MULTIOP_PID || return 2
-	wait $MULTIOP_PID || return 3
-	cmp `which multiop` $DIR1/d14/multiop || error "binary changed"
-	rm $TMP/test14.junk $DIR1/d14/multiop || error "removing multiop"
+	test_mkdir $DIR1/$tdir
+	cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed"
+	$DIR1/$tdir/sleep 60 &
+	SLEEP_PID=$!
+	cp /etc/hosts $DIR2/$tdir/sleep && error "expected error, got success"
+	kill $SLEEP_PID
+	cmp $(which sleep) $DIR1/$tdir/sleep || error "binary changed"
 }
 run_test 14c "open(O_TRUNC) of executing file return -ETXTBSY =="
 
 test_14d() { # bug 10921
-	test_mkdir -p $DIR1/d14
-	cp -p `which multiop` $DIR1/d14/multiop || error "cp failed"
-	MULTIOP_PROG=$DIR1/d14/multiop multiop_bg_pause $TMP/test14.junk O_c || return 1
-        MULTIOP_PID=$!
+	test_mkdir $DIR1/$tdir
+	cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed"
+	$DIR1/$tdir/sleep 60 &
+	SLEEP_PID=$!
 	log chmod
-	chmod 600 $DIR1/d14/multiop || error "chmod failed"
-	kill -USR1 $MULTIOP_PID || return 2
-	wait $MULTIOP_PID || return 3
-	cmp `which multiop` $DIR1/d14/multiop || error "binary changed"
-	rm $TMP/test14.junk $DIR1/d14/multiop || error "removing multiop"
+	chmod 600 $DIR1/$tdir/sleep || error "chmod failed"
+	kill $SLEEP_PID
+	cmp $(which sleep) $DIR1/$tdir/sleep || error "binary changed"
 }
 run_test 14d "chmod of executing file is still possible ========"
 
@@ -383,7 +390,31 @@ else
 	FSXP=100
 fi
 
-test_16() {
+test_16a() {
+	local file1=$DIR1/$tfile
+	local file2=$DIR2/$tfile
+	local stripe_size=$(do_facet $SINGLEMDS \
+		"$LCTL get_param -n lod.$(facet_svc $SINGLEMDS)*.stripesize")
+
+	# to allocate grant because it may run out due to test_15.
+	$LFS setstripe -c -1 $file1
+	dd if=/dev/zero of=$file1 bs=$stripe_size count=$OSTCOUNT oflag=sync
+	dd if=/dev/zero of=$file2 bs=$stripe_size count=$OSTCOUNT oflag=sync
+	rm -f $file1
+
+	$LFS setstripe -c -1 $file1 # b=10919
+	fsx -c 50 -p $FSXP -N $FSXNUM -l $((SIZE * 256)) -S 0 $file1 $file2 \
+		|| error "fsx failed"
+	rm -f $file1
+
+	# O_DIRECT reads and writes must be aligned to the device block size.
+	fsx -c 50 -p $FSXP -N $FSXNUM -l $((SIZE * 256)) -S 0 -Z -r 4096 \
+		-w 4096 $file1 $file2 || error "fsx with O_DIRECT failed."
+}
+run_test 16a "$FSXNUM iterations of dual-mount fsx"
+
+# Consistency check for tiny writes, LU-9409
+test_16b() {
 	local file1=$DIR1/$tfile
 	local file2=$DIR2/$tfile
 
@@ -394,9 +425,48 @@ test_16() {
 	rm -f $file1
 
 	lfs setstripe -c -1 $file1 # b=10919
-	fsx -c 50 -p $FSXP -N $FSXNUM -l $((SIZE * 256)) -S 0 $file1 $file2
+	# -o is set to 8192 because writes < 1 page and between 1 and 2 pages
+	# create a mix of tiny writes & normal writes
+	fsx -c 50 -p $FSXP -N $FSXNUM -l $((SIZE * 256)) -o 8192 -S 0 $file1 \
+	$file2
 }
-run_test 16 "$FSXNUM iterations of dual-mount fsx"
+run_test 16b "$FSXNUM iterations of dual-mount fsx at small size"
+
+test_16c() {
+	local file1=$DIR1/$tfile
+	local file2=$DIR2/$tfile
+	local stripe_size=$(do_facet $SINGLEMDS \
+		"$LCTL get_param -n lod.$(facet_svc $SINGLEMDS)*.stripesize")
+
+	[ $(facet_fstype ost1) != ldiskfs ] && skip "dio on ldiskfs only"
+
+	# to allocate grant because it may run out due to test_15.
+	$LFS setstripe -c -1 $file1
+	dd if=/dev/zero of=$file1 bs=$stripe_size count=$OSTCOUNT oflag=sync
+	dd if=/dev/zero of=$file2 bs=$stripe_size count=$OSTCOUNT oflag=sync
+	rm -f $file1
+	wait_delete_completed
+
+	local list=$(comma_list $(osts_nodes))
+	if ! get_osd_param $list '' read_cache_enable >/dev/null; then
+		skip "not cache-capable obdfilter"
+	fi
+
+	set_osd_param $list '' read_cache_enable 0
+	set_osd_param $list '' writethrough_cache_enable 0
+
+	$LFS setstripe -c -1 $file1 # b=10919
+	fsx -c 50 -p $FSXP -N $FSXNUM -l $((SIZE * 256)) -S 0 $file1 $file2 \
+		|| error "fsx failed"
+	rm -f $file1
+
+	set_osd_param $list '' read_cache_enable 1
+	set_osd_param $list '' writethrough_cache_enable 1
+
+	return 0
+}
+run_test 16c "verify data consistency on ldiskfs with cache disabled (b=17397)"
+
 
 test_17() { # bug 3513, 3667
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
@@ -432,21 +502,20 @@ run_test 18 "mmap sanity check ================================="
 test_19() { # bug3811
 	local node=$(facet_active_host ost1)
 
+	[ "x$DOM" = "xyes" ] && node=$(facet_active_host $SINGLEMDS)
+
 	# check whether obdfilter is cache capable at all
-	if ! get_osd_param $node '' read_cache_enable >/dev/null; then
-		echo "not cache-capable obdfilter"
-		return 0
-	fi
+	get_osd_param $node '' read_cache_enable >/dev/null ||
+		skip "not cache-capable obdfilter"
 
-	local MAX=$(get_osd_param $node '' readcache_max_filesize | \
-		    head -n 1)
+	local MAX=$(get_osd_param $node '' readcache_max_filesize | head -n 1)
 	set_osd_param $node '' readcache_max_filesize 4096
 	dd if=/dev/urandom of=$TMP/$tfile bs=512k count=32
 	local SUM=$(cksum $TMP/$tfile | cut -d" " -f 1,2)
 	cp $TMP/$tfile $DIR1/$tfile
 	for i in `seq 1 20`; do
 		[ $((i % 5)) -eq 0 ] && log "$testname loop $i"
-		cancel_lru_locks osc > /dev/null
+		cancel_lru_locks $OSC > /dev/null
 		cksum $DIR1/$tfile | cut -d" " -f 1,2 > $TMP/sum1 & \
 		cksum $DIR2/$tfile | cut -d" " -f 1,2 > $TMP/sum2
 		wait
@@ -462,12 +531,12 @@ run_test 19 "test concurrent uncached read races ==============="
 
 test_20() {
 	test_mkdir $DIR1/d20
-	cancel_lru_locks osc
+	cancel_lru_locks $OSC
 	CNT=$((`lctl get_param -n llite.*.dump_page_cache | wc -l`))
 	$MULTIOP $DIR1/f20 Ow8190c
 	$MULTIOP $DIR2/f20 Oz8194w8190c
 	$MULTIOP $DIR1/f20 Oz0r8190c
-	cancel_lru_locks osc
+	cancel_lru_locks $OSC
 	CNTD=$((`lctl get_param -n llite.*.dump_page_cache | wc -l` - $CNT))
 	[ $CNTD -gt 0 ] && \
 	    error $CNTD" page left in cache after lock cancel" || true
@@ -498,7 +567,7 @@ test_23() { # Bug 5972
 	echo "atime should be updated while another read" > $DIR1/$tfile
 
 	# clear the lock(mode: LCK_PW) gotten from creating operation
-	cancel_lru_locks osc
+	cancel_lru_locks $OSC
 	time1=$(date +%s)
 	echo "now is $time1"
 	sleep $((at_diff + 1))
@@ -530,9 +599,9 @@ test_24a() {
 
 	OSC=`lctl dl | awk '/-osc-|OSC.*MNT/ {print $4}' | head -n 1`
 #	OSC=`lctl dl | awk '/-osc-/ {print $4}' | head -n 1`
-	lctl --device %$OSC deactivate
+	lctl --device %osc deactivate
 	lfs df -i || error "lfs df -i with deactivated OSC failed"
-	lctl --device %$OSC activate
+	lctl --device %osc activate
 	lfs df || error "lfs df with reactivated OSC failed"
 }
 run_test 24a "lfs df [-ih] [path] test ========================="
@@ -602,7 +671,7 @@ test_25b() {
 run_test 25b "change ACL under remote dir on one mountpoint be seen on another"
 
 test_26a() {
-        utime $DIR1/f26a -s $DIR2/f26a || error
+	utime $DIR1/f26a -s $DIR2/f26a || error "utime failed for $DIR1/f26a"
 }
 run_test 26a "allow mtime to get older"
 
@@ -622,7 +691,7 @@ test_26b() {
 run_test 26b "sync mtime between ost and mds"
 
 test_27() {
-	cancel_lru_locks osc
+	cancel_lru_locks $OSC
 	lctl clear
 	dd if=/dev/zero of=$DIR2/$tfile bs=$((4096+4))k conv=notrunc count=4 seek=3 &
 	DD2_PID=$!
@@ -666,46 +735,33 @@ test_28() { # bug 9977
 	EOF
 
 	# reading of 1st stripe should pass
-	dd if=$DIR2/$tfile of=/dev/null bs=1024k count=1 || error
+	dd if=$DIR2/$tfile of=/dev/null bs=1024k count=1 || error "dd failed"
 	# reading of 2nd stripe should fail (this stripe was destroyed)
 	dd if=$DIR2/$tfile of=/dev/null bs=1024k count=1 skip=1 && error
 
 	# now, recreating test file
-	dd if=/dev/zero of=$DIR1/$tfile bs=1024k count=2 || error
+	dd if=/dev/zero of=$DIR1/$tfile bs=1024k count=2 || error "dd failed"
 	# reading of 1st stripe should pass
-	dd if=$DIR2/$tfile of=/dev/null bs=1024k count=1 || error
+	dd if=$DIR2/$tfile of=/dev/null bs=1024k count=1 || error "dd failed"
 	# reading of 2nd stripe should pass
-	dd if=$DIR2/$tfile of=/dev/null bs=1024k count=1 skip=1 || error
+	dd if=$DIR2/$tfile of=/dev/null bs=1024k count=1 skip=1 ||
+		error "dd failed"
 }
 run_test 28 "read/write/truncate file with lost stripes"
 
-test_29() { # bug 10999
-	touch $DIR1/$tfile
-	#define OBD_FAIL_LDLM_GLIMPSE  0x30f
-	lctl set_param fail_loc=0x8000030f
-	ls -l $DIR2/$tfile &
-	usleep 500
-	dd if=/dev/zero of=$DIR1/$tfile bs=4k count=1
-	wait
-}
-#bug 11549 - permanently turn test off in b1_5
-run_test 29 "lock put race between glimpse and enqueue ========="
-
-test_30() { #bug #11110, LU-2523
-	test_mkdir -p $DIR1/$tdir
+test_30() { #b=11110, LU-2523
+	test_mkdir $DIR1/$tdir
 	cp -f /bin/bash $DIR1/$tdir/bash
-	/bin/sh -c 'sleep 1; rm -f $DIR2/$tdir/bash;
-		    cp /bin/bash $DIR2/$tdir' &
+	/bin/sh -c 'sleep 1; rm -f $DIR2/$tdir/bash; cp /bin/bash $DIR2/$tdir' &
 	$DIR1/$tdir/bash -c 'sleep 2;
 		openfile -f O_RDONLY /proc/$$/exe >& /dev/null; echo $?'
 	wait
 	true
 }
-
 run_test 30 "recreate file race"
 
 test_31a() {
-	test_mkdir -p $DIR1/$tdir || error "Creating dir $DIR1/$tdir"
+	test_mkdir $DIR1/$tdir
 	local writes=$(LANG=C dd if=/dev/zero of=$DIR/$tdir/$tfile \
 		       count=1 2>&1 | awk 'BEGIN { FS="+" } /out/ {print $1}')
 	#define OBD_FAIL_LDLM_CANCEL_BL_CB_RACE   0x314
@@ -724,7 +780,7 @@ test_31b() {
 	wait_mds_ost_sync || error "wait_mds_ost_sync()"
 	wait_delete_completed || error "wait_delete_completed()"
 
-	test_mkdir -p $DIR1/$tdir || error "Creating dir $DIR1/$tdir"
+	test_mkdir $DIR1/$tdir
         lfs setstripe $DIR/$tdir/$tfile -i 0 -c 1
         cp /etc/hosts $DIR/$tdir/$tfile
         #define OBD_FAIL_LDLM_CANCEL_BL_CB_RACE   0x314
@@ -742,48 +798,50 @@ run_test 31b "voluntary OST cancel / blocking ast race=============="
 
 # enable/disable lockless truncate feature, depending on the arg 0/1
 enable_lockless_truncate() {
-        lctl set_param -n osc.*.lockless_truncate $1
+	lctl set_param -n $OSC.*.lockless_truncate $1
 }
 
 test_32a() { # bug 11270
-	local p="$TMP/$TESTSUITE-$TESTNAME.parameters"
-	save_lustre_params client "osc.*.lockless_truncate" > $p
-        cancel_lru_locks osc
-        enable_lockless_truncate 1
-        rm -f $DIR1/$tfile
-        lfs setstripe -c -1 $DIR1/$tfile
-        dd if=/dev/zero of=$DIR1/$tfile count=$OSTCOUNT bs=$STRIPE_BYTES > \
-                /dev/null 2>&1
-        clear_osc_stats
-
-        log "checking cached lockless truncate"
-        $TRUNCATE $DIR1/$tfile 8000000
-        $CHECKSTAT -s 8000000 $DIR2/$tfile || error "wrong file size"
-	[ $(calc_osc_stats lockless_truncate) -ne 0 ] ||
+	local save="$TMP/$TESTSUITE-$TESTNAME.parameters"
+	local stripe_size=$(do_facet $SINGLEMDS \
+		"$LCTL get_param -n lod.$(facet_svc $SINGLEMDS)*.stripesize")
+
+	save_lustre_params client "$OSC.*.lockless_truncate" > $save
+	# restore lockless_truncate default values on exit
+	stack_trap "restore_lustre_params < $save; rm -f $save" EXIT
+	cancel_lru_locks $OSC
+	enable_lockless_truncate 1
+	rm -f $DIR1/$tfile
+	lfs setstripe -c -1 $DIR1/$tfile
+	dd if=/dev/zero of=$DIR1/$tfile count=$OSTCOUNT bs=$stripe_size > \
+		/dev/null 2>&1
+	clear_stats $OSC.*.${OSC}_stats
+
+	log "checking cached lockless truncate"
+	$TRUNCATE $DIR1/$tfile 8000000
+	$CHECKSTAT -s 8000000 $DIR2/$tfile || error "wrong file size"
+	[ $(calc_stats $OSC.*.${OSC}_stats lockless_truncate) -ne 0 ] ||
 		error "cached truncate isn't lockless"
 
-        log "checking not cached lockless truncate"
-        $TRUNCATE $DIR2/$tfile 5000000
-        $CHECKSTAT -s 5000000 $DIR1/$tfile || error "wrong file size"
-	[ $(calc_osc_stats lockless_truncate) -ne 0 ] ||
+	log "checking not cached lockless truncate"
+	$TRUNCATE $DIR2/$tfile 5000000
+	$CHECKSTAT -s 5000000 $DIR1/$tfile || error "wrong file size"
+	[ $(calc_stats $OSC.*.${OSC}_stats lockless_truncate) -ne 0 ] ||
 		error "not cached truncate isn't lockless"
 
-        log "disabled lockless truncate"
-        enable_lockless_truncate 0
-        clear_osc_stats
-        $TRUNCATE $DIR2/$tfile 3000000
-        $CHECKSTAT -s 3000000 $DIR1/$tfile || error "wrong file size"
-        [ $(calc_osc_stats lockless_truncate) -eq 0 ] ||
-                error "lockless truncate disabling failed"
-        rm $DIR1/$tfile
-        # restore lockless_truncate default values
-        restore_lustre_params < $p
-        rm -f $p
+	log "disabled lockless truncate"
+	enable_lockless_truncate 0
+	clear_stats $OSC.*.${OSC}_stats
+	$TRUNCATE $DIR2/$tfile 3000000
+	$CHECKSTAT -s 3000000 $DIR1/$tfile || error "wrong file size"
+	[ $(calc_stats $OSC.*.${OSC}_stats lockless_truncate) -eq 0 ] ||
+		error "lockless truncate disabling failed"
+	rm -f $DIR1/$tfile
 }
 run_test 32a "lockless truncate"
 
 test_32b() { # bug 11270
-        remote_ost_nodsh && skip "remote OST with nodsh" && return
+	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
 	local node
 	local facets=$(get_facets OST)
@@ -796,35 +854,42 @@ test_32b() { # bug 11270
 		"ldlm.namespaces.filter-*.contended_locks" >> $p
 	save_lustre_params $facets \
 		"ldlm.namespaces.filter-*.contention_seconds" >> $p
-	clear_osc_stats
+	clear_stats $OSC.*.${OSC}_stats
 
-        # agressive lockless i/o settings
-        for node in $(osts_nodes); do
-                do_node $node 'lctl set_param -n ldlm.namespaces.filter-*.max_nolock_bytes 2000000; lctl set_param -n ldlm.namespaces.filter-*.contended_locks 0; lctl set_param -n ldlm.namespaces.filter-*.contention_seconds 60'
-        done
-        lctl set_param -n osc.*.contention_seconds 60
-        for i in $(seq 5); do
-                dd if=/dev/zero of=$DIR1/$tfile bs=4k count=1 conv=notrunc > /dev/null 2>&1
-                dd if=/dev/zero of=$DIR2/$tfile bs=4k count=1 conv=notrunc > /dev/null 2>&1
-        done
-        [ $(calc_osc_stats lockless_write_bytes) -ne 0 ] || error "lockless i/o was not triggered"
-        # disable lockless i/o (it is disabled by default)
-        for node in $(osts_nodes); do
-                do_node $node 'lctl set_param -n ldlm.namespaces.filter-*.max_nolock_bytes 0; lctl set_param -n ldlm.namespaces.filter-*.contended_locks 32; lctl set_param -n ldlm.namespaces.filter-*.contention_seconds 0'
-        done
-        # set contention_seconds to 0 at client too, otherwise Lustre still
-        # remembers lock contention
-        lctl set_param -n osc.*.contention_seconds 0
-        clear_osc_stats
-        for i in $(seq 1); do
-                dd if=/dev/zero of=$DIR1/$tfile bs=4k count=1 conv=notrunc > /dev/null 2>&1
-                dd if=/dev/zero of=$DIR2/$tfile bs=4k count=1 conv=notrunc > /dev/null 2>&1
-        done
-        [ $(calc_osc_stats lockless_write_bytes) -eq 0 ] ||
-                error "lockless i/o works when disabled"
-        rm -f $DIR1/$tfile
-        restore_lustre_params <$p
-        rm -f $p
+	# agressive lockless i/o settings
+	do_nodes $(comma_list $(osts_nodes)) \
+		"lctl set_param -n ldlm.namespaces.*.max_nolock_bytes=2000000 \
+			ldlm.namespaces.filter-*.contended_locks=0 \
+			ldlm.namespaces.filter-*.contention_seconds=60"
+	lctl set_param -n $OSC.*.contention_seconds=60
+	for i in {1..5}; do
+		dd if=/dev/zero of=$DIR1/$tfile bs=4k count=1 conv=notrunc > \
+			/dev/null 2>&1
+		dd if=/dev/zero of=$DIR2/$tfile bs=4k count=1 conv=notrunc > \
+			/dev/null 2>&1
+	done
+	[ $(calc_stats $OSC.*.${OSC}_stats lockless_write_bytes) -ne 0 ] ||
+		error "lockless i/o was not triggered"
+	# disable lockless i/o (it is disabled by default)
+	do_nodes $(comma_list $(osts_nodes)) \
+		"lctl set_param -n ldlm.namespaces.filter-*.max_nolock_bytes=0 \
+			ldlm.namespaces.filter-*.contended_locks=32 \
+			ldlm.namespaces.filter-*.contention_seconds=0"
+	# set contention_seconds to 0 at client too, otherwise Lustre still
+	# remembers lock contention
+	lctl set_param -n $OSC.*.contention_seconds=0
+	clear_stats $OSC.*.${OSC}_stats
+	for i in {1..1}; do
+		dd if=/dev/zero of=$DIR1/$tfile bs=4k count=1 conv=notrunc > \
+			/dev/null 2>&1
+		dd if=/dev/zero of=$DIR2/$tfile bs=4k count=1 conv=notrunc > \
+			/dev/null 2>&1
+	done
+	[ $(calc_stats $OSC.*.${OSC}_stats lockless_write_bytes) -eq 0 ] ||
+		error "lockless i/o works when disabled"
+	rm -f $DIR1/$tfile
+	restore_lustre_params <$p
+	rm -f $p
 }
 run_test 32b "lockless i/o"
 
@@ -876,7 +941,7 @@ test_33a() {
 
             [ $fstype = ldiskfs ] && jbdold=$(print_jbd_stat)
             echo "=== START createmany old: $jbdold transaction"
-            local elapsed=$(do_and_time "do_nodes $CLIENT1,$CLIENT2 createmany -o $DIR1/$tdir-\\\$(hostname)-$i/f- -r $DIR2/$tdir-\\\$(hostname)-$i/f- $nfiles > /dev/null 2>&1")
+            local elapsed=$(do_and_time "do_nodes $CLIENT1,$CLIENT2 createmany -o $DIR1/$tdir-\\\$(hostname)-$i/f- -r$DIR2/$tdir-\\\$(hostname)-$i/f- $nfiles > /dev/null 2>&1")
             [ $fstype = ldiskfs ] && jbdnew=$(print_jbd_stat)
             [ $fstype = ldiskfs ] && jbd=$(( jbdnew - jbdold ))
             echo "=== END   createmany new: $jbdnew transaction :  $jbd transactions  nfiles $nfiles time $elapsed COS=$COS"
@@ -932,7 +997,7 @@ test_33b() {
 			echo "=== START createmany old: $jbdold transaction"
 			local elapsed=$(do_and_time "do_nodes $CLIENT1,$CLIENT2\
 				createmany -o $DIR1/$tdir-\\\$(hostname)-$i/f- \
-				-r $DIR2/$tdir-\\\$(hostname)-$i/f- $nfiles > \
+				-r$DIR2/$tdir-\\\$(hostname)-$i/f- $nfiles > \
 								/dev/null 2>&1")
 			jbdnew=$(print_jbd_stat)
 			jbd=$(( jbdnew - jbdold ))
@@ -963,39 +1028,57 @@ test_33c() {
 	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.63) ] &&
 		skip "DNE CoS not supported" && return
 
-	sync
+	local sync_count
 
 	mkdir $DIR/$tdir
-	# remote mkdir is done on MDT2, which enqueued lock of $tdir on MDT1
-	$LFS mkdir -i 1 $DIR/$tdir/d1
+	sync_all_data
 	do_facet mds1 "lctl set_param -n mdt.*.sync_count=0"
-	mkdir $DIR/$tdir/d2
-	local sync_count=$(do_facet mds1 \
-		"lctl get_param -n mdt.*MDT0000.sync_count")
-	[ $sync_count -eq 1 ] || error "Sync-Lock-Cancel not triggered"
+	# do twice in case transaction is committed before unlock, see LU-8200
+	for i in 1 2; do
+		# remote dir is created on MDT1, which enqueued lock of $tdir on
+		# MDT0
+		$LFS mkdir -i 1 $DIR/$tdir/remote.$i
+		mkdir $DIR/$tdir/local.$i
+	done
+	sync_count=$(do_facet mds1 "lctl get_param -n mdt.*MDT0000.sync_count")
+	echo "sync_count $sync_count"
+	[ $sync_count -eq 0 ] && error "Sync-Lock-Cancel not triggered"
 
-	$LFS mkdir -i 1 $DIR/$tdir/d3
+	sync_all_data
 	do_facet mds1 "lctl set_param -n mdt.*.sync_count=0"
+	$LFS mkdir -i 1 $DIR/$tdir/remote.3
 	# during sleep remote mkdir should have been committed and canceled
 	# remote lock spontaneously, which shouldn't trigger sync
 	sleep 6
-	mkdir $DIR/$tdir/d4
-	local sync_count=$(do_facet mds1 \
-		"lctl get_param -n mdt.*MDT0000.sync_count")
+	mkdir $DIR/$tdir/local.3
+	sync_count=$(do_facet mds1 "lctl get_param -n mdt.*MDT0000.sync_count")
+	echo "sync_count $sync_count"
 	[ $sync_count -eq 0 ] || error "Sync-Lock-Cancel triggered"
 }
 run_test 33c "Cancel cross-MDT lock should trigger Sync-Lock-Cancel"
 
-ops_do_cos() {
+# arg1 is operations done before CoS, arg2 is the operation that triggers CoS
+op_trigger_cos() {
+	local commit_nr
+	local total=0
 	local nodes=$(comma_list $(mdts_nodes))
-	do_nodes $nodes "lctl set_param -n mdt.*.async_commit_count=0"
-	sh -c "$@"
-	local async_commit_count=$(do_nodes $nodes \
-		"lctl get_param -n mdt.*.async_commit_count" | calc_sum)
-	[ $async_commit_count -gt 0 ] || error "CoS not triggerred"
 
-	rm -rf $DIR/$tdir
-	sync
+	sync_all_data
+
+	# trigger CoS twice in case transaction commit before unlock
+	for i in 1 2; do
+		sh -c "$1"
+		do_nodes $nodes "lctl set_param -n mdt.*.async_commit_count=0"
+		sh -c "$2"
+		commit_nr=$(do_nodes $nodes \
+			"lctl get_param -n mdt.*.async_commit_count" | calc_sum)
+		total=$((total + commit_nr));
+		rm -rf $DIR/$tdir
+		sync_all_data
+	done
+
+	echo "CoS count $total"
+	[ $total -gt 0 ] || error "$2 didn't trigger CoS"
 }
 
 test_33d() {
@@ -1003,39 +1086,34 @@ test_33d() {
 	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.63) ] &&
 		skip "DNE CoS not supported" && return
 
-	sync
 	# remote directory create
-	mkdir $DIR/$tdir
-	ops_do_cos "$LFS mkdir -i 1 $DIR/$tdir/subdir"
+	op_trigger_cos "mkdir $DIR/$tdir" "$LFS mkdir -i 1 $DIR/$tdir/subdir"
 	# remote directory unlink
-	$LFS mkdir -i 1 $DIR/$tdir
-	ops_do_cos "rmdir $DIR/$tdir"
+	op_trigger_cos "$LFS mkdir -i 1 $DIR/$tdir" "rmdir $DIR/$tdir"
 	# striped directory create
-	mkdir $DIR/$tdir
-	ops_do_cos "$LFS mkdir -c 2 $DIR/$tdir/subdir"
+	op_trigger_cos "mkdir $DIR/$tdir" "$LFS mkdir -c 2 $DIR/$tdir/subdir"
 	# striped directory setattr
-	$LFS mkdir -c 2 $DIR/$tdir
-	touch $DIR/$tdir
-	ops_do_cos "chmod 713 $DIR/$tdir"
+	op_trigger_cos "$LFS mkdir -c 2 $DIR/$tdir; touch $DIR/$tdir" \
+		"chmod 713 $DIR/$tdir"
 	# striped directory unlink
-	$LFS mkdir -c 2 $DIR/$tdir
-	touch $DIR/$tdir
-	ops_do_cos "rmdir $DIR/$tdir"
+	op_trigger_cos "$LFS mkdir -c 2 $DIR/$tdir; touch $DIR/$tdir" \
+		"rmdir $DIR/$tdir"
 	# cross-MDT link
-	$LFS mkdir -c 2 $DIR/$tdir
-	$LFS mkdir -i 0 $DIR/$tdir/d1
-	$LFS mkdir -i 1 $DIR/$tdir/d2
-	touch $DIR/$tdir/d1/tgt
-	ops_do_cos "ln $DIR/$tdir/d1/tgt $DIR/$tdir/d2/src"
+	op_trigger_cos "$LFS mkdir -c 2 $DIR/$tdir; \
+			$LFS mkdir -i 0 $DIR/$tdir/d1; \
+			$LFS mkdir -i 1 $DIR/$tdir/d2; \
+			touch $DIR/$tdir/d1/tgt" \
+		"ln $DIR/$tdir/d1/tgt $DIR/$tdir/d2/src"
 	# cross-MDT rename
-	$LFS mkdir -c 2 $DIR/$tdir
-	$LFS mkdir -i 0 $DIR/$tdir/d1
-	$LFS mkdir -i 1 $DIR/$tdir/d2
-	touch $DIR/$tdir/d1/src
-	ops_do_cos "mv $DIR/$tdir/d1/src $DIR/$tdir/d2/tgt"
+	op_trigger_cos "$LFS mkdir -c 2 $DIR/$tdir; \
+			$LFS mkdir -i 0 $DIR/$tdir/d1; \
+			$LFS mkdir -i 1 $DIR/$tdir/d2; \
+			touch $DIR/$tdir/d1/src" \
+		"mv $DIR/$tdir/d1/src $DIR/$tdir/d2/tgt"
 	# migrate
-	$LFS mkdir -i 0 $DIR/$tdir
-	ops_do_cos "$LFS migrate -m 1 $DIR/$tdir"
+	op_trigger_cos "$LFS mkdir -i 0 $DIR/$tdir" \
+		"$LFS migrate -m 1 $DIR/$tdir"
+
 	return 0
 }
 run_test 33d "DNE distributed operation should trigger COS"
@@ -1087,7 +1165,7 @@ cleanup_34() {
 	do_nodes $(comma_list $(osts_nodes)) \
 		"lctl set_param -n fail_loc=0 2>/dev/null || true"
 	for i in $(seq $OSTCOUNT); do
-		wait_osc_import_state client ost$i FULL
+		wait_osc_import_ready client ost$i
 	done
 }
 
@@ -1140,58 +1218,60 @@ test_34() { #16129
 run_test 34 "no lock timeout under IO"
 
 test_35() { # bug 17645
-        local generation=[]
-        local count=0
+	local generation=[]
+	local count=0
 	gen=$(lctl get_param mdc.$FSNAME-MDT*-mdc-*.import | grep generation |
-		awk '/generation/{print $2}')
+	      awk '/generation/{print $2}')
 	for g in $gen; do
-            generation[count]=$g
-            let count=count+1
-        done
+		generation[count]=$g
+		let count=count+1
+	done
 
-	test_mkdir -p $MOUNT1/$tfile
-        cancel_lru_locks mdc
+	test_mkdir $MOUNT1/$tdir
+	cancel_lru_locks mdc
 
-        # Let's initiate -EINTR situation by setting fail_loc and take
-        # write lock on same file from same client. This will not cause
-        # bl_ast yet as lock is already in local cache.
-#define OBD_FAIL_LDLM_INTR_CP_AST        0x317
-        do_facet client "lctl set_param fail_loc=0x80000317"
-        local timeout=`do_facet $SINGLEMDS lctl get_param  -n timeout`
-        let timeout=timeout*3
-        local nr=0
-        while test $nr -lt 10; do
-                log "Race attempt $nr"
-                local blk1=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'`
-                test "x$blk1" = "x" && blk1=0
-                createmany -o $MOUNT2/$tfile/a 4000 &
-                pid1=$!
-                sleep 1
-
-                # Let's make conflict and bl_ast
-                ls -la $MOUNT1/$tfile > /dev/null &
-                pid2=$!
-
-                log "Wait for $pid1 $pid2 for $timeout sec..."
-                sleep $timeout
-                kill -9 $pid1 $pid2 > /dev/null 2>&1
-                wait
-                local blk2=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'`
-                test "x$blk2" = "x" && blk2=0
-                test $blk2 -gt $blk1 && break
-                rm -fr $MOUNT1/$tfile/*
-                cancel_lru_locks mdc
-                let nr=nr+1
-        done
-        do_facet client "lctl set_param fail_loc=0x0"
-        df -h $MOUNT1 $MOUNT2
-        count=0
+	# Let's initiate -EINTR situation by setting fail_loc and take
+	# write lock on same file from same client. This will not cause
+	# bl_ast yet as lock is already in local cache.
+	#define OBD_FAIL_LDLM_INTR_CP_AST        0x317
+	do_facet client "lctl set_param fail_loc=0x80000317"
+	local timeout=$(do_facet $SINGLEMDS lctl get_param  -n timeout)
+	let timeout=timeout*3
+	local nr=0
+	while test $nr -lt 10; do
+		log "Race attempt $nr"
+		local blk1=$(lctl get_param -n ldlm.services.ldlm_cbd.stats |
+			     awk '/ldlm_bl_callback/ { print $2 }')
+		test "x$blk1" = "x" && blk1=0
+		createmany -o $MOUNT2/$tdir/a 4000 &
+		pid1=$!
+		sleep 1
+
+		# Let's make conflict and bl_ast
+		ls -la $MOUNT1/$tdir > /dev/null &
+		pid2=$!
+
+		log "Wait for $pid1 $pid2 for $timeout sec..."
+		sleep $timeout
+		kill -9 $pid1 $pid2 > /dev/null 2>&1
+		wait
+		local blk2=$(lctl get_param -n ldlm.services.ldlm_cbd.stats |
+			     awk '/ldlm_bl_callback/ { print $2 }')
+		test "x$blk2" = "x" && blk2=0
+		test $blk2 -gt $blk1 && break
+		rm -fr $MOUNT1/$tdir
+		cancel_lru_locks mdc
+		let nr=nr+1
+	done
+	do_facet client "lctl set_param fail_loc=0x0"
+	df -h $MOUNT1 $MOUNT2
+	count=0
 	gen=$(lctl get_param mdc.$FSNAME-MDT*-mdc-*.import | grep generation |
 		awk '/generation/{print $2}')
 	for g in $gen; do
 	    if ! test "$g" -eq "${generation[count]}"; then
 		list=$(lctl list_param mdc.$FSNAME-MDT*-mdc-*.import)
-		local c = 0
+		local c=0
 		for imp in $list; do
 			if [ $c = $count ]; then
 				break
@@ -1211,15 +1291,17 @@ test_36() { #bug 16417
 	local SIZE_B
 	local i
 
-	test_mkdir -p $DIR1/$tdir
+	test_mkdir $DIR1/$tdir
 	$LFS setstripe -c -1 $DIR1/$tdir
 	i=0
 	SIZE=50
 	let SIZE_B=SIZE*1024*1024
-	sync; sleep 5; sync # wait for delete thread
+	sync; sleep 2; sync # wait for delete thread
+	wait_mds_ost_sync || error "wait_mds_ost_sync failed"
+	wait_destroy_complete || error "wait_destroy_complete failed"
 
 	while [ $i -le 10 ]; do
-		lctl mark "start test"
+		lctl mark "start test - cycle ($i)"
 		local before=$(lfs_df $MOUNT1 | awk '/^filesystem/{ print $4; exit }')
 		dd if=/dev/zero of=$DIR1/$tdir/$tfile bs=1M count=$SIZE ||
 			error "dd $DIR1/$tdir/$tfile ${SIZE}MB failed"
@@ -1232,6 +1314,7 @@ test_36() { #bug 16417
 		rm -f $DIR1/$tdir/$tfile
 		kill -USR1 $read_pid
 		wait $read_pid
+		sync; sleep 2; sync # Ensure new statfs
 		wait_delete_completed
 		local after=$(lfs_df $MOUNT1 | awk '/^filesystem/{ print $4; exit }')
 		echo "*** cycle($i) *** before($before) after_dd($after_dd)" \
@@ -1245,7 +1328,7 @@ test_36() { #bug 16417
 run_test 36 "handle ESTALE/open-unlink correctly"
 
 test_37() { # bug 18695
-	test_mkdir -p $DIR1/$tdir
+	test_mkdir $DIR1/$tdir
 	multiop_bg_pause $DIR1/$tdir D_c || return 1
 	MULTIPID=$!
 	# create large directory (32kB seems enough from e2fsck, ~= 1000 files)
@@ -1351,13 +1434,47 @@ test_39c() {
 }
 run_test 39c "check truncate mtime update ======================"
 
+test_39d() { # LU-7310
+	touch $DIR1/$tfile
+	touch -m -d @$TEST_39_MTIME $DIR1/$tfile
+
+	local mtime1=$(stat -c %Y $DIR2/$tfile)
+	[ "$mtime1" = $TEST_39_MTIME ] ||
+		error "mtime: $mtime1, should be $TEST_39_MTIME"
+
+	# force sync write
+	# define OBD_FAIL_OSC_NO_GRANT 0x411
+	$LCTL set_param fail_loc=0x411
+
+	local d1=$(date +%s)
+	echo hello >> $DIR1/$tfile
+	local d2=$(date +%s)
+
+	$LCTL set_param fail_loc=0
+
+	cancel_lru_locks $OSC
+
+	local mtime2=$(stat -c %Y $DIR2/$tfile)
+	[ "$mtime2" -ge "$d1" ] && [ "$mtime2" -le "$d2" ] ||
+		error "mtime is not updated on write: $d1 <= $mtime2 <= $d2"
+}
+run_test 39d "sync write should update mtime"
+
+pdo_sched() {
+	# how long 40-47 take with specific delay
+	# sleep 0.1 # 78s
+	sleep 0.2 # 103s
+	# sleep 0.3 # 124s
+	# sleep 0.5 # 164s
+}
+
 # check that pid exists hence second operation wasn't blocked by first one
 # if it is so then there is no conflict, return 0
 # else second operation is conflicting with first one, return 1
 check_pdo_conflict() {
 	local pid=$1
 	local conflict=0
-	sleep 1 # to ensure OP1 is finished on client if OP2 is blocked by OP1
+	pdo_sched # to ensure OP1 is finished on client if OP2 is blocked by OP1
 	if [[ `ps --pid $pid | wc -l` == 1 ]]; then
 		conflict=1
 		echo "Conflict"
@@ -1375,8 +1492,7 @@ test_40a() {
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	touch $DIR2
 	mkdir $DIR1/$tfile &
-	PID1=$!
-	sleep 1
+	PID1=$!; pdo_sched
 	touch $DIR2/$tfile-2
 	check_pdo_conflict $PID1 || error "create is blocked"
 	mkdir $DIR2/$tfile-3
@@ -1393,6 +1509,7 @@ test_40a() {
 
 	#  all operations above shouldn't wait the first one
 	check_pdo_conflict $PID1 || error "parallel operation is blocked"
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	wait $PID1
 	rm -rf $DIR/$tfile*
 	return 0
@@ -1404,8 +1521,7 @@ test_40b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	touch $DIR1/$tfile &
-	PID1=$!
-	sleep 1
+	PID1=$!; pdo_sched
 	# open|create
 	touch $DIR2/$tfile-2
 	check_pdo_conflict $PID1 || error "create is blocked"
@@ -1423,6 +1539,7 @@ test_40b() {
 	# all operations above shouldn't wait the first one
 
         check_pdo_conflict $PID1 || error "parallel operation is blocked"
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	wait $PID1
 	rm -rf $DIR/$tfile*
 	return 0
@@ -1435,8 +1552,7 @@ test_40c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	link $DIR1/$tfile $DIR1/$tfile-0 &
-	PID1=$!
-	sleep 1
+	PID1=$!; pdo_sched
 	# open|create
 	touch $DIR2/$tfile-2
 	check_pdo_conflict $PID1 || error "create is blocked"
@@ -1454,6 +1570,7 @@ test_40c() {
 
         # all operations above shouldn't wait the first one
 	check_pdo_conflict $PID1 || error "parallel operation is blocked"
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	wait $PID1
 	rm -rf $DIR/$tfile*
 	return 0
@@ -1466,8 +1583,7 @@ test_40d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	rm $DIR1/$tfile &
-	PID1=$!
-	sleep 1
+	PID1=$!; pdo_sched
 	# open|create
 	touch $DIR2/$tfile-2
 	check_pdo_conflict $PID1 || error "create is blocked"
@@ -1485,6 +1601,7 @@ test_40d() {
 
 	# all operations above shouldn't wait the first one
 	check_pdo_conflict $PID1 || error "parallel operation is blocked"
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	wait $PID1
 	return 0
 }
@@ -1496,8 +1613,7 @@ test_40e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mv $DIR1/$tfile $DIR1/$tfile-0 &
-	PID1=$!
-	sleep 1
+	PID1=$!; pdo_sched
 	# open|create
 	touch $DIR2/$tfile-2
 	check_pdo_conflict $PID1 || error "create is blocked"
@@ -1513,6 +1629,7 @@ test_40e() {
 
        # all operations above shouldn't wait the first one
 	check_pdo_conflict $PID1 || error "parallel operation is blocked"
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	wait $PID1
 	rm -rf $DIR/$tfile*
 	return 0
@@ -1524,10 +1641,12 @@ test_41a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-	PID1=$!
-	sleep 1
-	mkdir $DIR2/$tfile && error "mkdir must fail"
+	PID1=$! ; pdo_sched
+	mkdir $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; echo "mkdir isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "mkdir must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1537,10 +1656,12 @@ test_41b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-	PID1=$!
-	sleep 1
-	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c && error "create must fail"
+	PID1=$! ; pdo_sched
+	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "create must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1551,10 +1672,12 @@ test_41c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-	PID1=$!
-	sleep 1
-	link $DIR2/$tfile-2 $DIR2/$tfile && error "link must fail"
+	PID1=$! ; pdo_sched
+	link $DIR2/$tfile-2 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "link must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1564,10 +1687,12 @@ test_41d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-	PID1=$!
-	sleep 1
-	rm $DIR2/$tfile || error "unlink must succeed"
+	PID1=$! ; pdo_sched
+	rm $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "unlink must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1578,10 +1703,12 @@ test_41e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile-2 $DIR2/$tfile || error "rename must succeed"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile-2 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1591,10 +1718,12 @@ test_41f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile $DIR2/$tfile-2 || error "rename must succeed"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile $DIR2/$tfile-2 &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1604,10 +1733,12 @@ test_41g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-	PID1=$!
-	sleep 1
-	stat $DIR2/$tfile > /dev/null || error "stat must succeed"
+	PID1=$! ; pdo_sched
+	stat $DIR2/$tfile > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "stat must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1617,10 +1748,12 @@ test_41h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-	PID1=$!
-	sleep 1
-	ls -lia $DIR2/ > /dev/null
+	PID1=$! ; pdo_sched
+	ls -lia $DIR2/ > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+	wait $PID2
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1631,10 +1764,12 @@ test_42a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mkdir $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mkdir $DIR2/$tfile && error "mkdir must fail"
+	PID1=$! ; pdo_sched
+	mkdir $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "mkdir must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1644,10 +1779,12 @@ test_42b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mkdir $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c && error "create must fail"
+	PID1=$! ; pdo_sched
+	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "create must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1658,10 +1795,12 @@ test_42c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mkdir $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	link $DIR2/$tfile-2 $DIR2/$tfile && error "link must fail"
+	PID1=$! ; pdo_sched
+	link $DIR2/$tfile-2 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "link must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1671,10 +1810,12 @@ test_42d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mkdir $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	rmdir $DIR2/$tfile || error "unlink must succeed"
+	PID1=$! ; pdo_sched
+	rmdir $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "unlink must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1685,10 +1826,12 @@ test_42e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mkdir $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mv -T $DIR2/$tfile-2 $DIR2/$tfile && error "rename must fail"
+	PID1=$! ; pdo_sched
+	mv -T $DIR2/$tfile-2 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "rename must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1698,10 +1841,12 @@ test_42f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mkdir $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile $DIR2/$tfile-2 || error "rename must succeed"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile $DIR2/$tfile-2 &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1711,10 +1856,12 @@ test_42g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mkdir $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	stat $DIR2/$tfile > /dev/null || error "stat must succeed"
+	PID1=$! ; pdo_sched
+	stat $DIR2/$tfile > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "stat must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1724,10 +1871,12 @@ test_42h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mkdir $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	ls -lia $DIR2/ > /dev/null
+	PID1=$! ; pdo_sched
+	ls -lia $DIR2/ > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+	wait $PID2
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1739,10 +1888,12 @@ test_43a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	rm $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mkdir $DIR2/$tfile || error "mkdir must succeed"
+	PID1=$! ; pdo_sched
+	mkdir $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "mkdir must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1753,10 +1904,12 @@ test_43b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	rm $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c || error "create must succeed"
+	PID1=$! ; pdo_sched
+	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "create must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1768,10 +1921,12 @@ test_43c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	rm $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	link $DIR2/$tfile-2 $DIR2/$tfile || error "link must succeed"
+	PID1=$! ; pdo_sched
+	link $DIR2/$tfile-2 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "link must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1782,10 +1937,12 @@ test_43d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	rm $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	rm $DIR2/$tfile && error "unlink must fail"
+	PID1=$! ; pdo_sched
+	rm $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "unlink must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1797,10 +1954,12 @@ test_43e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	rm $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mv -u $DIR2/$tfile-2 $DIR2/$tfile || error "rename must succeed"
+	PID1=$! ; pdo_sched
+	mv -u $DIR2/$tfile-2 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1811,10 +1970,12 @@ test_43f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	rm $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile $DIR2/$tfile-2 && error "rename must fail"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile $DIR2/$tfile-2 &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "rename must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1825,10 +1986,12 @@ test_43g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	rm $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	stat $DIR2/$tfile > /dev/null && error "stat must fail"
+	PID1=$! ; pdo_sched
+	stat $DIR2/$tfile > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "stat must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1839,10 +2002,12 @@ test_43h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	rm $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	ls -lia $DIR2/ > /dev/null
+	PID1=$! ; pdo_sched
+	ls -lia $DIR2/ > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+	wait $PID2
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1854,11 +2019,13 @@ test_43i() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	rm $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	$LFS mkdir -i 1 $DIR2/$tfile || error "remote mkdir must succeed"
+	PID1=$! ; pdo_sched
+	$LFS mkdir -i 1 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 &&
 		{ wait $PID1; error "remote mkdir isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "remote mkdir must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1870,10 +2037,13 @@ test_44a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2   0x146
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
 	mv $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mkdir $DIR2/$tfile && error "mkdir must fail"
-	check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+	PID1=$! ; pdo_sched
+	mkdir $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
+	check_pdo_conflict $PID1 && { wait $PID1; date;error "mkdir isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "mkdir must fail"
+	date
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1884,10 +2054,12 @@ test_44b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
 	mv $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c && error "create must fail"
+	PID1=$! ; pdo_sched
+	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "create must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1899,10 +2071,12 @@ test_44c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
 	mv $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	link $DIR2/$tfile-3 $DIR2/$tfile && error "link must fail"
+	PID1=$! ; pdo_sched
+	link $DIR2/$tfile-3 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "link must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1913,10 +2087,12 @@ test_44d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
 	mv $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	rm $DIR2/$tfile || error "unlink must succeed"
+	PID1=$! ; pdo_sched
+	rm $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "unlink must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1929,10 +2105,12 @@ test_44e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
 	mv $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile-3 $DIR2/$tfile || error "rename must succeed"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile-3 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1944,10 +2122,12 @@ test_44f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
 	mv $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile $DIR2/$tfile-3 || error "rename must succeed"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile $DIR2/$tfile-3 &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1958,10 +2138,12 @@ test_44g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
 	mv $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	stat $DIR2/$tfile > /dev/null || error "stat must succeed"
+	PID1=$! ; pdo_sched
+	stat $DIR2/$tfile > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "stat must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1972,10 +2154,12 @@ test_44h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
 	mv $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	ls -lia $DIR2/ > /dev/null
+	PID1=$! ; pdo_sched
+	ls -lia $DIR2/ > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+	wait $PID2
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -1988,11 +2172,13 @@ test_44i() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2   0x146
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
 	mv $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	$LFS mkdir -i 1 $DIR2/$tfile && error "remote mkdir must fail"
+	PID1=$! ; pdo_sched
+	$LFS mkdir -i 1 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1;
 				error "remote mkdir isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "remote mkdir must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2004,10 +2190,12 @@ test_45a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mv $DIR1/$tfile $DIR1/$tfile-2 &
-	PID1=$!
-	sleep 1
-	mkdir $DIR2/$tfile || error "mkdir must succeed"
+	PID1=$! ; pdo_sched
+	mkdir $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "mkdir must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2018,10 +2206,12 @@ test_45b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mv $DIR1/$tfile $DIR1/$tfile-2 &
-	PID1=$!
-	sleep 1
-	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c || error "create must succeed"
+	PID1=$! ; pdo_sched
+	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "create must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2033,10 +2223,12 @@ test_45c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mv $DIR1/$tfile $DIR1/$tfile-2 &
-	PID1=$!
-	sleep 1
-	link $DIR2/$tfile-3 $DIR2/$tfile || error "link must succeed"
+	PID1=$! ; pdo_sched
+	link $DIR2/$tfile-3 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "link must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2047,10 +2239,12 @@ test_45d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mv $DIR1/$tfile $DIR1/$tfile-2 &
-	PID1=$!
-	sleep 1
-	rm $DIR2/$tfile && error "unlink must fail"
+	PID1=$! ; pdo_sched
+	rm $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "unlink must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2062,10 +2256,12 @@ test_45e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mv $DIR1/$tfile $DIR1/$tfile-2 &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile-3 $DIR2/$tfile || error "rename must succeed"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile-3 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2076,10 +2272,12 @@ test_45f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mv $DIR1/$tfile $DIR1/$tfile-2 &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile $DIR2/$tfile-3 && error "rename must fail"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile $DIR2/$tfile-3 &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "rename must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2090,10 +2288,12 @@ test_45g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mv $DIR1/$tfile $DIR1/$tfile-2 &
-	PID1=$!
-	sleep 1
-	stat $DIR2/$tfile > /dev/null && error "stat must fail"
+	PID1=$! ; pdo_sched
+	stat $DIR2/$tfile > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "stat must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2104,10 +2304,11 @@ test_45h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mv $DIR1/$tfile $DIR1/$tfile-2 &
-	PID1=$!
-	sleep 1
-	ls -lia $DIR2/ > /dev/null
+	PID1=$! ; pdo_sched
+	ls -lia $DIR2/ > /dev/null &
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+	wait $PID2
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2119,11 +2320,13 @@ test_45i() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	mv $DIR1/$tfile $DIR1/$tfile-2 &
-	PID1=$!
-	sleep 1
-	$LFS mkdir -i 1 $DIR2/$tfile || error "create remote dir must succeed"
+	PID1=$! ; pdo_sched
+	$LFS mkdir -i 1 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1;
 				error "create remote dir isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "create remote dir must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2135,10 +2338,12 @@ test_46a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	link $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mkdir $DIR2/$tfile && error "mkdir must fail"
+	PID1=$! ; pdo_sched
+	mkdir $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "mkdir must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2149,10 +2354,12 @@ test_46b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	link $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c && error "create must fail"
+	PID1=$! ; pdo_sched
+	$MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "create must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2163,10 +2370,12 @@ test_46c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	link $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	link $DIR2/$tfile $DIR2/$tfile && error "link must fail"
+	PID1=$! ; pdo_sched
+	link $DIR2/$tfile $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "link must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2177,10 +2386,12 @@ test_46d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	link $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	rm $DIR2/$tfile || error "unlink must succeed"
+	PID1=$! ; pdo_sched
+	rm $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "unlink must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2192,10 +2403,12 @@ test_46e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	link $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile-3 $DIR2/$tfile || error "rename must succeed"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile-3 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2207,10 +2420,12 @@ test_46f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	link $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile $DIR2/$tfile-3 || error "rename must succeed"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile $DIR2/$tfile-3 &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2221,10 +2436,12 @@ test_46g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	link $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	stat $DIR2/$tfile > /dev/null || error "stat must succeed"
+	PID1=$! ; pdo_sched
+	stat $DIR2/$tfile > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "stat must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2235,11 +2452,12 @@ test_46h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	link $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	ls -lia $DIR2/ > /dev/null
-	check_pdo_conflict $PID1 && { wait $PID1;
-			error "readdir isn't blocked"; }
+	PID1=$! ; pdo_sched
+	ls -lia $DIR2/ > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
+	check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+	wait $PID2
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2251,11 +2469,13 @@ test_46i() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	link $DIR1/$tfile-2 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	$LFS mkdir -i 1 $DIR2/$tfile && error "remote mkdir must fail"
+	PID1=$! ; pdo_sched
+	$LFS mkdir -i 1 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1;
 				error "remote mkdir isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "remote mkdir must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2267,10 +2487,12 @@ test_47a() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$LFS mkdir -i 1 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mkdir $DIR2/$tfile && error "mkdir must fail"
+	PID1=$! ; pdo_sched
+	mkdir $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "mkdir must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2281,11 +2503,13 @@ test_47b() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$LFS mkdir -i 1 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	multiop $DIR2/$tfile oO_CREAT:O_EXCL:c && error "create must fail"
+	PID1=$! ; pdo_sched
+	multiop $DIR2/$tfile oO_CREAT:O_EXCL:c &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1;
 					error "create isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "create must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2297,10 +2521,12 @@ test_47c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$LFS mkdir -i 1 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	link $DIR2/$tfile-2 $DIR2/$tfile && error "link must fail"
+	PID1=$! ; pdo_sched
+	link $DIR2/$tfile-2 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "link must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2311,11 +2537,13 @@ test_47d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$LFS mkdir -i 1 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	rmdir $DIR2/$tfile || error "unlink must succeed"
+	PID1=$! ; pdo_sched
+	rmdir $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1;
 					error "unlink isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rmdir must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2327,11 +2555,13 @@ test_47e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$LFS mkdir -i 1 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mv -T $DIR2/$tfile-2 $DIR2/$tfile && error "rename must fail"
+	PID1=$! ; pdo_sched
+	mv -T $DIR2/$tfile-2 $DIR2/$tfile &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1;
 					error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -ne 0 ] || error "rename must fail"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2342,11 +2572,13 @@ test_47f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$LFS mkdir -i 1 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	mv $DIR2/$tfile $DIR2/$tfile-2 || error "rename must succeed"
+	PID1=$! ; pdo_sched
+	mv $DIR2/$tfile $DIR2/$tfile-2 &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1;
 					error "rename isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2354,14 +2586,18 @@ run_test 47f "pdirops: remote mkdir and rename (src)"
 
 test_47g() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	sync
+	sync_all_data
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
 	do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
 	$LFS mkdir -i 1 $DIR1/$tfile &
-	PID1=$!
-	sleep 1
-	stat $DIR2/$tfile > /dev/null || error "stat must succeed"
+	PID1=$! ; pdo_sched
+	stat $DIR2/$tfile > /dev/null &
+	PID2=$! ; pdo_sched
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
 	check_pdo_conflict $PID1 && { wait $PID1;
 					error "getattr isn't blocked"; }
+	wait $PID2 ; [ $? -eq 0 ] || error "stat must succeed"
 	rm -rf $DIR/$tfile*
 	return 0
 }
@@ -2384,13 +2620,13 @@ test_51a() {
 	local filesize
 	local origfile=/etc/hosts
 
-	filesize=`stat -c %s $origfile`
+	filesize=$(stat -c %s $origfile)
 
 	# create an empty file
-	$MCREATE $DIR1/$tfile
+	$MCREATE $DIR1/$tfile || error "can't create $DIR1/$tfile"
 	# cache layout lock on both mount point
-	stat $DIR1/$tfile > /dev/null
-	stat $DIR2/$tfile > /dev/null
+	stat $DIR1/$tfile > /dev/null || error "stat $DIR1/$tfile failed"
+	stat $DIR2/$tfile > /dev/null || error "stat $DIR2/$tfile failed"
 
 	# open and sleep 2 seconds then read
 	$MULTIOP $DIR2/$tfile o_2r${filesize}c &
@@ -2398,12 +2634,16 @@ test_51a() {
 	sleep 1
 
 	# create the layout of testing file
-	dd if=$origfile of=$DIR1/$tfile conv=notrunc > /dev/null
+	dd if=$origfile of=$DIR1/$tfile conv=notrunc > /dev/null ||
+		error "dd $DIR1/$tfile failed"
 
 	# MULTIOP proc should be able to read enough bytes and exit
-	sleep 2
-	kill -0 $pid && error "multiop is still there"
-	cmp $origfile $DIR2/$tfile || error "$MCREATE and $DIR2/$tfile differs"
+	for ((i = 0; i < 6; i++)); do
+		sleep 1
+		kill -0 $pid || break
+	done
+	kill -0 $pid 2> /dev/null && error "multiop is still there"
+	cmp $origfile $DIR2/$tfile || error "$origfile and $DIR2/$tfile differs"
 
 	rm -f $DIR1/$tfile
 }
@@ -2416,7 +2656,7 @@ test_51b() {
 	local tmpfile=`mktemp`
 
 	# create an empty file
-	$MCREATE $DIR1/$tfile
+	$MCREATE $DIR1/$tfile || error "mcreate $DIR1/$tfile failed"
 
 	# delay glimpse so that layout has changed when glimpse finish
 #define OBD_FAIL_GLIMPSE_DELAY 0x1404
@@ -2426,10 +2666,11 @@ test_51b() {
 	sleep 1
 
 	# create layout of testing file
-	dd if=/dev/zero of=$DIR1/$tfile bs=1k count=1 conv=notrunc > /dev/null
+	dd if=/dev/zero of=$DIR1/$tfile bs=1k count=1 conv=notrunc >/dev/null ||
+		error "dd $DIR1/$tfile failed"
 
 	wait $pid
-	local fsize=`cat $tmpfile`
+	local fsize=$(cat $tmpfile)
 
 	[ x$fsize = x1024 ] || error "file size is $fsize, should be 1024"
 
@@ -2438,14 +2679,15 @@ test_51b() {
 run_test 51b "layout lock: glimpse should be able to restart if layout changed"
 
 test_51c() {
-	[ $OSTCOUNT -ge 2 ] || { skip "need at least 2 osts"; return; }
+	[ $OSTCOUNT -ge 2 ] || { skip "needs >= 2 osts"; return; }
 
 	# set default layout to have 1 stripe
-	mkdir -p $DIR1/$tdir
+	mkdir $DIR1/$tdir
 	$LFS setstripe -c 1 $DIR1/$tdir
 
 	# create a file with empty layout
-	$MCREATE $DIR1/$tdir/$tfile
+	$MCREATE $DIR1/$tdir/$tfile ||
+		error "$MCREATE $DIR1/$tdir/$tfile failed"
 
 #define OBD_FAIL_MDS_LL_BLOCK 0x172
 	do_facet $SINGLEMDS $LCTL set_param fail_loc=0x172
@@ -2458,8 +2700,14 @@ test_51c() {
 
 	# write something to the file, it should be blocked on fetching layout
 	dd if=/dev/zero of=$DIR2/$tdir/$tfile bs=1k count=1 conv=notrunc
-	local cnt=$($LFS getstripe -c $DIR2/$tdir/$tfile)
-	[ $cnt -eq $OSTCOUNT ] || error "have $cnt stripes, expected $OSTCOUNT"
+	local stripe_count=$($LFS getstripe -c $DIR2/$tdir/$tfile)
+	wait $pid
+
+	# lod_qos.c::min_stripe_count() allows setstripe with a default stripe
+	# count to succeed with only 3/4 of the number of stripes (rounded up),
+	# so creating striped files does not fail if an OST is offline or full
+	[ $stripe_count -ge $((OSTCOUNT - $OSTCOUNT / 4)) ] ||
+		error "bad layout: getstripe -c $stripe_count < $OSTCOUNT * 3/4"
 
 	rm -fr $DIR1/$tdir
 }
@@ -2478,14 +2726,14 @@ test_51d() {
 	local br=$(grep -A 10 $tfile /proc/$PID/smaps | awk '/^Rss/{print $2}')
 	echo "Before revoking layout lock: $br KB mapped"
 
-	# delete the file will revoke layout lock
-	rm -f $DIR2/$tfile
+	# cancel layout lock manually
+	cancel_lru_locks mdc
 
 	# rss after revoking
 	local ar=$(grep -A 10 $tfile /proc/$PID/smaps | awk '/^Rss/{print $2}')
 
 	kill -USR1 $PID
-	wait $PID || error
+	wait $PID || error "wait PID $PID failed"
 
 	[ $ar -eq 0 ] || error "rss before: $br, after $ar, some pages remained"
 }
@@ -2496,7 +2744,7 @@ test_54_part1()
 	echo "==> rename vs getattr vs setxattr should not deadlock"
 	mkdir -p $DIR/d1/d2/d3 || error "(1) mkdir failed"
 
-	do_facet mds $LCTL set_param fail_loc=$1
+	do_facet mds1 $LCTL set_param fail_loc=$1
 
 	mv -T $DIR/d1/d2/d3 $DIR/d1/d3 &
 	PID1=$!
@@ -2518,7 +2766,7 @@ test_54_part2() {
 	echo "==> rename vs getattr vs open vs getattr should not deadlock"
 	mkdir -p $DIR/d1/d2/d3 || error "(1) mkdir failed"
 
-	do_facet mds $LCTL set_param fail_loc=$1
+	do_facet mds1 $LCTL set_param fail_loc=$1
 
 	mv -T $DIR/d1/d2/d3 $DIR/d1/d3 &
 	PID1=$!
@@ -2563,7 +2811,7 @@ test_55a() {
 	mkdir -p $DIR/d1/d2 $DIR/d3 || error "(1) mkdir failed"
 
 #define OBD_FAIL_MDS_RENAME4              0x156
-	do_facet mds $LCTL set_param fail_loc=0x80000156
+	do_facet mds1 $LCTL set_param fail_loc=0x80000156
 
 	mv -T $DIR/d1/d2 $DIR/d3/d2 &
 	PID1=$!
@@ -2581,7 +2829,7 @@ test_55b()
 	mkdir -p $DIR/d1/d2 $DIR/d3 || error "(1) mkdir failed"
 
 #define OBD_FAIL_MDS_RENAME4             0x156
-	do_facet mds $LCTL set_param fail_loc=0x80000156
+	do_facet mds1 $LCTL set_param fail_loc=0x80000156
 
 	mv -T $DIR/d1/d2 $DIR/d3/d2 &
 	PID1=$!
@@ -2599,7 +2847,7 @@ test_55c()
 	mkdir -p $DIR/d1/d2 $DIR/d3 || error "(1) mkdir failed"
 
 #define OBD_FAIL_MDS_RENAME4              0x156
-	do_facet mds $LCTL set_param fail_loc=0x156
+	do_facet mds1 $LCTL set_param fail_loc=0x156
 
 	mv -T $DIR/d1/d2 $DIR/d3/d2 &
 	PID1=$!
@@ -2627,7 +2875,7 @@ test_55d()
 	touch $DIR/f1
 
 #define OBD_FAIL_MDS_RENAME3              0x155
-	do_facet mds $LCTL set_param fail_loc=0x155
+	do_facet mds1 $LCTL set_param fail_loc=0x155
 	mv $DIR/f1 $DIR/$tdir &
 	PID1=$!
 	sleep 2
@@ -2649,7 +2897,7 @@ test_60() {
 		skip "MDS version $MDSVER must be >= 2.3.0" && return 0
 
 	# Create a file
-	test_mkdir -p $DIR1/$tdir
+	test_mkdir $DIR1/$tdir
 	file1=$DIR1/$tdir/file
 	file2=$DIR2/$tdir/file
 
@@ -2731,7 +2979,7 @@ test_70b() { # LU-2781
 }
 run_test 70b "remove files after calling rm_entry"
 
-test_71() {
+test_71a() {
 	local server_version=$(lustre_version_code $SINGLEMDS)
 
 	[[ $server_version -lt $(version_code 2.1.6) ]] &&
@@ -2740,13 +2988,14 @@ test_71() {
 	# Patch not applied to 2.2 and 2.3 branches
 	[[ $server_version -ge $(version_code 2.2.0) ]] &&
 	[[ $server_version -lt $(version_code 2.4.0) ]] &&
-		skip "Need MDS version at least 2.4.0" && return
+		skip "Need MDS version earlier than 2.2.0 or at least 2.4.0" &&
+			return
 
 	checkfiemap --test ||
 		{ skip "checkfiemap not runnable: $?" && return; }
 	# write data this way: hole - data - hole - data
 	dd if=/dev/urandom of=$DIR1/$tfile bs=40K seek=1 count=1
-	[ "$(facet_fstype ost$(($($GETSTRIPE -i $DIR1/$tfile) + 1)))" = \
+	[ "$(facet_fstype ost$(($($LFS getstripe -i $DIR1/$tfile) + 1)))" = \
 		"zfs" ] &&
 		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return 0
 	dd if=/dev/urandom of=$DIR1/$tfile bs=40K seek=3 count=1
@@ -2772,7 +3021,34 @@ test_71() {
 	echo $can2
 	[ $can3 -eq $can4 ] || error $((can2-can1)) "cancel RPC occured."
 }
-run_test 71 "correct file map just after write operation is finished"
+run_test 71a "correct file map just after write operation is finished"
+
+test_71b() {
+	local server_version=$(lustre_version_code $SINGLEMDS)
+
+	[[ $server_version -lt $(version_code 2.1.6) ]] &&
+		skip "Need MDS version at least 2.1.6" && return
+
+	# Patch not applied to 2.2 and 2.3 branches
+	[[ $server_version -ge $(version_code 2.2.0) ]] &&
+	[[ $server_version -lt $(version_code 2.4.0) ]] &&
+		skip "Need MDS version earlier than 2.2.0 or at least 2.4.0" &&
+			return
+	[[ $OSTCOUNT -ge 2 ]] || { skip "needs >= 2 OSTs"; return; }
+
+	checkfiemap --test ||
+		{ skip "error $?: checkfiemap failed" && return; }
+
+	mkdir -p $DIR1/$tdir
+
+	$LFS setstripe -c -1 $DIR1/$tdir || error "setstripe failed"
+	dd if=/dev/urandom of=$DIR1/$tdir/$tfile bs=40K count=1
+	[ "$(facet_fstype ost$(($($LFS getstripe -i $DIR1/$tdir/$tfile) + 1)))" = \
+		"zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return 0
+	checkfiemap $DIR1/$tdir/$tfile 40960 || error "checkfiemap failed"
+}
+run_test 71b "check fiemap support for stripecount > 1"
 
 test_72() {
 	local p="$TMP/sanityN-$TESTNAME.parameters"
@@ -2817,14 +3093,16 @@ test_73() {
 		error "setfattr1 failed"
 	getfattr -n user.attr1 $DIR2/$tfile || error "getfattr1 failed"
 	getfattr -n user.attr1 $DIR1/$tfile || error "getfattr2 failed"
-	clear_llite_stats
+	clear_stats llite.*.stats
 	# PR lock should be cached by now on both clients
 	getfattr -n user.attr1 $DIR1/$tfile || error "getfattr3 failed"
 	# 2 hits for getfattr(0)+getfattr(size)
-	[ $(calc_llite_stats getxattr_hits) -eq 2 ] || error "not cached in $DIR1"
+	[ $(calc_stats llite.*.stats getxattr_hits) -eq 2 ] ||
+		error "not cached in $DIR1"
 	getfattr -n user.attr1 $DIR2/$tfile || error "getfattr4 failed"
 	# 4 hits for more getfattr(0)+getfattr(size)
-	[ $(calc_llite_stats getxattr_hits) -eq 4 ] || error "not cached in $DIR2"
+	[ $(calc_stats llite.*.stats getxattr_hits) -eq 4 ] ||
+		error "not cached in $DIR2"
 	rm -f $DIR2/$tfile
 
 	restore_lustre_params < $p
@@ -2869,7 +3147,7 @@ test_76() { #LU-946
 		skip "Need MDS version at least 2.5.53" && return
 
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
-	local fcount=2048
+	local fcount=$((MDSCOUNT * 256))
 	declare -a fd_list
 	declare -a fid_list
 
@@ -2880,25 +3158,33 @@ test_76() { #LU-946
 	fi
 
 	rm -rf $DIR/$tdir
-	test_mkdir -p $DIR/$tdir
+	test_mkdir $DIR/$tdir
 
 	# drop all open locks and close any cached "open" files on the client
 	cancel_lru_locks mdc
 
-	echo -n "open files "
-	ulimit -n 8096
+	local open_fids_cmd="$LCTL get_param -n mdt.*.exports.'$nid'.open_files"
+	local fid_list=($(do_nodes $(comma_list $(mdts_nodes)) $open_fids_cmd))
+	local already=${#fid_list[@]}
+	for (( i = 0; i < $already; i++ )) ; do
+		log "already open[$i]: $($LFS fid2path $DIR2 ${fid_list[i]})"
+	done
+
+	echo -n "opening files: "
+	ulimit -n $((fcount + 50))
 	for ((i = 0; i < $fcount; i++)); do
 		touch $DIR/$tdir/f_$i
-		local fd=$(free_fd)
-		local cmd="exec $fd<$DIR/$tdir/f_$i"
-		eval $cmd
+		local fd=$(free_fd ${fd_list[i]})
+		local open_cmd="exec $fd<$DIR/$tdir/f_$i"
+		eval $open_cmd
+
 		fd_list[i]=$fd
-		echo -n "."
+
+		(( $i % 32 == 0 )) && echo -n "."
 	done
 	echo
 
-	local get_open_fids="$LCTL get_param -n mdt.*.exports.'$nid'.open_files"
-	local fid_list=($(do_nodes $(comma_list $(mdts_nodes)) $get_open_fids))
+	fid_list=($(do_nodes $(comma_list $(mdts_nodes)) $open_fids_cmd))
 
 	# Possible errors in openfiles FID list.
 	# 1. Missing FIDs. Check 1
@@ -2908,19 +3194,28 @@ test_76() { #LU-946
 	# 5. Valid FID, points to some other file. Check 3
 
 	# Check 1
-	[ ${#fid_list[@]} -ne $fcount ] &&
-		error "${#fid_list[@]} != $fcount open files"
-
-	for (( i = 0; i < $fcount; i++ )) ; do
-		cmd="exec ${fd_list[i]}</dev/null"
-		eval $cmd
-		filename=$($LFS fid2path $DIR2 ${fid_list[i]})
+	[ ${#fid_list[@]} -ne $((fcount + already)) ] &&
+		error "${#fid_list[@]} != $fcount (+$already old) open files"
+
+	echo -n "closing files: "
+	for (( fd = 0, fid = 0; fd < $fcount; fd++, fid++ )) ; do
+		local close_cmd="exec ${fd_list[fd]}<&-"
+		eval $close_cmd
+		filename=$($LFS fid2path $DIR2 ${fid_list[fid]})
+
+		while [[ ! "$filename" =~ "$DIR2/$tdir/f_" ]]; do
+			echo "skip old open file $filename"
+			((fid++))
+			filename=$($LFS fid2path $DIR2 ${fid_list[fid]})
+		done
 
 		# Check 2
 		rm --interactive=no $filename
 		[ $? -ne 0 ] &&
-			error "Nonexisting fid ${fid_list[i]} listed."
+			error "Nonexisting fid ${fid_list[fid]} listed."
+		(( $fd % 32 == 0 )) && echo -n "."
 	done
+	echo
 
 	# Check 3
 	ls_op=$(ls $DIR2/$tdir | wc -l)
@@ -2929,7 +3224,7 @@ test_76() { #LU-946
 
 	rm -rf $DIR/$tdir
 }
-run_test 76 "Verify open file for 2048 files"
+run_test 76 "Verify MDT open_files listing"
 
 nrs_write_read() {
 	local n=16
@@ -2940,36 +3235,58 @@ nrs_write_read() {
 	$LFS setstripe -c $OSTCOUNT $dir || error "setstripe to $dir failed"
 	chmod 777 $dir
 
-	do_nodes $CLIENTS $myRUNAS dd if=/dev/zero of="$dir/nrs_r_$HOSTNAME"\
-		bs=1M count=$n > /dev/null 2>&1 || error "dd on client failed"
-
-	for ((i = 0; i < $n; i++)); do
-		do_nodes $CLIENTS $myRUNAS dd if=/dev/zero\
-			of="$dir/nrs_w_$HOSTNAME" bs=1M seek=$i count=1\
-			 > /dev/null 2>&1 || error "dd on client failed" &
-		local pids_w[$i]=$!
-	done
+	do_nodes $CLIENTS $myRUNAS \
+		dd if=/dev/zero of="$dir/nrs_r_\$HOSTNAME" bs=1M count=$n ||
+		error "dd at 0 on client failed (1)"
+
+	do_nodes $CLIENTS $myRUNAS \
+		"declare -a pids_w;
+		for ((i = 0; i < $n; i++)); do
+			dd if=/dev/zero of=$dir/nrs_w_\$HOSTNAME bs=1M \
+seek=\\\$i count=1 conv=notrunc &
+			pids_w[\\\$i]=\\\$!;
+		done;
+		rc_w=0;
+		for ((i = 0; i < $n; i++)); do
+			wait \\\${pids_w[\\\$i]};
+			newrc=\\\$?;
+			[ \\\$newrc -gt \\\$rc_w ] && rc_w=\\\$newrc;
+		done;
+		exit \\\$rc_w" &
+	local pid_w=$!
 	do_nodes $CLIENTS sync;
 	cancel_lru_locks osc
 
-	for ((i = 0; i < $n; i++)); do
-		do_nodes $CLIENTS $myRUNAS dd if="$dir/nrs_w_$HOSTNAME"\
-			of=/dev/zero bs=1M seek=$i count=1 > /dev/null 2>&1 ||
-			error "dd on client failed"
-		local pids_r[$i]=$!
-	done
+	do_nodes $CLIENTS $myRUNAS \
+		"declare -a pids_r;
+		for ((i = 0; i < $n; i++)); do
+			dd if=$dir/nrs_r_\$HOSTNAME bs=1M of=/dev/null \
+seek=\\\$i count=1 &
+			pids_r[\\\$i]=\\\$!;
+		done;
+		rc_r=0;
+		for ((i = 0; i < $n; i++)); do
+			wait \\\${pids_r[\\\$i]};
+			newrc=\\\$?;
+			[ \\\$newrc -gt \\\$rc_r ] && rc_r=\\\$newrc;
+		done;
+		exit \\\$rc_r" &
+	local pid_r=$!
 	cancel_lru_locks osc
 
-	for ((i = 0; i < $n; i++)); do
-		wait ${pids_w[$i]}
-		wait ${pids_r[$i]}
-	done
-	rm -rf $dir || error "rm -rf $dir failed"
+	wait $pid_w || error "dd (write) failed (2)"
+	wait $pid_r || error "dd (read) failed (3)"
+	rm -rvf $dir || error "rm -rf $dir failed"
 }
 
 test_77a() { #LU-3266
+	local rc
+
 	oss=$(comma_list $(osts_nodes))
-	do_nodes $oss lctl set_param ost.OSS.*.nrs_policies="fifo"
+	do_nodes $oss lctl set_param ost.OSS.*.nrs_policies="fifo" ||
+		rc=$?
+	[[ $rc -eq 3 ]] && skip "no NRS exists" && return
+	[[ $rc -ne 0 ]] && error "failed to set fifo policy"
 	nrs_write_read
 
 	return 0
@@ -2977,21 +3294,29 @@ test_77a() { #LU-3266
 run_test 77a "check FIFO NRS policy"
 
 test_77b() { #LU-3266
+	local rc
+
 	oss=$(comma_list $(osts_nodes))
 
 	do_nodes $oss lctl set_param ost.OSS.*.nrs_policies="crrn" \
-			   ost.OSS.*.nrs_crrn_quantum=1
+		ost.OSS.*.nrs_crrn_quantum=1 || rc=$?
+	[[ $rc -eq 3 ]] && skip "no NRS exists" && return
+	[[ $rc -ne 0 ]] && error "failed to set crrn_quantum to 1"
 
 	echo "policy: crr-n, crrn_quantum 1"
 	nrs_write_read
 
-	do_nodes $oss lctl set_param ost.OSS.*.nrs_crrn_quantum=64
+	do_nodes $oss lctl set_param \
+		ost.OSS.*.nrs_crrn_quantum=64 || rc=$?
+	[[ $rc -ne 0 ]] && error "failed to set crrn_quantum to 64"
 
 	echo "policy: crr-n, crrn_quantum 64"
 	nrs_write_read
 
 	# cleanup
-	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies="fifo"
+	do_nodes $oss lctl set_param \
+		ost.OSS.ost_io.nrs_policies="fifo" || rc=$?
+	[[ $rc -ne 0 ]] && error "failed to set fifo policy"
 	return 0
 }
 run_test 77b "check CRR-N NRS policy"
@@ -3002,37 +3327,49 @@ orr_trr() {
 	oss=$(comma_list $(osts_nodes))
 
 	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies=$policy \
-				     ost.OSS.*.nrs_"$policy"_quantum=1 \
-				     ost.OSS.*.nrs_"$policy"_offset_type="physical" \
-				     ost.OSS.*.nrs_"$policy"_supported="reads"
+		ost.OSS.*.nrs_"$policy"_quantum=1 \
+		ost.OSS.*.nrs_"$policy"_offset_type="physical" \
+		ost.OSS.*.nrs_"$policy"_supported="reads" || return $?
 
-	echo "policy: $policy, ${policy}_quantum 1, ${policy}_offset_type physical, ${policy}_supported reads"
+	echo "policy: $policy, ${policy}_quantum 1, ${policy}_offset_type " \
+		"physical, ${policy}_supported reads"
 	nrs_write_read
 
-	do_nodes $oss lctl set_param ost.OSS.*.nrs_${policy}_supported="writes" \
-				     ost.OSS.*.nrs_${policy}_quantum=64
+	do_nodes $oss lctl set_param \
+		ost.OSS.*.nrs_${policy}_supported="writes" \
+		ost.OSS.*.nrs_${policy}_quantum=64 || return $?
 
-	echo "policy: $policy, ${policy}_quantum 64, ${policy}_offset_type physical, ${policy}_supported writes"
+	echo "policy: $policy, ${policy}_quantum 64, ${policy}_offset_type " \
+		"physical, ${policy}_supported writes"
 	nrs_write_read
 
-	do_nodes $oss lctl set_param ost.OSS.*.nrs_${policy}_supported="reads_and_writes" \
-				     ost.OSS.*.nrs_${policy}_offset_type="logical"
-	echo "policy: $policy, ${policy}_quantum 64, ${policy}_offset_type logical, ${policy}_supported reads_and_writes"
+	do_nodes $oss lctl set_param \
+		ost.OSS.*.nrs_${policy}_supported="reads_and_writes" \
+		ost.OSS.*.nrs_${policy}_offset_type="logical" || return $?
+	echo "policy: $policy, ${policy}_quantum 64, ${policy}_offset_type " \
+		"logical, ${policy}_supported reads_and_writes"
 	nrs_write_read
 
 	# cleanup
-	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies="fifo"
+	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies="fifo" ||
+		return $?
 	return 0
 }
 
 test_77c() { #LU-3266
-	orr_trr "orr"
+	local rc
+	orr_trr "orr" || rc=$?
+	[[ $rc -eq 3 ]] && skip "no NRS exists" && return
+	[[ $rc -ne 0 ]] && error "orr_trr failed rc:$rc"
 	return 0
 }
 run_test 77c "check ORR NRS policy"
 
 test_77d() { #LU-3266
-	orr_trr "trr"
+	local rc
+	orr_trr "trr" || rc=$?
+	[[ $rc -eq 3 ]] && skip "no NRS exists" && return
+	[[ $rc -ne 0 ]] && error "orr_trr failed rc:$rc"
 	return 0
 }
 run_test 77d "check TRR nrs policy"
@@ -3048,15 +3385,71 @@ tbf_rule_operate()
 		error "failed to run operate '$*' on TBF rules"
 }
 
+cleanup_tbf_verify()
+{
+	local rc=0
+	trap 0
+	echo "cleanup_tbf $DIR/$tdir"
+	rm -rf $DIR/$tdir
+	rc=$?
+	wait_delete_completed
+	return $rc
+}
+
+tbf_verify() {
+	local dir=$DIR/$tdir
+	local client1=${CLIENT1:-$(hostname)}
+	local myRUNAS="$3"
+
+	local np=$(check_cpt_number ost1)
+	[ $np -gt 0 ] || error "CPU partitions should not be $np."
+	echo "cpu_npartitions on ost1 is $np"
+
+	mkdir $dir || error "mkdir $dir failed"
+	$LFS setstripe -c 1 -i 0 $dir || error "setstripe to $dir failed"
+	chmod 777 $dir
+
+	trap cleanup_tbf_verify EXIT
+	echo "Limited write rate: $1, read rate: $2"
+	echo "Verify the write rate is under TBF control"
+	local start=$SECONDS
+	do_node $client1 $myRUNAS dd if=/dev/zero of=$dir/tbf \
+		bs=1M count=100 oflag=direct 2>&1
+	local runtime=$((SECONDS - start + 1))
+	local rate=$(bc <<< "scale=6; 100 / $runtime")
+	echo "Write runtime is $runtime s, speed is $rate IOPS"
+
+	# verify the write rate does not exceed TBF rate limit
+	[ $(bc <<< "$rate < 1.1 * $np * $1") -eq 1 ] ||
+		error "The write rate ($rate) exceeds 110% of rate limit ($1 * $np)"
+
+	cancel_lru_locks osc
+
+	echo "Verify the read rate is under TBF control"
+	start=$SECONDS
+	do_node $client1 $myRUNAS dd if=$dir/tbf of=/dev/null \
+		bs=1M count=100 iflag=direct 2>&1
+	runtime=$((SECONDS - start + 1))
+	rate=$(bc <<< "scale=6; 100 / $runtime")
+	echo "Read runtime is $runtime s, speed is $rate IOPS"
+
+	# verify the read rate does not exceed TBF rate limit
+	[ $(bc <<< "$rate < 1.1 * $np * $2") -eq 1 ] ||
+		error "The read rate ($rate) exceeds 110% of rate limit ($2 * $np)"
+
+	cancel_lru_locks osc
+	cleanup_tbf_verify || error "rm -rf $dir failed"
+}
+
 test_77e() {
-	local server_version=$(lustre_version_code ost1)
-	[[ $server_version -ge $(version_code 2.7.58) ]] ||
-		{ skip "Need server version newer than 2.7.57"; return 0; }
+	local rc
 
 	oss=$(comma_list $(osts_nodes))
 
-	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies="tbf\ nid"
-	[ $? -ne 0 ] && error "failed to set TBF policy"
+	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies="tbf\ nid" ||
+		rc=$?
+	[[ $rc -eq 3 ]] && skip "no NRS TBF exists" && return
+	[[ $rc -ne 0 ]] && error "failed to set TBF NID policy"
 
 	local idis
 	local rateis
@@ -3095,23 +3488,25 @@ test_77e() {
 run_test 77e "check TBF NID nrs policy"
 
 test_77f() {
-	local server_version=$(lustre_version_code ost1)
-	[[ $server_version -ge $(version_code 2.7.58) ]] ||
-		{ skip "Need server version newer than 2.7.57"; return 0; }
+	local rc
 
 	oss=$(comma_list $(osts_nodes))
 
+	do_nodes $oss $LCTL set_param \
+		ost.OSS.ost_io.nrs_policies="tbf\ jobid" || rc=$?
+	[[ $rc -eq 3 ]] && skip "no NRS TBF exists" && return
+	[[ $rc -ne 0 ]] && error "failed to set TBF JOBID policy"
+
 	# Configure jobid_var
 	local saved_jobid_var=$($LCTL get_param -n jobid_var)
+	rc=$?
+	[[ $rc -eq 3 ]] && skip "jobid_var not found" && return
+	[[ $rc -ne 0 ]] && error "failed to get param jobid_var"
 	if [ $saved_jobid_var != procname_uid ]; then
-		set_conf_param_and_check client			\
-			"$LCTL get_param -n jobid_var"		\
-			"$FSNAME.sys.jobid_var" procname_uid
+		set_persistent_param_and_check client \
+			"jobid_var" "$FSNAME.sys.jobid_var" procname_uid
 	fi
 
-	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies="tbf\ jobid"
-	[ $? -ne 0 ] && error "failed to set TBF policy"
-
 	local idis
 	local rateis
 	if [ $(lustre_version_code ost1) -ge $(version_code 2.8.54) ]; then
@@ -3144,27 +3539,28 @@ test_77f() {
 	nrs_write_read "$RUNAS"
 
 	local current_jobid_var=$($LCTL get_param -n jobid_var)
+	[[ $? -ne 0 ]] && error "failed to get param jobid_var"
 	if [ $saved_jobid_var != $current_jobid_var ]; then
-		set_conf_param_and_check client			\
-			"$LCTL get_param -n jobid_var"		\
-			"$FSNAME.sys.jobid_var" $saved_jobid_var
+		set_persistent_param_and_check client \
+			"jobid_var" "$FSNAME.sys.jobid_var" $saved_jobid_var
 	fi
 	return 0
 }
 run_test 77f "check TBF JobID nrs policy"
 
 test_77g() {
-	local server_version=$(lustre_version_code ost1)
-	[[ $server_version -ge $(version_code 2.7.58) ]] ||
-		{ skip "Need server version newer than 2.7.57"; return 0; }
+	local rc=0
 
 	oss=$(comma_list $(osts_nodes))
 
-	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies="tbf\ nid"
-	[ $? -ne 0 ] && error "failed to set TBF policy"
+	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies="tbf\ nid" ||
+		rc=$?
+	[[ $rc -eq 3 ]] && skip "no NRS TBF exists" && return
+	[[ $rc -ne 0 ]] && error "failed to set TBF NID policy"
 
-	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies="tbf\ jobid"
-	[ $? -ne 0 ] && error "failed to set TBF policy"
+	do_nodes $oss lctl set_param \
+		ost.OSS.ost_io.nrs_policies="tbf\ jobid" || rc=$?
+	[[ $rc -ne 0 ]] && error "failed to set TBF JOBID policy"
 
 	local idis
 	local rateis
@@ -3201,10 +3597,6 @@ test_77h() {
 	[ $? -eq 0 ] && error "should return error"
 
 	do_facet ost1 lctl set_param \
-		ost.OSS.ost_io.nrs_policies="tbf\ reg"
-	[ $? -eq 0 ] && error "should return error"
-
-	do_facet ost1 lctl set_param \
 		ost.OSS.ost_io.nrs_policies="tbf\ reg\ abc"
 	[ $? -eq 0 ] && error "should return error"
 
@@ -3244,7 +3636,7 @@ tbf_rule_check()
 }
 
 test_77i() {
-    [ $(lustre_version_code ost1) -ge $(version_code 2.8.55) ] ||
+	[ $(lustre_version_code ost1) -ge $(version_code 2.8.55) ] ||
 		{ skip "Need OST version at least 2.8.55"; return 0; }
 
 	for i in $(seq 1 $OSTCOUNT)
@@ -3296,6 +3688,279 @@ test_77i() {
 }
 run_test 77i "Change rank of TBF rule"
 
+test_77j() {
+	local idis
+	local rateis
+	local ost_version=$(lustre_version_code ost1)
+
+	[ $ost_version -ge $(version_code 2.9.53) ] ||
+		{ skip "Need OST version at least 2.9.53"; return 0; }
+	if [ $ost_version -ge $(version_code 2.8.60) ]; then
+		idis="opcode="
+		rateis="rate="
+	fi
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param jobid_var=procname_uid \
+			ost.OSS.ost_io.nrs_policies="tbf\ opcode" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ost_r\ ${idis}{ost_read}\ ${rateis}5" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ost_w\ ${idis}{ost_write}\ ${rateis}20"
+	[ $? -ne 0 ] && error "failed to set TBF OPCode policy"
+
+	nrs_write_read
+	tbf_verify 20 5
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ ost_r" \
+			ost.OSS.ost_io.nrs_tbf_rule="stop\ ost_w" \
+			ost.OSS.ost_io.nrs_policies="fifo"
+
+	# sleep 3 seconds to wait the tbf policy stop completely,
+	# or the next test case is possible get -EAGAIN when
+	# setting the tbf policy
+	sleep 3
+}
+run_test 77j "check TBF-OPCode NRS policy"
+
+test_id() {
+	local idstr="${1}id"
+	local policy="${idstr}={$2}"
+	local rate="rate=$3"
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param jobid_var=procname_uid \
+			ost.OSS.ost_io.nrs_policies="tbf\ ${idstr}" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ost_${idstr}\ ${policy}\ ${rate}"
+	[ $? -ne 0 ] && error "failed to set tbf ${idstr} policy"
+
+	nrs_write_read "runas $4"
+	tbf_verify $3 $3 "runas $4"
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ ost_${idstr}" \
+			ost.OSS.ost_io.nrs_policies="fifo"
+
+	# sleep 3 seconds to wait the tbf policy stop completely,
+	# or the next test case is possible get -eagain when
+	# setting the tbf policy
+	sleep 3
+}
+
+test_77ja(){
+	if [ $(lustre_version_code ost1) -lt $(version_code 2.11.50) ]; then
+		skip "Need OST version at least 2.11.50"
+		return 0
+	fi
+	test_id "u" "500" "5" "-u 500"
+	test_id "g" "500" "5" "-u 500 -g 500"
+}
+run_test 77ja "check TBF-UID/GID NRS policy"
+
+cleanup_77k()
+{
+	local rule_lists=$1
+	local old_nrs=$2
+
+	trap 0
+	for rule in $rule_lists; do
+		do_nodes $(comma_list $(osts_nodes)) \
+			lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ $rule"
+	done
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_policies="$old_nrs"
+
+	sleep 3
+}
+
+test_77k() {
+	[[ $(lustre_version_code ost1) -ge $(version_code 2.9.53) ]] ||
+		{ skip "Need OST version at least 2.9.53"; return 0; }
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_policies="tbf" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_w\ jobid={dd.$RUNAS_ID}\&opcode={ost_write}\ rate=20" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_r\ jobid={dd.$RUNAS_ID}\&opcode={ost_read}\ rate=10"
+
+	nrs_write_read "$RUNAS"
+	tbf_verify 20 10 "$RUNAS"
+
+	local address=$(comma_list "$(host_nids_address $CLIENTS $NETTYPE)")
+	local client_nids=$(nids_list $address "\\")
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ ext_w" \
+			ost.OSS.ost_io.nrs_tbf_rule="stop\ ext_r" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_w\ nid={0@lo\ $client_nids}\&opcode={ost_write}\ rate=20" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_r\ nid={0@lo\ $client_nids}\&opcode={ost_read}\ rate=10"
+
+	nrs_write_read
+	tbf_verify 20 10
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ ext_w" \
+			ost.OSS.ost_io.nrs_tbf_rule="stop\ ext_r" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext\ nid={0@lo\ $client_nids}\&jobid={dd.$RUNAS_ID}\ rate=20"
+
+	nrs_write_read "$RUNAS"
+	tbf_verify 20 20 "$RUNAS"
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ ext" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_a\ jobid={dd.$RUNAS_ID},opcode={ost_write}\ rate=20" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_b\ jobid={dd.$RUNAS_ID},opcode={ost_read}\ rate=10"
+
+	nrs_write_read "$RUNAS"
+	# with parameter "RUNAS", it will match the latest rule
+	# "ext_b" first, so the limited write rate is 10.
+	tbf_verify 10 10 "$RUNAS"
+	tbf_verify 20 10
+
+	trap "cleanup_77k \"ext_a ext_b\" \"fifo\"" EXIT
+
+	[[ $(lustre_version_code ost1) -ge $(version_code 2.10.58) ]] ||
+		{ skip "Need OST version at least 2.10.58"; return 0; }
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ ext_a" \
+			ost.OSS.ost_io.nrs_tbf_rule="stop\ ext_b" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_ug\ uid={500}\&gid={1000}\ rate=5"
+	nrs_write_read "runas -u 500 -g 1000"
+	tbf_verify 5 5 "runas -u 500 -g 1000"
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ ext_ug" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_uw\ uid={500}\&opcode={ost_write}\ rate=20" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_ur\ uid={500}\&opcode={ost_read}\ rate=10"
+
+	nrs_write_read "runas -u 500"
+	tbf_verify 20 10 "runas -u 500"
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ ext_uw" \
+			ost.OSS.ost_io.nrs_tbf_rule="stop\ ext_ur" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_a\ uid={500},opcode={ost_write}\ rate=20" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ ext_b\ uid={500},opcode={ost_read}\ rate=10"
+	nrs_write_read "runas -u 500"
+	tbf_verify 10 10 "runas -u 500"
+	tbf_verify 20 10 "runas -u 500"
+	cleanup_77k "ext_a ext_b" "fifo"
+}
+run_test 77k "check TBF policy with NID/JobID/OPCode expression"
+
+test_77l() {
+	[[ $(lustre_version_code ost1) -ge $(version_code 2.10.56) ]] ||
+		{ skip "Need OST version at least 2.10.56"; return 0; }
+
+	do_facet ost1 lctl set_param ost.OSS.ost_io.nrs_policies="tbf\ nid"
+	do_facet ost1 lctl set_param ost.OSS.ost_io.nrs_policies="tbf"
+
+	local output=$(do_facet ost1 lctl get_param \
+			ost.OSS.ost_io.nrs_policies | \
+			awk '/name: tbf/ {print;exit}' | \
+			awk -F ': ' '{print $2}')
+
+	if [ "$output" != "tbf" ]; then
+		error "The generic TBF output is '$output', not 'tbf'"
+	fi
+
+	do_facet ost1 lctl set_param ost.OSS.ost_io.nrs_policies="fifo"
+}
+run_test 77l "check the output of NRS policies for generic TBF"
+
+test_77m() {
+	if [ $(lustre_version_code ost1) -lt $(version_code 2.9.54) ]; then
+		skip "Need OST version at least 2.9.54"
+		return 0
+	fi
+
+	local dir=$DIR/$tdir
+
+	mkdir $dir || error "mkdir $dir failed"
+	$LFS setstripe -c $OSTCOUNT $dir || error "setstripe to $dir failed"
+	chmod 777 $dir
+
+	local nodes=$(comma_list $(osts_nodes))
+	do_nodes $nodes lctl set_param ost.OSS.ost_io.nrs_policies=delay \
+				       ost.OSS.ost_io.nrs_delay_min=4 \
+				       ost.OSS.ost_io.nrs_delay_max=4 \
+				       ost.OSS.ost_io.nrs_delay_pct=100
+	[ $? -ne 0 ] && error "Failed to set delay policy"
+
+	local start=$SECONDS
+	do_nodes "${SINGLECLIENT:-$HOSTNAME}" "$RUNAS" \
+		 dd if=/dev/zero of="$dir/nrs_delay_$HOSTNAME" bs=1M count=1 \
+		   oflag=direct conv=fdatasync ||
+		{ do_nodes $nodes lctl set_param ost.OSS.ost_io.nrs_policies="fifo";
+		  error "dd on client failed (1)"; }
+	local elapsed=$((SECONDS - start))
+
+	# NRS delay doesn't do sub-second timing, so a request enqueued at
+	# 0.9 seconds can be dequeued at 4.0
+	[ $elapsed -lt 3 ] &&
+		{ do_nodes $nodes lctl set_param ost.OSS.ost_io.nrs_policies="fifo";
+		  error "Single 1M write should take at least 3 seconds"; }
+
+	start=$SECONDS
+	do_nodes "${SINGLECLIENT:-$HOSTNAME}" "$RUNAS" \
+		 dd if=/dev/zero of="$dir/nrs_delay_$HOSTNAME" bs=1M count=10 \
+		   oflag=direct conv=fdatasync ||
+		{ do_nodes $nodes lctl set_param ost.OSS.ost_io.nrs_policies="fifo";
+		  error "dd on client failed (2)"; }
+	elapsed=$((SECONDS - start))
+
+	[ $elapsed -lt 30 ] &&
+		{ do_nodes $nodes lctl set_param ost.OSS.ost_io.nrs_policies="fifo";
+		  error "Ten 1M writes should take at least 30 seconds"; }
+
+	do_nodes $nodes lctl set_param ost.OSS.ost_io.nrs_policies="fifo"
+	[ $? -ne 0 ] && error "failed to set policy back to fifo"
+
+	return 0
+}
+run_test 77m "check NRS Delay slows write RPC processing"
+
+test_77n() { #LU-10802
+	if [ $(lustre_version_code ost1) -lt $(version_code 2.10.58) ]; then
+		skip "Need OST version at least 2.10.58"
+		return 0
+	fi
+
+	# Configure jobid_var
+	local saved_jobid_var=$($LCTL get_param -n jobid_var)
+	if [ $saved_jobid_var != procname_uid ]; then
+		set_persistent_param_and_check client \
+			"jobid_var" "$FSNAME.sys.jobid_var" procname_uid
+	fi
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_policies="tbf\ jobid" \
+			ost.OSS.ost_io.nrs_tbf_rule="stop\ dd_runas" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ dd_runas\ jobid={*.$RUNAS_ID}\ rate=20"
+
+	nrs_write_read
+	tbf_verify 20 20 "$RUNAS"
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ dd_runas" \
+			ost.OSS.ost_io.nrs_tbf_rule="start\ dd_runas\ jobid={dd.*}\ rate=20"
+
+	nrs_write_read
+	tbf_verify 20 20
+
+	do_nodes $(comma_list $(osts_nodes)) \
+		lctl set_param ost.OSS.ost_io.nrs_tbf_rule="stop\ dd_runas" \
+			ost.OSS.ost_io.nrs_policies="fifo"
+
+	sleep 3
+
+	local current_jobid_var=$($LCTL get_param -n jobid_var)
+	if [ $saved_jobid_var != $current_jobid_var ]; then
+		set_persistent_param_and_check client \
+			"jobid_var" "$FSNAME.sys.jobid_var" $saved_jobid_var
+	fi
+}
+run_test 77n "check wildcard support for TBF JobID NRS policy"
+
 test_78() { #LU-6673
 	local rc
 
@@ -3303,6 +3968,7 @@ test_78() { #LU-6673
 	do_nodes $oss lctl set_param ost.OSS.ost_io.nrs_policies="orr" &
 	do_nodes $oss lctl set_param ost.OSS.*.nrs_orr_quantum=1
 	rc=$?
+	[[ $rc -eq 3 ]] && skip "no NRS exists" && return
 	# Valid return codes are:
 	# 0: Tuning succeeded
 	# ENODEV: Policy is still stopped
@@ -3319,7 +3985,7 @@ run_test 78 "Enable policy and specify tunings right away"
 
 test_79() {
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
-	test_mkdir -p $DIR/$tdir
+	test_mkdir $DIR/$tdir
 
 	# Prevent interference from layout intent RPCs due to
 	# asynchronous writeback. These will be tested in 130c below.
@@ -3329,7 +3995,7 @@ test_79() {
 		error "setfattr -n trusted.name1=value1 $DIR/$tdir failed"
 
 #define OBD_FAIL_MDS_INTENT_DELAY		0x160
-	local mdtidx=$($LFS getstripe -M $DIR/$tdir)
+	local mdtidx=$($LFS getstripe -m $DIR/$tdir)
 	local facet=mds$((mdtidx + 1))
 	stat $DIR/$tdir
 	set_nodes_failloc $(facet_active_host $facet) 0x80000160
@@ -3375,7 +4041,7 @@ test_80a() {
 
 	echo "Finish migration, then checking.."
 	for file in $(find $DIR1/$tdir); do
-		mdt_index=$($LFS getstripe -M $file)
+		mdt_index=$($LFS getstripe -m $file)
 		[ $mdt_index == $MDTIDX ] ||
 			error "$file is not on MDT${MDTIDX}"
 	done
@@ -3416,7 +4082,7 @@ test_80b() {
 	(
 		while true; do
 			mdt_idx=$((RANDOM % MDSCOUNT))
-			$LFS migrate -m $mdt_idx $migrate_dir1 2&>/dev/null ||
+			$LFS migrate -m $mdt_idx $migrate_dir1 &>/dev/null ||
 				rc=$?
 			[ $rc -ne 0 -o $rc -ne 16 ] || break
 		done
@@ -3460,23 +4126,23 @@ test_80b() {
 
 		if [ -e $migrate_dir2/source_file ]; then
 			ln $migrate_dir2/source_file $migrate_dir2/link_file \
-					2&>/dev/null || rc1=$?
+					&>/dev/null || rc1=$?
 			if [ -e $migrate_dir2/link_file ]; then
 				rm -rf $migrate_dir2/link_file
 			fi
 
 			mrename $migrate_dir2/source_file \
-				$migrate_dir2/target_file 2&>/dev/null || rc1=$?
+				$migrate_dir2/target_file &>/dev/null || rc1=$?
 			[ $rc1 -ne 0 -o $rc1 -ne 1 ] || {
 				echo "rename failed with $rc1"
 				break
 			}
 
 			if [ -e $migrate_dir2/target_file ]; then
-				rm -rf $migrate_dir2/target_file 2&>/dev/null ||
+				rm -rf $migrate_dir2/target_file &>/dev/null ||
 								rc1=$?
 			else
-				rm -rf $migrate_dir2/source_file 2&>/dev/null ||
+				rm -rf $migrate_dir2/source_file &>/dev/null ||
 								rc1=$?
 			fi
 			[ $rc1 -ne 0 -o $rc1 -ne 1 ] || {
@@ -3510,7 +4176,7 @@ test_80b() {
 }
 run_test 80b "Accessing directory during migration"
 
-test_81() {
+test_81a() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 
 	rm -rf $DIR1/$tdir
@@ -3536,7 +4202,35 @@ test_81() {
 
 	return 0
 }
-run_test 81 "rename and stat under striped directory"
+run_test 81a "rename and stat under striped directory"
+
+test_81b() {
+	[ $MDSCOUNT -lt 2 ] &&
+		skip "We need at least 2 MDTs for this test"
+
+	local total
+	local setattr_pid
+
+	total=1000
+
+	$LFS mkdir -c $MDSCOUNT $DIR1/$tdir || error "$LFS mkdir"
+	createmany -o $DIR1/$tdir/$tfile. $total || error "createmany"
+
+	(
+		while true; do
+			touch $DIR1/$tdir
+		done
+	) &
+	setattr_pid=$!
+
+	for i in $(seq $total); do
+		mrename $DIR2/$tdir/$tfile.$i $DIR2/$tdir/$tfile-new.$i \
+			> /dev/null
+	done
+
+	kill -9 $setattr_pid
+}
+run_test 81b "rename under striped directory doesn't deadlock"
 
 test_82() {
 	[[ $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.6.91) ]] ||
@@ -3692,14 +4386,243 @@ test_92() {
 }
 run_test 92 "create remote directory under orphan directory"
 
+test_93() {
+	local rc1=0
+	local rc2=0
+	local old_rr
+
+	mkdir -p $DIR1/$tfile-1/
+	mkdir -p $DIR2/$tfile-2/
+	local old_rr=$(do_facet $SINGLEMDS lctl get_param -n \
+		'lod.lustre-MDT*/qos_threshold_rr' | sed -e 's/%//')
+	do_facet $SINGLEMDS lctl set_param -n \
+		'lod.lustre-MDT*/qos_threshold_rr' 100
+	#define OBD_FAIL_MDS_LOV_CREATE_RACE     0x163
+	do_facet $SINGLEMDS "lctl set_param fail_loc=0x00000163"
+
+	$LFS setstripe -c -1 $DIR1/$tfile-1/file1 &
+	local PID1=$!
+	sleep 1
+	$LFS setstripe -c -1 $DIR2/$tfile-2/file2 &
+	local PID2=$!
+	wait $PID2
+	wait $PID1
+	do_facet $SINGLEMDS "lctl set_param fail_loc=0x0"
+	do_facet $SINGLEMDS "lctl set_param -n \
+		'lod.lustre-MDT*/qos_threshold_rr' $old_rr"
+
+	$LFS getstripe $DIR1/$tfile-1/file1
+	rc1=$($LFS getstripe -q $DIR1/$tfile-1/file1 |
+		awk '{if (/[0-9]/) print $1 }' | sort | uniq -d | wc -l)
+	$LFS getstripe $DIR2/$tfile-2/file2
+	rc2=$($LFS getstripe -q $DIR2/$tfile-2/file2 |
+		awk '{if (/[0-9]/) print $1 }' | sort | uniq -d | wc -l)
+	echo "rc1=$rc1 and rc2=$rc2 "
+	[ $rc1 -eq 0 ] && [ $rc2 -eq 0 ] ||
+		error "object allocate on same ost detected"
+}
+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
+
+	lctl set_param -n mdc.*.stats=clear
+	dd if=/dev/zero of=$DIR2/$tdir/dom bs=4096 count=1 || return 1
+
+	$CHECKSTAT -t file -s 4096 $DIR/$tdir/dom || error "stat #1"
+	# first stat from server should return size data and save glimpse
+	local gls=$(lctl get_param -n mdc.*.stats | grep -c ldlm_glimpse)
+	[ $gls -eq 0 ] || error "Unexpected $gls glimpse RPCs"
+	# second stat to check size is NOT cached on client without IO lock
+	$CHECKSTAT -t file -s 4096 $DIR/$tdir/dom || error "stat #2"
+
+	local gls=$(lctl get_param -n mdc.*.stats | grep -c ldlm_glimpse)
+	[ $gls -ge 1 ] || error "Expect glimpse RPCs but none"
+	rm -f $dom
+}
+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
+
+	lctl set_param -n mdc.*.stats=clear
+	dd if=/dev/zero of=$DIR2/$tdir/dom bs=4096 count=1 || return 1
+	cancel_lru_locks mdc
+	# first stat data from server should have size
+	$CHECKSTAT -t file -s 4096 $DIR/$tdir/dom || error "stat #1"
+	# second stat to check size is cached on client
+	$CHECKSTAT -t file -s 4096 $DIR/$tdir/dom || error "stat #2"
+
+	local gls=$(lctl get_param -n mdc.*.stats | grep -c ldlm_glimpse)
+	# both stats should cause no glimpse requests
+	[ $gls == 0 ] || error "Unexpected $gls glimpse RPCs"
+	rm -f $dom
+}
+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
+
+	lctl set_param -n mdc.*.stats=clear
+	lctl set_param -n osc.*.stats=clear
+	dd if=/dev/zero of=$DIR2/$tdir/dom bs=2048K count=1 || return 1
+
+	# check that size is merged from MDT and OST correctly
+	$CHECKSTAT -t file -s 2097152 $DIR/$tdir/dom ||
+		error "Wrong size from stat #1"
+
+	local gls=$(lctl get_param -n osc.*.stats | grep -c ldlm_glimpse)
+	[ $gls -eq 0 ] && error "Expect OST glimpse RPCs but got none"
+
+	rm -f $dom
+}
+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
+
+
+	dd if=/dev/zero of=$DIR2/$tdir/dom bs=2048K count=1 || return 1
+	lctl set_param -n mdc.*.stats=clear
+	$TRUNCATE $DIR2/$tdir/dom 4096
+
+	# check that reported size is valid after file grows to OST and
+	# is truncated back to MDT stripe size
+	$CHECKSTAT -t file -s 4096 $DIR/$tdir/dom ||
+		error "Wrong size from stat #1"
+
+	local gls=$(lctl get_param -n osc.*.stats | grep -c ldlm_glimpse)
+	[ $gls -eq 0 ] && error "Expect OST glimpse but got none"
+
+	rm -f $dom
+}
+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
+
+	local old_wb=$(sysctl -n vm.dirty_writeback_centisecs)
+	sysctl -wq vm.dirty_writeback_centisecs=0
+
+	trap "sysctl -wq vm.dirty_writeback_centisecs=$old_wb" EXIT
+
+	# open + IO lock
+	dd if=/dev/zero of=$DIR1/$tfile bs=4096 count=1 ||
+		error_noexit "Write fails"
+	# must discard pages
+	lctl set_param -n mdc.*.stats=clear
+	rm $DIR2/$tfile || error "Unlink fails"
+
+	local writes=$(lctl get_param -n mdc.*.stats | grep -c ost_write)
+	[ $writes -eq 0 ] || error "Found WRITE RPC but expect none"
+}
+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
+	$CHECKSTAT -t file $DIR1/$tfile
+
+	local old_wb=$(sysctl -n vm.dirty_writeback_centisecs)
+	sysctl -wq vm.dirty_writeback_centisecs=0
+
+	trap "sysctl -wq vm.dirty_writeback_centisecs=$old_wb" EXIT
+
+	# open + IO lock
+	dd if=/dev/zero of=$DIR1/$tfile bs=4096 count=1 || error "Write fails"
+	# must discard pages
+	lctl set_param -n mdc.*.stats=clear
+	mv $DIR2/${tfile}_2 $DIR2/$tfile || error "Rename fails"
+
+	local writes=$(lctl get_param -n mdc.*.stats | grep -c ost_write)
+	[ $writes -eq 0 ] || error "Found WRITE RPC but expect none"
+}
+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
+
+	local old_wb=$(sysctl -n vm.dirty_writeback_centisecs)
+	sysctl -wq vm.dirty_writeback_centisecs=0
+
+	trap "sysctl -wq vm.dirty_writeback_centisecs=$old_wb" EXIT
+
+	# open + IO lock
+	dd if=/dev/zero of=$DIR1/$tfile bs=4096 count=1 || error "Write fails"
+	$MULTIOP $DIR1/$tfile O_c &
+	MULTIOP_PID=$!
+	sleep 1
+	lctl set_param -n mdc.*.stats=clear
+	rm $DIR2/$tfile > /dev/null || error "Unlink fails for opened file"
+	kill -USR1 $MULTIOP_PID && wait $MULTIOP_PID || error "multiop failure"
+
+	local writes=$(lctl get_param -n mdc.*.stats | grep -c ost_write)
+	[ $writes -eq 0 ] || error "Found WRITE RPC but expect none"
+}
+run_test 101c "Discard DoM data on close-unlink"
+
+# test to verify file handle related system calls
+# (name_to_handle_at/open_by_handle_at)
+# The new system calls are supported in glibc >= 2.14.
+
+# test to verify we can open by handle an unlinked file from > 1 client
+# This test opens the file normally on $DIR1, which is on one mount, and then
+# opens it by handle on $DIR2, which is on a different mount.
+test_102() {
+	[ $MDS1_VERSION -lt $(version_code 2.11.57) ] &&
+		skip "Needs MDS version 2.11.57 or later"
+
+	echo "Test file_handle syscalls" > $DIR/$tfile ||
+		error "write failed"
+	check_fhandle_syscalls $DIR/$tfile $DIR2 ||
+		error "check_fhandle_syscalls failed"
+	rm -f $DIR2/$tfile
+}
+run_test 102 "Test open by handle of unlinked file"
+
 log "cleanup: ======================================================"
 
 # kill and wait in each test only guarentee script finish, but command in script
 # like 'rm' 'chmod' may still be running, wait for all commands to finish
 # otherwise umount below will fail
-wait_update $HOSTNAME "fuser -m $MOUNT2" "" || true
-
-[ "$(mount | grep $MOUNT2)" ] && umount $MOUNT2
+[ "$(mount | grep $MOUNT2)" ] && wait_update $HOSTNAME "fuser -m $MOUNT2" "" ||
+	true
 
 complete $SECONDS
 rm -f $SAMPLE_FILE