X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=87d3026c0019cac9e4bcfcb12e167905ce3da098;hp=a960a1ccd84e2697c9839c6aea60f42f374c2a83;hb=12a1b23389f091591ed78fa9cf8aa15870c39101;hpb=8ebfe25da7cd8e9ede902446859c49474d429f1d

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index a960a1c..87d3026 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# -*- tab-width: 4; indent-tabs-mode: t; -*-
 #
 # Run select tests by setting ONLY, or as arguments to the script.
 # Skip specific tests by setting EXCEPT.
@@ -11,6 +12,11 @@ ONLY=${ONLY:-"$*"}
 ALWAYS_EXCEPT="                27u   42a  42b  42c  42d  45   51d   68b   $SANITY_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
+# with LOD/OSP landing
+# bug number for skipped tests: LU-2036
+ALWAYS_EXCEPT="                 76     $ALWAYS_EXCEPT"
+
+
 # Tests that fail on uml
 CPU=`awk '/model/ {print $4}' /proc/cpuinfo`
 #                                    buffer i/o errs             sock spc runas
@@ -447,13 +453,29 @@ test_17f() {
 }
 run_test 17f "symlinks: long and very long symlink name ========================"
 
+# str_repeat(S, N) generate a string that is string S repeated N times
+str_repeat() {
+	local s=$1
+	local n=$2
+	local ret=''
+	while [ $((n -= 1)) -ge 0 ]; do
+		ret=$ret$s
+	done
+	echo $ret
+}
+
+# Long symlinks and LU-2241
 test_17g() {
-        mkdir -p $DIR/$tdir
-        LONGSYMLINK="$(dd if=/dev/zero bs=4095 count=1 | tr '\0' 'x')"
-        ln -s $LONGSYMLINK $DIR/$tdir/$tfile
-        ls -l $DIR/$tdir
+	mkdir -p $DIR/$tdir
+	local TESTS="59 60 61 4094 4095"
+
+	for i in $TESTS; do
+		local SYMNAME=$(str_repeat 'x' $i)
+		ln -s $SYMNAME $DIR/$tdir/f$i || error "failed $i-char symlink"
+		readlink $DIR/$tdir/f$i	|| error "failed $i-char readlink"
+	done
 }
-run_test 17g "symlinks: really long symlink name ==============================="
+run_test 17g "symlinks: really long symlink name and inode boundaries"
 
 test_17h() { #bug 17378
         remote_mds_nodsh && skip "remote MDS with nodsh" && return
@@ -498,6 +520,13 @@ test_17m() {
 	local i
 	local rc=0
 
+	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] &&
+	[ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.2.93) ] &&
+		skip "MDS 2.2.0-2.2.93 do not NUL-terminate symlinks" && return
+
+	[ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] &&
+		skip "only for ldiskfs MDT" && return 0
+
 	mkdir -p $WDIR
 	long_sym=$short_sym
 	# create a long symlink file
@@ -514,7 +543,7 @@ test_17m() {
 	echo "erase them"
 	rm -f $WDIR/*
 	sync
-	sleep 2
+	wait_delete_completed
 
 	echo "recreate the 512 symlink files with a shorter string"
 	for ((i = 0; i < 512; ++i)); do
@@ -831,20 +860,28 @@ page_size() {
 	getconf PAGE_SIZE
 }
 
+simple_cleanup_common() {
+	trap 0
+	rm -rf $DIR/$tdir
+	wait_delete_completed
+}
+
 test_24v() {
 	local NRFILES=100000
 	local FREE_INODES=`lfs df -i|grep "filesystem summary" | awk '{print $5}'`
 	[ $FREE_INODES -lt $NRFILES ] && \
-		skip "not enough free inodes $FREE_INODES required $NRFILES" && \
+		skip "not enough free inodes $FREE_INODES required $NRFILES" &&
 		return
 
-	mkdir -p $DIR/d24v
-	createmany -m $DIR/d24v/$tfile $NRFILES
+	trap simple_cleanup_common EXIT
+
+	mkdir -p $DIR/$tdir
+	createmany -m $DIR/$tdir/$tfile $NRFILES
 
 	cancel_lru_locks mdc
 	lctl set_param mdc.*.stats clear
 
-	ls $DIR/d24v >/dev/null || error "error in listing large dir"
+	ls $DIR/$tdir >/dev/null || error "error in listing large dir"
 
 	# LU-5 large readdir
 	# DIRENT_SIZE = 32 bytes for sizeof(struct lu_dirent) +
@@ -860,7 +897,7 @@ test_24v() {
 	[ $mds_readpage -gt $RPC_NUM ] && \
 		error "large readdir doesn't take effect"
 
-	rm $DIR/d24v -rf
+	simple_cleanup_common
 }
 run_test 24v "list directory with large files (handle hash collision, bug: 17560)"
 
@@ -1041,30 +1078,31 @@ test_27l() {
 run_test 27l "check setstripe permissions (should return error)"
 
 test_27m() {
-	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" && return
+	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" &&
+		return
 	if [ $ORIGFREE -gt $MAXFREE ]; then
 		skip "$ORIGFREE > $MAXFREE skipping out-of-space test on OST0"
 		return
 	fi
-	mkdir -p $DIR/d27
-	$SETSTRIPE -i 0 -c 1 $DIR/d27/f27m_1
-	dd if=/dev/zero of=$DIR/d27/f27m_1 bs=1024 count=$MAXFREE &&
+	trap simple_cleanup_common EXIT
+	mkdir -p $DIR/$tdir
+	$SETSTRIPE -i 0 -c 1 $DIR/$tdir/f27m_1
+	dd if=/dev/zero of=$DIR/$tdir/f27m_1 bs=1024 count=$MAXFREE &&
 		error "dd should fill OST0"
 	i=2
-	while $SETSTRIPE -i 0 -c 1 $DIR/d27/f27m_$i; do
+	while $SETSTRIPE -i 0 -c 1 $DIR/$tdir/f27m_$i; do
 		i=`expr $i + 1`
 		[ $i -gt 256 ] && break
 	done
 	i=`expr $i + 1`
-	touch $DIR/d27/f27m_$i
-	[ `$GETSTRIPE $DIR/d27/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] && \
+	touch $DIR/$tdir/f27m_$i
+	[ `$GETSTRIPE $DIR/$tdir/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] &&
 		error "OST0 was full but new created file still use it"
 	i=`expr $i + 1`
-	touch $DIR/d27/f27m_$i
-	[ `$GETSTRIPE $DIR/d27/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] && \
+	touch $DIR/$tdir/f27m_$i
+	[ `$GETSTRIPE $DIR/$tdir/f27m_$i | grep -A 10 obdidx | awk '{print $1}'| grep -w "0"` ] &&
 		error "OST0 was full but new created file still use it"
-	rm -r $DIR/d27
-	sleep 15
+	simple_cleanup_common
 }
 run_test 27m "create file while OST0 was full =================="
 
@@ -1082,6 +1120,7 @@ reset_enospc() {
 	[ "$OSTIDX" ] && list=$(facet_host ost$((OSTIDX + 1)))
 
 	do_nodes $list lctl set_param fail_loc=0
+	sync	# initiate all OST_DESTROYs from MDS to OST
 	sleep_maxage
 }
 
@@ -1732,42 +1771,51 @@ test_31m() {
 }
 run_test 31m "link to file: the same, non-existing, dir==============="
 
+cleanup_test32_mount() {
+	trap 0
+	$UMOUNT $DIR/$tdir/ext2-mountpoint
+}
+
 test_32a() {
 	echo "== more mountpoints and symlinks ================="
-	[ -e $DIR/d32a ] && rm -fr $DIR/d32a
-	mkdir -p $DIR/d32a/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32a/ext2-mountpoint || error
-	$CHECKSTAT -t dir $DIR/d32a/ext2-mountpoint/.. || error
-	$UMOUNT $DIR/d32a/ext2-mountpoint || error
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	$CHECKSTAT -t dir $DIR/$tdir/ext2-mountpoint/.. || error
+	cleanup_test32_mount
 }
 run_test 32a "stat d32a/ext2-mountpoint/.. ====================="
 
 test_32b() {
-	[ -e $DIR/d32b ] && rm -fr $DIR/d32b
-	mkdir -p $DIR/d32b/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32b/ext2-mountpoint || error
-	ls -al $DIR/d32b/ext2-mountpoint/.. || error
-	$UMOUNT $DIR/d32b/ext2-mountpoint || error
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	ls -al $DIR/$tdir/ext2-mountpoint/.. || error
+	cleanup_test32_mount
 }
 run_test 32b "open d32b/ext2-mountpoint/.. ====================="
 
 test_32c() {
-	[ -e $DIR/d32c ] && rm -fr $DIR/d32c
-	mkdir -p $DIR/d32c/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32c/ext2-mountpoint || error
-	mkdir -p $DIR/d32c/d2/test_dir
-	$CHECKSTAT -t dir $DIR/d32c/ext2-mountpoint/../d2/test_dir || error
-	$UMOUNT $DIR/d32c/ext2-mountpoint || error
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	mkdir -p $DIR/$tdir/d2/test_dir
+	$CHECKSTAT -t dir $DIR/$tdir/ext2-mountpoint/../d2/test_dir || error
+	cleanup_test32_mount
 }
 run_test 32c "stat d32c/ext2-mountpoint/../d2/test_dir ========="
 
 test_32d() {
-	[ -e $DIR/d32d ] && rm -fr $DIR/d32d
-	mkdir -p $DIR/d32d/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32d/ext2-mountpoint || error
-	mkdir -p $DIR/d32d/d2/test_dir
-	ls -al $DIR/d32d/ext2-mountpoint/../d2/test_dir || error
-	$UMOUNT $DIR/d32d/ext2-mountpoint || error
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	mkdir -p $DIR/$tdir/d2/test_dir
+	ls -al $DIR/$tdir/ext2-mountpoint/../d2/test_dir || error
+	cleanup_test32_mount
 }
 run_test 32d "open d32d/ext2-mountpoint/../d2/test_dir ========="
 
@@ -1817,44 +1865,48 @@ test_32h() {
 run_test 32h "open d32h/symlink->tmp/symlink->lustre-subdir/${tdir}2"
 
 test_32i() {
-	[ -e $DIR/d32i ] && rm -fr $DIR/d32i
-	mkdir -p $DIR/d32i/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32i/ext2-mountpoint || error
-	touch $DIR/d32i/test_file
-	$CHECKSTAT -t file $DIR/d32i/ext2-mountpoint/../test_file || error
-	$UMOUNT $DIR/d32i/ext2-mountpoint || error
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	touch $DIR/$tdir/test_file
+	$CHECKSTAT -t file $DIR/$tdir/ext2-mountpoint/../test_file || error
+	cleanup_test32_mount
 }
 run_test 32i "stat d32i/ext2-mountpoint/../test_file ==========="
 
 test_32j() {
-	[ -e $DIR/d32j ] && rm -fr $DIR/d32j
-	mkdir -p $DIR/d32j/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32j/ext2-mountpoint || error
-	touch $DIR/d32j/test_file
-	cat $DIR/d32j/ext2-mountpoint/../test_file || error
-	$UMOUNT $DIR/d32j/ext2-mountpoint || error
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	touch $DIR/$tdir/test_file
+	cat $DIR/$tdir/ext2-mountpoint/../test_file || error
+	cleanup_test32_mount
 }
 run_test 32j "open d32j/ext2-mountpoint/../test_file ==========="
 
 test_32k() {
-	rm -fr $DIR/d32k
-	mkdir -p $DIR/d32k/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32k/ext2-mountpoint
-	mkdir -p $DIR/d32k/d2
-	touch $DIR/d32k/d2/test_file || error
-	$CHECKSTAT -t file $DIR/d32k/ext2-mountpoint/../d2/test_file || error
-	$UMOUNT $DIR/d32k/ext2-mountpoint || error
+	rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint
+	mkdir -p $DIR/$tdir/d2
+	touch $DIR/$tdir/d2/test_file || error
+	$CHECKSTAT -t file $DIR/$tdir/ext2-mountpoint/../d2/test_file || error
+	cleanup_test32_mount
 }
 run_test 32k "stat d32k/ext2-mountpoint/../d2/test_file ========"
 
 test_32l() {
-	rm -fr $DIR/d32l
-	mkdir -p $DIR/d32l/ext2-mountpoint
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32l/ext2-mountpoint || error
-	mkdir -p $DIR/d32l/d2
-	touch $DIR/d32l/d2/test_file
-	cat  $DIR/d32l/ext2-mountpoint/../d2/test_file || error
-	$UMOUNT $DIR/d32l/ext2-mountpoint || error
+	rm -fr $DIR/$tdir
+	trap cleanup_test32_mount EXIT
+	mkdir -p $DIR/$tdir/ext2-mountpoint
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir/ext2-mountpoint || error
+	mkdir -p $DIR/$tdir/d2
+	touch $DIR/$tdir/d2/test_file
+	cat  $DIR/$tdir/ext2-mountpoint/../d2/test_file || error
+	cleanup_test32_mount
 }
 run_test 32l "open d32l/ext2-mountpoint/../d2/test_file ========"
 
@@ -1917,23 +1969,30 @@ test_32p() {
 }
 run_test 32p "open d32p/symlink->tmp/symlink->lustre-root/$tfile"
 
+cleanup_testdir_mount() {
+	trap 0
+	$UMOUNT $DIR/$tdir
+}
+
 test_32q() {
-	[ -e $DIR/d32q ] && rm -fr $DIR/d32q
-	mkdir -p $DIR/d32q
-        touch $DIR/d32q/under_the_mount
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32q
-	ls $DIR/d32q/under_the_mount && error || true
-	$UMOUNT $DIR/d32q || error
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_testdir_mount EXIT
+	mkdir -p $DIR/$tdir
+        touch $DIR/$tdir/under_the_mount
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir
+	ls $DIR/$tdir | grep "\<under_the_mount\>" && error
+	cleanup_testdir_mount
 }
 run_test 32q "stat follows mountpoints in Lustre (should return error)"
 
 test_32r() {
-	[ -e $DIR/d32r ] && rm -fr $DIR/d32r
-	mkdir -p $DIR/d32r
-        touch $DIR/d32r/under_the_mount
-	mount -t ext2 -o loop $EXT2_DEV $DIR/d32r
-	ls $DIR/d32r | grep -q under_the_mount && error || true
-	$UMOUNT $DIR/d32r || error
+	[ -e $DIR/$tdir ] && rm -fr $DIR/$tdir
+	trap cleanup_testdir_mount EXIT
+	mkdir -p $DIR/$tdir
+        touch $DIR/$tdir/under_the_mount
+	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir
+	ls $DIR/$tdir | grep -q under_the_mount && error || true
+	cleanup_testdir_mount
 }
 run_test 32r "opendir follows mountpoints in Lustre (should return error)"
 
@@ -2238,15 +2297,7 @@ test_36h() {
 }
 run_test 36h "utime on file racing with OST BRW write =========="
 
-test_37() {
-	mkdir -p $DIR/$tdir
-	echo f > $DIR/$tdir/fbugfile
-	mount -t ext2 -o loop $EXT2_DEV $DIR/$tdir
-	ls $DIR/$tdir | grep "\<fbugfile\>" && error
-	$UMOUNT $DIR/$tdir || error
-	rm -f $DIR/$tdir/fbugfile || error
-}
-run_test 37 "ls a mounted file system to check old content ====="
+# test_37 - duplicate with tests 32q 32r
 
 test_38() {
 	local file=$DIR/$tfile
@@ -2533,7 +2584,23 @@ run_test 39k "write, utime, close, stat ========================"
 # this should be set to future
 TEST_39_ATIME=`date -d "1 year" +%s`
 
+is_sles11()						# LU-1783
+{
+	if [ -r /etc/SuSE-release ]
+	then
+		local vers=`grep VERSION /etc/SuSE-release | awk '{print $3}'`
+		local patchlev=`grep PATCHLEVEL /etc/SuSE-release \
+			| awk '{print $3}'`
+		if [ $vers -eq 11 ] && [ $patchlev -eq 1 ]
+		then
+			return 0
+		fi
+	fi
+	return 1
+}
+
 test_39l() {
+	is_sles11 && skip "SLES 11 SP1" && return	# LU-1783
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	local atime_diff=$(do_facet $SINGLEMDS lctl get_param -n mdd.*.atime_diff)
 
@@ -3137,45 +3204,72 @@ run_test 51a "special situations: split htree with empty entry =="
 
 export NUMTEST=70000
 test_51b() {
-	NUMFREE=`df -i -P $DIR | tail -n 1 | awk '{ print $4 }'`
-	[ $NUMFREE -lt 21000 ] && \
-		skip "not enough free inodes ($NUMFREE)" && \
+	local BASE=$DIR/$tdir
+	mkdir -p $BASE
+
+	local mdtidx=$(printf "%04x" $($LFS getstripe -M $BASE))
+	local numfree=$(lctl get_param -n mdc.$FSNAME-MDT$mdtidx*.filesfree)
+	[ $numfree -lt 21000 ] && skip "not enough free inodes ($numfree)" &&
 		return
 
-	[ $NUMFREE -lt $NUMTEST ] && NUMTEST=$(($NUMFREE - 50))
+	[ $numfree -lt $NUMTEST ] && NUMTEST=$(($numfree - 50)) &&
+		echo "reduced count to $NUMTEST due to inodes"
 
-	mkdir -p $DIR/d51b
-	createmany -d $DIR/d51b/t- $NUMTEST
+	# need to check free space for the directories as well
+	local blkfree=$(lctl get_param -n mdc.$FSNAME-MDT$mdtidx*.kbytesavail)
+	numfree=$((blkfree / 4))
+	[ $numfree -lt $NUMTEST ] && NUMTEST=$(($numfree - 50)) &&
+		echo "reduced count to $NUMTEST due to blocks"
+
+	createmany -d $BASE/d $NUMTEST && echo $NUMTEST > $BASE/fnum ||
+		echo "failed" > $BASE/fnum
 }
-run_test 51b "mkdir .../t-0 --- .../t-$NUMTEST ===================="
+run_test 51b "exceed 64k subdirectory nlink limit"
 
 test_51ba() { # LU-993
-	local BASE=$DIR/d51b
+	local BASE=$DIR/$tdir
 	# unlink all but 100 subdirectories, then check it still works
 	local LEFT=100
+	[ -f $BASE/fnum ] && local NUMPREV=$(cat $BASE/fnum) && rm $BASE/fnum
+
+	[ "$NUMPREV" != "failed" ] && NUMTEST=$NUMPREV
 	local DELETE=$((NUMTEST - LEFT))
 
 	# continue on to run this test even if 51b didn't finish,
 	# just to delete the many subdirectories created.
-	! [ -d "${BASE}/t-1" ] && skip "test_51b() not run" && return 0
+	[ ! -d "${BASE}/d1" ] && skip "test_51b() not run" && return 0
 
 	# for ldiskfs the nlink count should be 1, but this is OSD specific
 	# and so this is listed for informational purposes only
-	log "nlink before: $(stat -c %h $BASE)"
-	unlinkmany -d $BASE/t- $DELETE ||
-		error "unlink of first $DELETE subdirs failed"
+	echo "nlink before: $(stat -c %h $BASE), created before: $NUMTEST"
+	unlinkmany -d $BASE/d $DELETE
+	RC=$?
+
+	if [ $RC -ne 0 ]; then
+		if [ "$NUMPREV" == "failed" ]; then
+			skip "previous setup failed"
+			return 0
+		else
+			error "unlink of first $DELETE subdirs failed"
+			return $RC
+		fi
+	fi
 
-	log "nlink between: $(stat -c %h $BASE)"
-	local FOUND=$(ls -l ${BASE} | wc -l)
-	FOUND=$((FOUND - 1))  # trim the first line of ls output
+	echo "nlink between: $(stat -c %h $BASE)"
+	# trim the first line of ls output
+	local FOUND=$(($(ls -l ${BASE} | wc -l) - 1))
 	[ $FOUND -ne $LEFT ] &&
 		error "can't find subdirs: found only $FOUND/$LEFT"
 
-	unlinkmany -d $BASE/t- $DELETE $LEFT ||
+	unlinkmany -d $BASE/d $DELETE $LEFT ||
 		error "unlink of second $LEFT subdirs failed"
-	log "nlink after: $(stat -c %h $BASE)"
+	# regardless of whether the backing filesystem tracks nlink accurately
+	# or not, the nlink count shouldn't be more than "." and ".." here
+	local AFTER=$(stat -c %h $BASE)
+	[ $AFTER -gt 2 ] && error "nlink after: $AFTER > 2" ||
+		echo "nlink after: $AFTER"
 }
-run_test 51ba "rmdir .../t-0 --- .../t-$NUMTEST"
+run_test 51ba "verify nlink for many subdirectory cleanup"
 
 test_51bb() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
@@ -3956,6 +4050,11 @@ run_test 56w "check lfs_migrate -c stripe_count works"
 
 test_57a() {
 	# note test will not do anything if MDS is not local
+	if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then
+		skip "Only applicable to ldiskfs-based MDTs"
+		return
+	fi
+
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	local MNTDEV="osd*.*MDT*.mntdev"
 	DEV=$(do_facet $SINGLEMDS lctl get_param -n $MNTDEV)
@@ -3971,6 +4070,11 @@ test_57a() {
 run_test 57a "verify MDS filesystem created with large inodes =="
 
 test_57b() {
+	if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then
+		skip "Only applicable to ldiskfs-based MDTs"
+		return
+	fi
+
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	local dir=$DIR/d57b
 
@@ -4036,8 +4140,8 @@ test_59() {
 	echo "rm 130 files"
 	unlinkmany $DIR/f59- 130
 	sync
-	sleep 2
-        # wait for commitment of removal
+	# wait for commitment of removal
+	wait_delete_completed
 }
 run_test 59 "verify cancellation of llog records async ========="
 
@@ -4477,7 +4581,6 @@ test_72a() { # bug 5695 - Test that on 2.6 remove_suid works properly
 	# Now test that MDS is updated too
 	cancel_lru_locks mdc
 	test -u $DIR/f72 -o -g $DIR/f72 && error "S/gid is not dropped on MDS"
-	true
 	rm -f $DIR/f72
 }
 run_test 72a "Test that remove suid works properly (bug5695) ===="
@@ -4876,6 +4979,16 @@ test_79() { # bug 12743
 run_test 79 "df report consistency check ======================="
 
 test_80() { # bug 10718
+        # relax strong synchronous semantics for slow backends like ZFS
+        local soc="obdfilter.*.sync_on_lock_cancel"
+        local soc_old=$(do_facet ost1 lctl get_param -n $soc | head -n1)
+        local hosts=
+        if [ "$soc_old" != "never" -a "$FSTYPE" != "ldiskfs" ]; then
+                hosts=$(for host in $(seq -f "ost%g" 1 $OSTCOUNT); do
+                          facet_active_host $host; done | sort -u)
+                do_nodes $hosts lctl set_param $soc=never
+        fi
+
         dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 seek=1M
         sync; sleep 1; sync
         local BEFORE=`date +%s`
@@ -4885,7 +4998,9 @@ test_80() { # bug 10718
         if [ $DIFF -gt 1 ] ; then
                 error "elapsed for 1M@1T = $DIFF"
         fi
-        true
+
+        [ -n "$hosts" ] && do_nodes $hosts lctl set_param $soc=$soc_old
+
         rm -f $DIR/$tfile
 }
 run_test 80 "Page eviction is equally fast at high offsets too  ===="
@@ -4894,7 +5009,7 @@ test_81a() { # LU-456
         remote_ost_nodsh && skip "remote OST with nodsh" && return
         # define OBD_FAIL_OST_MAPBLK_ENOSPC    0x228
         # MUST OR with the OBD_FAIL_ONCE (0x80000000)
-        do_facet ost0 lctl set_param fail_loc=0x80000228
+        do_facet ost1 lctl set_param fail_loc=0x80000228
 
         # write should trigger a retry and success
         $SETSTRIPE -i 0 -c 1 $DIR/$tfile
@@ -4910,7 +5025,7 @@ test_81b() { # LU-456
         remote_ost_nodsh && skip "remote OST with nodsh" && return
         # define OBD_FAIL_OST_MAPBLK_ENOSPC    0x228
         # Don't OR with the OBD_FAIL_ONCE (0x80000000)
-        do_facet ost0 lctl set_param fail_loc=0x228
+        do_facet ost1 lctl set_param fail_loc=0x228
 
         # write should retry several times and return -ENOSPC finally
         $SETSTRIPE -i 0 -c 1 $DIR/$tfile
@@ -5222,7 +5337,7 @@ test_101d() {
         { skip "Need free space ${size}M, have $space" && return; }
 
     echo Creating ${size}M test file $file
-    dd if=/dev/zero of=$file bs=1M count=$size
+    dd if=/dev/zero of=$file bs=1M count=$size || error "dd failed"
     echo Cancel LRU locks on lustre client to flush the client cache
     cancel_lru_locks osc
 
@@ -5243,8 +5358,9 @@ test_101d() {
     echo read-ahead disabled time read $time_ra_OFF
     echo read-ahead enabled  time read $time_ra_ON
 
-    set_read_ahead $old_READAHEAD
-    rm -f $file
+	set_read_ahead $old_READAHEAD
+	rm -f $file
+	wait_delete_completed
 
     [ $time_ra_ON -lt $time_ra_OFF ] ||
         error "read-ahead enabled  time read (${time_ra_ON}s) is more than
@@ -5825,14 +5941,18 @@ test_107() {
 run_test 107 "Coredump on SIG"
 
 test_110() {
-	mkdir -p $DIR/d110
-	mkdir $DIR/d110/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa || error "mkdir with 255 char fail"
-	mkdir $DIR/d110/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb && error "mkdir with 256 char should fail, but not"
-	touch $DIR/d110/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx || error "create with 255 char fail"
-	touch $DIR/d110/yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy && error ""create with 256 char should fail, but not
-
-	ls -l $DIR/d110
-    rm -fr $DIR/d110
+	mkdir -p $DIR/$tdir
+	mkdir $DIR/$tdir/$(str_repeat 'a' 255) ||
+		error "mkdir with 255 char failed"
+	mkdir $DIR/$tdir/$(str_repeat 'b' 256) &&
+		error "mkdir with 256 char should fail, but did not"
+	touch $DIR/$tdir/$(str_repeat 'x' 255) ||
+		error "create with 255 char failed"
+	touch $DIR/$tdir/$(str_repeat 'y' 256) &&
+		error "create with 256 char should fail, but did not"
+
+	ls -l $DIR/$tdir
+	rm -rf $DIR/$tdir
 }
 run_test 110 "filename length checking"
 
@@ -5855,9 +5975,9 @@ test_115() {
 	    cut -c11-20)
 
 	# don't return an error
-        [ $OSTIO_post -eq $OSTIO_pre ] && echo \
-	    "WARNING: No new ll_ost_io threads were created ($OSTIO_pre)" &&\
-	    echo "This may be fine, depending on what ran before this test" &&\
+        [ $OSTIO_post == $OSTIO_pre ] && echo \
+	    "WARNING: No new ll_ost_io threads were created ($OSTIO_pre)" &&
+	    echo "This may be fine, depending on what ran before this test" &&
 	    echo "and how fast this system is." && return
 
         echo "Started with $OSTIO_pre threads, ended with $OSTIO_post"
@@ -5883,7 +6003,7 @@ free_min_max () {
 	echo Max free space: OST $MAXI: $MAXV
 }
 
-test_116() {
+test_116a() { # was previously test_116()
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs" && return
 
 	echo -n "Free space priority "
@@ -5966,7 +6086,21 @@ test_116() {
 
 	rm -rf $DIR/$tdir
 }
-run_test 116 "stripe QOS: free space balance ==================="
+run_test 116a "stripe QOS: free space balance ==================="
+
+test_116b() { # LU-2093
+#define OBD_FAIL_MDS_OSC_CREATE_FAIL     0x147
+	local old_rr
+	old_rr=$(do_facet $SINGLEMDS lctl get_param -n lov.*mdtlov*.qos_threshold_rr)
+	do_facet $SINGLEMDS lctl set_param lov.*mdtlov*.qos_threshold_rr 0
+	mkdir -p $DIR/$tdir
+	do_facet $SINGLEMDS lctl set_param fail_loc=0x147
+	createmany -o $DIR/$tdir/f- 20 || error "can't create"
+	do_facet $SINGLEMDS lctl set_param fail_loc=0
+	rm -rf $DIR/$tdir
+	do_facet $SINGLEMDS lctl set_param lov.*mdtlov*.qos_threshold_rr $old_rr
+}
+run_test 116b "QoS shouldn't LBUG if not enough OSTs found on the 2nd pass"
 
 test_117() # bug 10891
 {
@@ -6241,6 +6375,8 @@ test_118h() {
 }
 run_test 118h "Verify timeout in handling recoverables errors  =========="
 
+[ "$SLOW" = "no" ] && [ -n "$OLD_RESENDCOUNT" ] && set_resend_count $OLD_RESENDCOUNT
+
 test_118i() {
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -6279,6 +6415,8 @@ test_118i() {
 }
 run_test 118i "Fix error before timeout in recoverable error  =========="
 
+[ "$SLOW" = "no" ] && set_resend_count 4
+
 test_118j() {
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 
@@ -6995,7 +7133,7 @@ set_dir_limits () {
 	done
 }
 test_129() {
-	if [ "$(facet_type_fstype MDS)" != ldiskfs ]; then
+	if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then
 		skip "Only applicable to ldiskfs-based MDTs"
 		return
 	fi
@@ -7037,18 +7175,26 @@ cleanup_130() {
 }
 
 test_130a() {
-	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
-	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
+	local filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
+	[ -n "$filefrag_op" ] && skip_env "filefrag does not support FIEMAP" &&
+		return
 
 	trap cleanup_130 EXIT RETURN
 
 	local fm_file=$DIR/$tfile
 	$SETSTRIPE -S 65536 -c 1 $fm_file || error "setstripe on $fm_file"
-	dd if=/dev/zero of=$fm_file bs=65536 count=1 || error "dd failed for $fm_file"
+	dd if=/dev/zero of=$fm_file bs=65536 count=1 ||
+		error "dd failed for $fm_file"
 
-	filefrag -ves $fm_file || error "filefrag $fm_file failed"
-	filefrag_op=`filefrag -ve $fm_file | grep -A 100 "ext:" | grep -v "ext:" | grep -v "found"`
+	# LU-1795: test filefrag/FIEMAP once, even if unsupported
+	filefrag -ves $fm_file
+	RC=$?
+	[ "$(facet_fstype ost$(($($GETSTRIPE -i $fm_file) + 1)))" = "zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return
+	[ $RC != 0 ] && error "filefrag $fm_file failed"
 
+	filefrag_op=$(filefrag -ve $fm_file | grep -A 100 "ext:" |
+		      grep -v "ext:" | grep -v "found")
 	lun=$($GETSTRIPE -i $fm_file)
 
 	start_blk=`echo $filefrag_op | cut -d: -f2 | cut -d. -f1`
@@ -7079,21 +7225,28 @@ test_130a() {
 run_test 130a "FIEMAP (1-stripe file)"
 
 test_130b() {
-	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping FIEMAP on 2-stripe file test" && return
+	[ "$OSTCOUNT" -lt "2" ] &&
+		skip_env "skipping FIEMAP on 2-stripe file test" && return
 
-	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
-	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
+	local filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
+	[ -n "$filefrag_op" ] && skip_env "filefrag does not support FIEMAP" &&
+		return
 
 	trap cleanup_130 EXIT RETURN
 
 	local fm_file=$DIR/$tfile
 	$SETSTRIPE -S 65536 -c 2 $fm_file || error "setstripe on $fm_file"
-	dd if=/dev/zero of=$fm_file bs=1M count=2 || error "dd failed on $fm_file"
+	[ "$(facet_fstype ost$(($($GETSTRIPE -i $fm_file) + 1)))" = "zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return
+
+	dd if=/dev/zero of=$fm_file bs=1M count=2 ||
+		error "dd failed on $fm_file"
 
 	filefrag -ves $fm_file || error "filefrag $fm_file failed"
-	filefrag_op=`filefrag -ve $fm_file | grep -A 100 "ext:" | grep -v "ext:" | grep -v "found"`
+	filefrag_op=$(filefrag -ve $fm_file | grep -A 100 "ext:" |
+		      grep -v "ext:" | grep -v "found")
 
-	last_lun=`echo $filefrag_op | cut -d: -f5`
+	last_lun=$(echo $filefrag_op | cut -d: -f5)
 
 	IFS=$'\n'
 	tot_len=0
@@ -7128,15 +7281,20 @@ test_130b() {
 run_test 130b "FIEMAP (2-stripe file)"
 
 test_130c() {
-	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping FIEMAP on 2-stripe file with hole test" && return
+	[ "$OSTCOUNT" -lt "2" ] &&
+		skip_env "skipping FIEMAP on 2-stripe file" && return
 
 	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
-	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
+	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" &&
+		return
 
 	trap cleanup_130 EXIT RETURN
 
 	local fm_file=$DIR/$tfile
 	$SETSTRIPE -S 65536 -c 2 $fm_file || error "setstripe on $fm_file"
+	[ "$(facet_fstype ost$(($($GETSTRIPE -i $fm_file) + 1)))" = "zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return
+
 	dd if=/dev/zero of=$fm_file seek=1 bs=1M count=1 || error "dd failed on $fm_file"
 
 	filefrag -ves $fm_file || error "filefrag $fm_file failed"
@@ -7192,6 +7350,8 @@ test_130d() {
 
 	local fm_file=$DIR/$tfile
 	$SETSTRIPE -S 65536 -c $OSTCOUNT $fm_file||error "setstripe on $fm_file"
+	[ "$(facet_fstype ost$(($($GETSTRIPE -i $fm_file) + 1)))" = "zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return
 	dd if=/dev/zero of=$fm_file bs=1M count=$OSTCOUNT || error "dd failed on $fm_file"
 
 	filefrag -ves $fm_file || error "filefrag $fm_file failed"
@@ -7241,6 +7401,9 @@ test_130e() {
 
 	local fm_file=$DIR/$tfile
 	$SETSTRIPE -S 131072 -c 2 $fm_file || error "setstripe on $fm_file"
+	[ "$(facet_fstype ost$(($($GETSTRIPE -i $fm_file) + 1)))" = "zfs" ] &&
+		skip "ORI-366/LU-1941: FIEMAP unimplemented on ZFS" && return
+
 	NUM_BLKS=512
 	EXPECTED_LEN=$(( (NUM_BLKS / 2) * 64 ))
 	for ((i = 0; i < $NUM_BLKS; i++))
@@ -7480,8 +7643,11 @@ test_133b() {
 	chmod 444 ${testdir}/${tfile} || error "chmod failed"
 	check_stats $SINGLEMDS "setattr" 1
 	do_facet $SINGLEMDS $LCTL set_param mdt.*.md_stats=clear
-	ls -l ${testdir}/${tfile} > /dev/null|| error "ls failed"
-	check_stats $SINGLEMDS "getattr" 1
+	if [ $(lustre_version_code $SINGLEMDS) -ne $(version_code 2.2.0) ]
+	then		# LU-1740
+		ls -l ${testdir}/${tfile} > /dev/null|| error "ls failed"
+		check_stats $SINGLEMDS "getattr" 1
+	fi
 	$LFS df || error "lfs failed"
 	check_stats $SINGLEMDS "statfs" 1
 
@@ -7499,6 +7665,7 @@ test_133c() {
 	$SETSTRIPE -c 1 -i 0 ${testdir}/${tfile}
 	sync
 	cancel_lru_locks osc
+	wait_delete_completed
 
 	# clear stats.
 	do_facet $SINGLEMDS $LCTL set_param mdt.*.md_stats=clear
@@ -7516,6 +7683,7 @@ test_133c() {
 	check_stats ost "punch" 1
 
 	rm -f ${testdir}/${tfile} || error "file remove failed"
+	wait_delete_completed
 	check_stats ost "destroy" 1
 
 	rm -rf $DIR/${tdir}
@@ -7564,8 +7732,10 @@ size_in_KMGT() {
 
 get_rename_size() {
     local size=$1
+    local context=${2:-.}
     local sample=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats |
-                   awk '/ '${size}'/ {print $4}' | sed -e "s/,//g")
+		grep -A1 $context |
+		awk '/ '${size}'/ {print $4}' | sed -e "s/,//g")
     echo $sample
 }
 
@@ -7631,8 +7801,8 @@ test_133d() {
 
     eval $cmd || error "$cmd failed"
     local crossdir=$($cmd | grep 'crossdir')
-    local src_sample=$(get_rename_size $testdir1_size)
-    local tgt_sample=$(get_rename_size $testdir2_size)
+    local src_sample=$(get_rename_size $testdir1_size crossdir_src)
+    local tgt_sample=$(get_rename_size $testdir2_size crossdir_tgt)
     [ -z "$crossdir" ] && error "crossdir_rename_size count error"
     [ "$src_sample" -eq 1 ] || error "crossdir_rename_size error $src_sample"
     [ "$tgt_sample" -eq 1 ] || error "crossdir_rename_size error $tgt_sample"
@@ -7646,8 +7816,9 @@ test_140() { #bug-17379
         cd $DIR/$tdir || error "Changing to $DIR/$tdir"
         cp /usr/bin/stat . || error "Copying stat to $DIR/$tdir"
 
-        # VFS limits max symlink depth to 5(4KSTACK) or 7(8KSTACK) or 8
-        local i=0
+	# VFS limits max symlink depth to 5(4KSTACK) or 7(8KSTACK) or 8
+	# For kernel > 3.5, bellow only tests consecutive symlink (MAX 40)
+	local i=0
         while i=`expr $i + 1`; do
                 mkdir -p $i || error "Creating dir $i"
                 cd $i || error "Changing to $i"
@@ -7667,7 +7838,14 @@ test_140() { #bug-17379
         done
         i=`expr $i - 1`
         echo "The symlink depth = $i"
-        [ $i -eq 5 -o $i -eq 7 -o $i -eq 8 ] || error "Invalid symlink depth"
+	[ $i -eq 5 -o $i -eq 7 -o $i -eq 8 -o $i -eq 40 ] ||
+					error "Invalid symlink depth"
+
+	# Test recursive symlink
+	ln -s symlink_self symlink_self
+	$OPENFILE -f O_RDONLY symlink_self >/dev/null 2>&1; ret=$?
+	echo "open symlink_self returns $ret"
+	[ $ret -eq 40 ] || error "recursive symlink doesn't return -ELOOP"
 }
 run_test 140 "Check reasonable stack depth (shouldn't LBUG) ===="
 
@@ -7799,6 +7977,9 @@ test_153() {
 run_test 153 "test if fdatasync does not crash ======================="
 
 test_154() {
+	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] ||
+		{ skip "Need MDS version at least 2.2.51"; return 0; }
+
 	cp /etc/hosts $DIR/$tfile
 
 	fid=$($LFS path2fid $DIR/$tfile)
@@ -7864,6 +8045,46 @@ test_154() {
 	touch $DIR/.lustre/fid/$tfile && \
 		error "touch $DIR/.lustre/fid/$tfile should fail."
 
+	echo "setxattr to $DIR/.lustre/fid"
+	setfattr -n trusted.name1 -v value1 $DIR/.lustre/fid &&
+		error "setxattr should fail."
+
+	echo "listxattr for $DIR/.lustre/fid"
+	getfattr -d -m "^trusted" $DIR/.lustre/fid &&
+		error "listxattr should fail."
+
+	echo "delxattr from $DIR/.lustre/fid"
+	setfattr -x trusted.name1 $DIR/.lustre/fid &&
+		error "delxattr should fail."
+
+	echo "touch invalid fid: $DIR/.lustre/fid/[0x200000400:0x2:0x3]"
+	touch $DIR/.lustre/fid/[0x200000400:0x2:0x3] &&
+		error "touch invalid fid should fail."
+
+	echo "touch non-normal fid: $DIR/.lustre/fid/[0x1:0x2:0x0]"
+	touch $DIR/.lustre/fid/[0x1:0x2:0x0] &&
+		error "touch non-normal fid should fail."
+
+	echo "rename $tdir to $DIR/.lustre/fid"
+	mrename $DIR/$tdir $DIR/.lustre/fid &&
+		error "rename to $DIR/.lustre/fid should fail."
+
+	echo "rename .lustre to itself"
+	fid=$($LFS path2fid $DIR)
+	mrename $DIR/.lustre $DIR/.lustre/fid/$fid/.lustre &&
+		error "rename .lustre to itself should fail."
+
+	$OPENFILE -f O_LOV_DELAY_CREATE:O_CREAT $DIR/$tfile-2
+	fid=$($LFS path2fid $DIR/$tfile-2)
+	echo "cp /etc/passwd $DIR/.lustre/fid/$fid"
+	cp /etc/passwd $DIR/.lustre/fid/$fid &&
+		error "create lov data thru .lustre should fail."
+	echo "cp /etc/passwd $DIR/$tfile-2"
+	cp /etc/passwd $DIR/$tfile-2 || error "copy to $DIR/$tfile-2 failed."
+	echo "diff /etc/passwd $DIR/.lustre/fid/$fid"
+	diff /etc/passwd $DIR/.lustre/fid/$fid ||
+		error "diff /etc/passwd $DIR/.lustre/fid/$fid failed."
+
 	echo "Open-by-FID succeeded"
 }
 run_test 154 "Open-by-FID"
@@ -7986,6 +8207,10 @@ test_156() {
     local AFTER
     local file="$DIR/$tfile"
 
+	[ "$(facet_fstype ost1)" = "zfs" ] &&
+		skip "LU-1956/LU-2261: stats unimplemented on OSD ZFS" &&
+		return
+
     log "Turn on read and write cache"
     set_cache read on
     set_cache writethrough on
@@ -8993,7 +9218,7 @@ verify_jobstats() {
 
 	# clear old jobstats
 	do_facet $SINGLEMDS lctl set_param mdt.*.job_stats="clear"
-	do_facet ost0 lctl set_param obdfilter.*.job_stats="clear"
+	do_facet ost1 lctl set_param obdfilter.*.job_stats="clear"
 
 	# use a new JobID for this test, or we might see an old one
 	[ "$JOBENV" = "FAKE_JOBID" ] && FAKE_JOBID=test_id.$testnum.$RANDOM
@@ -9014,13 +9239,16 @@ verify_jobstats() {
 			grep $JOBVAL || error "No job stats found on MDT $FACET"
 	fi
 	if [ "$target" = "ost" -o "$target" = "both" ]; then
-		FACET=ost0
+		FACET=ost1
 		do_facet $FACET lctl get_param obdfilter.*.job_stats |
 			grep $JOBVAL || error "No job stats found on OST $FACET"
 	fi
 }
 
 test_205() { # Job stats
+	[ -z "$(lctl get_param -n mdc.*.connect_flags | grep jobstats)" ] &&
+		skip "Server doesn't support jobstats" && return 0
+
 	local cmd
 	OLD_JOBENV=`$LCTL get_param -n jobid_var`
 	if [ $OLD_JOBENV != $JOBENV ]; then
@@ -9071,6 +9299,17 @@ test_205() { # Job stats
 }
 run_test 205 "Verify job stats"
 
+# LU-1480, LU-1773 and LU-1657
+test_206() {
+	mkdir -p $DIR/$tdir
+	lfs setstripe -c -1 $DIR/$tdir
+#define OBD_FAIL_LOV_INIT 0x1403
+	$LCTL set_param fail_loc=0xa0001403
+	$LCTL set_param fail_val=1
+	touch $DIR/$tdir/$tfile || true
+}
+run_test 206 "fail lov_init_raid0() doesn't lbug"
+
 test_212() {
 	size=`date +%s`
 	size=$((size % 8192 + 1))
@@ -9554,6 +9793,136 @@ test_227() {
 }
 run_test 227 "running truncated executable does not cause OOM"
 
+# LU-1512 try to reuse idle OI blocks
+test_228a() {
+	[ "$FSTYPE" != "ldiskfs" ] && skip "non-ldiskfs backend" && return
+
+	local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/})
+	local myDIR=$DIR/$tdir
+
+	mkdir -p $myDIR
+	#define OBD_FAIL_SEQ_EXHAUST             0x1002
+	$LCTL set_param fail_loc=0x80001002
+	createmany -o $myDIR/t- 10000
+	$LCTL set_param fail_loc=0
+	# The guard is current the largest FID holder
+	touch $myDIR/guard
+	local SEQ=$($LFS path2fid $myDIR/guard | awk -F ':' '{print $1}' |
+		    tr -d '[')
+	local IDX=$(($SEQ % 64))
+
+	do_facet $SINGLEMDS sync
+	# Make sure journal flushed.
+	sleep 6
+	local blk1=$(do_facet $SINGLEMDS \
+		     "$DEBUGFS -c -R \\\"stat oi.16.${IDX}\\\" $MDT_DEV" |
+		     grep Blockcount | awk '{print $4}')
+
+	# Remove old files, some OI blocks will become idle.
+	unlinkmany $myDIR/t- 10000
+	# Create new files, idle OI blocks should be reused.
+	createmany -o $myDIR/t- 2000
+	do_facet $SINGLEMDS sync
+	# Make sure journal flushed.
+	sleep 6
+	local blk2=$(do_facet $SINGLEMDS \
+		     "$DEBUGFS -c -R \\\"stat oi.16.${IDX}\\\" $MDT_DEV" |
+		     grep Blockcount | awk '{print $4}')
+
+	[ $blk1 == $blk2 ] || error "old blk1=$blk1, new blk2=$blk2, unmatched!"
+}
+run_test 228a "try to reuse idle OI blocks"
+
+test_228b() {
+	[ "$FSTYPE" != "ldiskfs" ] && skip "non-ldiskfs backend" && return
+
+	local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/})
+	local myDIR=$DIR/$tdir
+
+	mkdir -p $myDIR
+	#define OBD_FAIL_SEQ_EXHAUST             0x1002
+	$LCTL set_param fail_loc=0x80001002
+	createmany -o $myDIR/t- 10000
+	$LCTL set_param fail_loc=0
+	# The guard is current the largest FID holder
+	touch $myDIR/guard
+	local SEQ=$($LFS path2fid $myDIR/guard | awk -F ':' '{print $1}' |
+		    tr -d '[')
+	local IDX=$(($SEQ % 64))
+
+	do_facet $SINGLEMDS sync
+	# Make sure journal flushed.
+	sleep 6
+	local blk1=$(do_facet $SINGLEMDS \
+		     "$DEBUGFS -c -R \\\"stat oi.16.${IDX}\\\" $MDT_DEV" |
+		     grep Blockcount | awk '{print $4}')
+
+	# Remove old files, some OI blocks will become idle.
+	unlinkmany $myDIR/t- 10000
+
+	# stop the MDT
+	stop $SINGLEMDS || error "Fail to stop MDT."
+	# remount the MDT
+	start $SINGLEMDS $MDT_DEV $MDS_MOUNT_OPTS || error "Fail to start MDT."
+
+	df $MOUNT || error "Fail to df."
+	# Create new files, idle OI blocks should be reused.
+	createmany -o $myDIR/t- 2000
+	do_facet $SINGLEMDS sync
+	# Make sure journal flushed.
+	sleep 6
+	local blk2=$(do_facet $SINGLEMDS \
+		     "$DEBUGFS -c -R \\\"stat oi.16.${IDX}\\\" $MDT_DEV" |
+		     grep Blockcount | awk '{print $4}')
+
+	[ $blk1 == $blk2 ] || error "old blk1=$blk1, new blk2=$blk2, unmatched!"
+}
+run_test 228b "idle OI blocks can be reused after MDT restart"
+
+#LU-1881
+test_228c() {
+	[ "$FSTYPE" != "ldiskfs" ] && skip "non-ldiskfs backend" && return
+
+	local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/})
+	local myDIR=$DIR/$tdir
+
+	mkdir -p $myDIR
+	#define OBD_FAIL_SEQ_EXHAUST             0x1002
+	$LCTL set_param fail_loc=0x80001002
+	# 20000 files can guarantee there are index nodes in the OI file
+	createmany -o $myDIR/t- 20000
+	$LCTL set_param fail_loc=0
+	# The guard is current the largest FID holder
+	touch $myDIR/guard
+	local SEQ=$($LFS path2fid $myDIR/guard | awk -F ':' '{print $1}' |
+		    tr -d '[')
+	local IDX=$(($SEQ % 64))
+
+	do_facet $SINGLEMDS sync
+	# Make sure journal flushed.
+	sleep 6
+	local blk1=$(do_facet $SINGLEMDS \
+		     "$DEBUGFS -c -R \\\"stat oi.16.${IDX}\\\" $MDT_DEV" |
+		     grep Blockcount | awk '{print $4}')
+
+	# Remove old files, some OI blocks will become idle.
+	unlinkmany $myDIR/t- 20000
+	rm -f $myDIR/guard
+	# The OI file should become empty now
+
+	# Create new files, idle OI blocks should be reused.
+	createmany -o $myDIR/t- 2000
+	do_facet $SINGLEMDS sync
+	# Make sure journal flushed.
+	sleep 6
+	local blk2=$(do_facet $SINGLEMDS \
+		     "$DEBUGFS -c -R \\\"stat oi.16.${IDX}\\\" $MDT_DEV" |
+		     grep Blockcount | awk '{print $4}')
+
+	[ $blk1 == $blk2 ] || error "old blk1=$blk1, new blk2=$blk2, unmatched!"
+}
+run_test 228c "NOT shrink the last entry in OI index node to recycle idle leaf"
+
 #
 # tests that do cleanup/setup should be run at the end
 #
@@ -9571,7 +9940,7 @@ test_900() {
 }
 run_test 900 "umount should not race with any mgc requeue thread"
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 check_and_cleanup_lustre
 if [ "$I_MOUNTED" != "yes" ]; then
 	lctl set_param debug="$OLDDEBUG" 2> /dev/null || true