X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=0478cebb0930d164cc62ba473782bb95e36bfd63;hb=ee009f3b3e7bd467df3da3d0b53777db65790062;hp=c3a8d1a0c0dc146cd8e8ddc805abaa6c0c02e465;hpb=e0fec4e0aea3ad89a8a581b3be5d145767f654df;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index c3a8d1a..0478ceb 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -638,6 +638,9 @@ test_17n() {
 run_test 17n "run e2fsck against master/slave MDT which contains remote dir"
 
 test_17o() {
+	[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.64) ]] &&
+		skip "Need MDS version at least 2.3.64" && return
+
 	local WDIR=$DIR/${tdir}o
 	local mdt_index
 	local mdtdevname
@@ -987,7 +990,7 @@ max_pages_per_rpc() {
 
 test_24v() {
 	local NRFILES=100000
-	local FREE_INODES=$(lfs_df -i | grep "summary" | awk '{print $4}')
+	local FREE_INODES=$(mdt_free_inodes 0)
 	[ $FREE_INODES -lt $NRFILES ] && \
 		skip "not enough free inodes $FREE_INODES required $NRFILES" &&
 		return
@@ -995,6 +998,9 @@ test_24v() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	trap simple_cleanup_common EXIT
 
+	# Performance issue on ZFS see LU-4072 (c.f. LU-2887)
+	[ $(facet_fstype $SINGLEMDS) = "zfs" ] && NRFILES=10000
+
 	mkdir -p $DIR/$tdir
 	createmany -m $DIR/$tdir/$tfile $NRFILES
 
@@ -1047,6 +1053,9 @@ test_24x() {
 	mkdir -p $remote_dir/tgt_dir
 	touch $remote_dir/tgt_file
 
+	mrename $remote_dir $DIR/ &&
+		error "rename dir cross MDT works!"
+
 	mrename $DIR/$tdir/src_dir $remote_dir/tgt_dir &&
 		error "rename dir cross MDT works!"
 
@@ -1218,15 +1227,10 @@ test_27b() {
 	$GETSTRIPE -c $DIR/d27/f01
 	[ $($GETSTRIPE -c $DIR/d27/f01) -eq 2 ] ||
 		error "two-stripe file doesn't have two stripes"
-}
-run_test 27b "create two stripe file"
-
-test_27c() {
-	[ -f $DIR/d27/f01 ] || skip "test_27b not run" && return
 
 	dd if=/dev/zero of=$DIR/d27/f01 bs=4k count=4 || error "dd failed"
 }
-run_test 27c "write to two stripe file"
+run_test 27b "create and write to two stripe file"
 
 test_27d() {
 	test_mkdir -p $DIR/d27
@@ -1357,9 +1361,9 @@ exhaust_precreations() {
 	# on the mdt's osc
 	local mdtosc_proc1=$(get_mdtosc_proc_path mds${MDSIDX} $OST)
 	local last_id=$(do_facet mds${MDSIDX} lctl get_param -n \
-        osc.$mdtosc_proc1.prealloc_last_id)
+			osc.$mdtosc_proc1.prealloc_last_id)
 	local next_id=$(do_facet mds${MDSIDX} lctl get_param -n \
-        osc.$mdtosc_proc1.prealloc_next_id)
+			osc.$mdtosc_proc1.prealloc_next_id)
 
 	local mdtosc_proc2=$(get_mdtosc_proc_path mds${MDSIDX})
 	do_facet mds${MDSIDX} lctl get_param osc.$mdtosc_proc2.prealloc*
@@ -3095,6 +3099,57 @@ test_39m() {
 }
 run_test 39m "test atime and mtime before 1970"
 
+test_39n() { # LU-3832
+	local atime_diff=$(do_facet $SINGLEMDS \
+		lctl get_param -n mdd.*MDT0000*.atime_diff)
+	local atime0
+	local atime1
+	local atime2
+
+	do_facet $SINGLEMDS lctl set_param -n mdd.*MDT0000*.atime_diff=1
+
+	rm -rf $DIR/$tfile
+	dd if=/dev/zero of=$DIR/$tfile bs=4096 count=1 status=noxfer
+	atime0=$(stat -c %X $DIR/$tfile)
+
+	sleep 5
+	$MULTIOP $DIR/$tfile oO_RDONLY:O_NOATIME:r4096c
+	atime1=$(stat -c %X $DIR/$tfile)
+
+	sleep 5
+	cancel_lru_locks mdc
+	cancel_lru_locks osc
+	$MULTIOP $DIR/$tfile oO_RDONLY:O_NOATIME:r4096c
+	atime2=$(stat -c %X $DIR/$tfile)
+
+	do_facet $SINGLEMDS \
+		lctl set_param -n mdd.*MDT0000*.atime_diff=$atime_diff
+
+	[ "$atime0" -eq "$atime1" ] || error "atime0 $atime0 != atime1 $atime1"
+	[ "$atime1" -eq "$atime2" ] || error "atime0 $atime0 != atime1 $atime1"
+}
+run_test 39n "check that O_NOATIME is honored"
+
+test_39o() {
+	TESTDIR=$DIR/$tdir/$tfile
+	[ -e $TESTDIR ] && rm -rf $TESTDIR
+	mkdir -p $TESTDIR
+	cd $TESTDIR
+	links1=2
+	ls
+	mkdir a b
+	ls
+	links2=$(stat -c %h .)
+	[ $(($links1 + 2)) != $links2 ] &&
+		error "wrong links count $(($links1 + 2)) != $links2"
+	rmdir b
+	links3=$(stat -c %h .)
+	[ $(($links1 + 1)) != $links3 ] &&
+		error "wrong links count $links1 != $links3"
+	return 0
+}
+run_test 39o "directory cached attributes updated after create ========"
+
 test_40() {
 	dd if=/dev/zero of=$DIR/$tfile bs=4096 count=1
 	$RUNAS $OPENFILE -f O_WRONLY:O_TRUNC $DIR/$tfile &&
@@ -3853,13 +3908,11 @@ test_53() {
 run_test 53 "verify that MDS and OSTs agree on pre-creation ===="
 
 test_54a() {
-	[ ! -f "$SOCKETSERVER" ] &&
-		skip_env "no socketserver, skipping" && return
-	[ ! -f "$SOCKETCLIENT" ] &&
-		skip_env "no socketclient, skipping" && return
-	$SOCKETSERVER $DIR/socket
-	$SOCKETCLIENT $DIR/socket || error "$SOCKETCLIENT $DIR/socket failed"
-	$MUNLINK $DIR/socket
+	$SOCKETSERVER $DIR/socket ||
+		error "$SOCKETSERVER $DIR/socket failed: $?"
+	$SOCKETCLIENT $DIR/socket ||
+		error "$SOCKETCLIENT $DIR/socket failed: $?"
+	$MUNLINK $DIR/socket || error "$MUNLINK $DIR/socket failed: $?"
 }
 run_test 54a "unix domain socket test =========================="
 
@@ -3931,8 +3984,7 @@ run_test 54e "console/tty device works in lustre ======================"
 test_56a() {	# was test_56
         rm -rf $DIR/$tdir
         $SETSTRIPE -d $DIR
-	test_mkdir $DIR/$tdir
-        test_mkdir $DIR/$tdir/dir
+        test_mkdir -p $DIR/$tdir/dir
         NUMFILES=3
         NUMFILESx2=$(($NUMFILES * 2))
         for i in `seq 1 $NUMFILES` ; do
@@ -4518,6 +4570,34 @@ test_56x() {
 }
 run_test 56x "lfs migration support"
 
+test_56y() {
+	local res=""
+
+	local dir0=$DIR/$tdir/$testnum
+	mkdir -p $dir0 || error "creating dir $dir0"
+	local f1=$dir0/file1
+	local f2=$dir0/file2
+
+	touch $f1 || error "creating std file $f1"
+	$MULTIOP $f2 H2c || error "creating released file $f2"
+
+	# a directory can be raid0, so ask only for files
+	res=$($LFIND $dir0 -L raid0 -type f | wc -l)
+	[[ $res == 2 ]] || error "search raid0: found $res files != 2"
+
+	res=$($LFIND $dir0 \! -L raid0 -type f | wc -l)
+	[[ $res == 0 ]] || error "search !raid0: found $res files != 0"
+
+	# only files can be released, so no need to force file search
+	res=$($LFIND $dir0 -L released)
+	[[ $res == $f2 ]] || error "search released: found $res != $f2"
+
+	res=$($LFIND $dir0 \! -L released)
+	[[ $res == $f1 ]] || error "search !released: found $res != $f1"
+
+}
+run_test 56y "lfs find -L raid0|released"
+
 test_57a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	# note test will not do anything if MDS is not local
@@ -4624,7 +4704,8 @@ TEST60_HEAD="test_60 run $RANDOM"
 test_60a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
-        [ ! -f run-llog.sh ] && skip_env "missing subtest run-llog.sh" && return
+	do_facet mgs "! which run-llog.sh &> /dev/null" &&
+		skip_env "missing subtest run-llog.sh" && return
 	log "$TEST60_HEAD - from kernel mode"
 	do_facet mgs sh run-llog.sh
 }
@@ -4752,8 +4833,7 @@ run_test 64a "verify filter grant calculations (in kernel) ====="
 
 test_64b () {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	[ ! -f oos.sh ] && skip_env "missing subtest oos.sh" && return
-	sh oos.sh $MOUNT
+	sh oos.sh $MOUNT || error "oos.sh failed: $?"
 }
 run_test 64b "check out-of-space detection on client ==========="
 
@@ -5290,68 +5370,55 @@ test_77a() { # bug 10889
 	set_checksums 0
 	rm -f $DIR/$tfile
 }
-run_test 77a "normal checksum read/write operation ============="
+run_test 77a "normal checksum read/write operation"
 
 test_77b() { # bug 10889
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	[ ! -f $F77_TMP ] && setup_f77
 	#define OBD_FAIL_OSC_CHECKSUM_SEND       0x409
-	lctl set_param fail_loc=0x80000409
+	$LCTL set_param fail_loc=0x80000409
 	set_checksums 1
-	dd if=$F77_TMP of=$DIR/f77b bs=1M count=$F77SZ conv=sync || \
+
+	dd if=$F77_TMP of=$DIR/$tfile bs=1M count=$F77SZ conv=sync ||
 		error "dd error: $?"
-	lctl set_param fail_loc=0
-	set_checksums 0
-}
-run_test 77b "checksum error on client write ===================="
+	$LCTL set_param fail_loc=0
 
-test_77c() { # bug 10889
-	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	$GSS && skip "could not run with gss" && return
-	[ ! -f $DIR/f77b ] && skip "requires 77b - skipping" && return
-	set_checksums 1
 	for algo in $CKSUM_TYPES; do
 		cancel_lru_locks osc
 		set_checksum_type $algo
 		#define OBD_FAIL_OSC_CHECKSUM_RECEIVE    0x408
-		lctl set_param fail_loc=0x80000408
-		cmp $F77_TMP $DIR/f77b || error "file compare failed"
-		lctl set_param fail_loc=0
+		$LCTL set_param fail_loc=0x80000408
+		cmp $F77_TMP $DIR/$tfile || error "file compare failed"
+		$LCTL set_param fail_loc=0
 	done
 	set_checksums 0
 	set_checksum_type $ORIG_CSUM_TYPE
-	rm -f $DIR/f77b
+	rm -f $DIR/$tfile
 }
-run_test 77c "checksum error on client read ==================="
+run_test 77b "checksum error on client write, read"
 
 test_77d() { # bug 10889
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	$GSS && skip "could not run with gss" && return
 	#define OBD_FAIL_OSC_CHECKSUM_SEND       0x409
-	lctl set_param fail_loc=0x80000409
+	$LCTL set_param fail_loc=0x80000409
 	set_checksums 1
-	directio write $DIR/f77 0 $F77SZ $((1024 * 1024)) || \
+	$DIRECTIO write $DIR/$tfile 0 $F77SZ $((1024 * 1024)) ||
 		error "direct write: rc=$?"
-	lctl set_param fail_loc=0
+	$LCTL set_param fail_loc=0
 	set_checksums 0
-}
-run_test 77d "checksum error on OST direct write ==============="
 
-test_77e() { # bug 10889
-	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	$GSS && skip "could not run with gss" && return
-	[ ! -f $DIR/f77 ] && skip "requires 77d - skipping" && return
 	#define OBD_FAIL_OSC_CHECKSUM_RECEIVE    0x408
-	lctl set_param fail_loc=0x80000408
+	$LCTL set_param fail_loc=0x80000408
 	set_checksums 1
 	cancel_lru_locks osc
-	directio read $DIR/f77 0 $F77SZ $((1024 * 1024)) || \
+	$DIRECTIO read $DIR/$tfile 0 $F77SZ $((1024 * 1024)) ||
 		error "direct read: rc=$?"
-	lctl set_param fail_loc=0
+	$LCTL set_param fail_loc=0
 	set_checksums 0
 }
-run_test 77e "checksum error on OST direct read ================"
+run_test 77d "checksum error on OST direct write, read"
 
 test_77f() { # bug 10889
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -5361,15 +5428,15 @@ test_77f() { # bug 10889
 		cancel_lru_locks osc
 		set_checksum_type $algo
 		#define OBD_FAIL_OSC_CHECKSUM_SEND       0x409
-		lctl set_param fail_loc=0x409
-		directio write $DIR/f77 0 $F77SZ $((1024 * 1024)) && \
+		$LCTL set_param fail_loc=0x409
+		$DIRECTIO write $DIR/$tfile 0 $F77SZ $((1024 * 1024)) &&
 			error "direct write succeeded"
-		lctl set_param fail_loc=0
+		$LCTL set_param fail_loc=0
 	done
 	set_checksum_type $ORIG_CSUM_TYPE
 	set_checksums 0
 }
-run_test 77f "repeat checksum error on write (expect error) ===="
+run_test 77f "repeat checksum error on write (expect error)"
 
 test_77g() { # bug 10889
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -5378,32 +5445,24 @@ test_77g() { # bug 10889
 
 	[ ! -f $F77_TMP ] && setup_f77
 
-	$SETSTRIPE -c 1 -i 0 $DIR/f77g
+	$SETSTRIPE -c 1 -i 0 $DIR/$tfile
 	#define OBD_FAIL_OST_CHECKSUM_RECEIVE       0x21a
 	do_facet ost1 lctl set_param fail_loc=0x8000021a
 	set_checksums 1
-	dd if=$F77_TMP of=$DIR/f77g bs=1M count=$F77SZ || \
+	dd if=$F77_TMP of=$DIR/$tfile bs=1M count=$F77SZ ||
 		error "write error: rc=$?"
 	do_facet ost1 lctl set_param fail_loc=0
 	set_checksums 0
-}
-run_test 77g "checksum error on OST write ======================"
 
-test_77h() { # bug 10889
-	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	$GSS && skip "could not run with gss" && return
-	remote_ost_nodsh && skip "remote OST with nodsh" && return
-
-	[ ! -f $DIR/f77g ] && skip "requires 77g - skipping" && return
 	cancel_lru_locks osc
 	#define OBD_FAIL_OST_CHECKSUM_SEND          0x21b
 	do_facet ost1 lctl set_param fail_loc=0x8000021b
 	set_checksums 1
-	cmp $F77_TMP $DIR/f77g || error "file compare failed"
+	cmp $F77_TMP $DIR/$tfile || error "file compare failed"
 	do_facet ost1 lctl set_param fail_loc=0
 	set_checksums 0
 }
-run_test 77h "checksum error on OST read ======================="
+run_test 77g "checksum error on OST write, read"
 
 test_77i() { # bug 13805
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -5419,7 +5478,7 @@ test_77i() { # bug 13805
 	done
 	remount_client $MOUNT
 }
-run_test 77i "client not supporting OSD_CONNECT_CKSUM =========="
+run_test 77i "client not supporting OSD_CONNECT_CKSUM"
 
 test_77j() { # bug 13805
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -5436,7 +5495,7 @@ test_77j() { # bug 13805
 	done
 	remount_client $MOUNT
 }
-run_test 77j "client only supporting ADLER32 ===================="
+run_test 77j "client only supporting ADLER32"
 
 [ "$ORIG_CSUM" ] && set_checksums $ORIG_CSUM || true
 rm -f $F77_TMP
@@ -5832,40 +5891,31 @@ test_101c() {
 	local STRIPE_SIZE=1048576
 	local FILE_LENGTH=$((STRIPE_SIZE*100))
 	local nreads=10000
-	local osc
-
-    setup_test101bc
-
-    cancel_lru_locks osc
-    $LCTL set_param osc.*.rpc_stats 0
-    $READS -f $DIR/$tfile -s$FILE_LENGTH -b65536 -n$nreads -t 180
-    for osc in $($LCTL get_param -N osc.*); do
-        if [ "$osc" == "osc.num_refs" ]; then
-            continue
-        fi
+	local osc_rpc_stats
 
-        local lines=$($LCTL get_param -n ${osc}.rpc_stats | wc | awk '{print $1}')
-        if [ $lines -le 20 ]; then
-            continue
-        fi
+	setup_test101bc
 
-        local rpc4k=$($LCTL get_param -n ${osc}.rpc_stats |
-                                     awk '$1 == "1:" { print $2; exit; }')
-        local rpc8k=$($LCTL get_param -n ${osc}.rpc_stats |
-                                     awk '$1 == "2:" { print $2; exit; }')
-        local rpc16k=$($LCTL get_param -n ${osc}.rpc_stats |
-                                     awk '$1 == "4:" { print $2; exit; }')
-        local rpc32k=$($LCTL get_param -n ${osc}.rpc_stats |
-                                     awk '$1 == "8:" { print $2; exit; }')
-
-        [ $rpc4k != 0 ]  && error "Small 4k read IO ${rpc4k}!"
-        [ $rpc8k != 0 ]  && error "Small 8k read IO ${rpc8k}!"
-        [ $rpc16k != 0 ] && error "Small 16k read IO ${rpc16k}!"
-        [ $rpc32k != 0 ] && error "Small 32k read IO ${rpc32k}!"
-        echo "${osc} rpc check passed!"
-    done
-    cleanup_test101bc
-    true
+	cancel_lru_locks osc
+	$LCTL set_param osc.*.rpc_stats 0
+	$READS -f $DIR/$tfile -s$FILE_LENGTH -b65536 -n$nreads -t 180
+	for osc_rpc_stats in $($LCTL get_param -N osc.*.rpc_stats); do
+		local stats=$($LCTL get_param -n $osc_rpc_stats)
+		local lines=$(echo "$stats" | awk 'END {print NR;}')
+		local size
+
+		if [ $lines -le 20 ]; then
+			continue
+		fi
+		for size in 1 2 4 8; do
+			local rpc=$(echo "$stats" |
+				    awk '($1 == "'$size':") {print $2; exit; }')
+			[ $rpc != 0 ] &&
+				error "Small $((size*4))k read IO $rpc !"
+		done
+		echo "$osc_rpc_stats check passed!"
+	done
+	cleanup_test101bc
+	true
 }
 run_test 101c "check stripe_size aligned read-ahead ================="
 
@@ -5882,12 +5932,13 @@ test_101d() {
 
 	local space=$(df -P $DIR | tail -n 1 | awk '{ print $4 }')
 	[ $space -gt $((size * 1024)) ] ||
-		{ skip "Need free space ${size}M, have $space" && return; }
+		{ skip "Need free space ${size}M, have ${space}K" && return; }
 
-    echo Creating ${size}M test file $file
-    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
+	echo "Creating test file $file of size ${size}M with ${space}K free space"
+	$SETSTRIPE -c -1 $file || error "setstripe failed"
+	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
 
     echo Disable read-ahead
     local old_READAHEAD=$(set_read_ahead 0)
@@ -6313,7 +6364,15 @@ test_102l() {
 
 	return 0;
 }
-run_test 102l "listxattr filter test =================================="
+run_test 102l "listxattr size test =================================="
+
+test_102m() { # LU-3403 llite: error of listxattr when buffer is small
+	local path=$DIR/$tfile
+	touch $path
+
+	listxattr_size_check $path || error "listattr_size_check $path failed"
+}
+run_test 102m "Ensure listxattr fails on small bufffer ========"
 
 cleanup_test102
 
@@ -6578,53 +6637,79 @@ test_116a() { # was previously test_116()
 	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2 OSTs" && return
 
 	echo -n "Free space priority "
-	lctl get_param -n lov.*-clilov-*.qos_prio_free
+	do_facet $SINGLEMDS lctl get_param -n lo*.*-mdtlov.qos_prio_free |
+		head -1
 	declare -a AVAIL
 	free_min_max
-	[ $MINV -gt 960000 ] && skip "too much free space in OST$MINI, skip" &&\
-		return
 
-	# generate uneven OSTs
+	[ $MINV -eq 0 ] && skip "no free space in OST$MINI, skip" && return
+	trap simple_cleanup_common EXIT
+
+	# Check if we need to generate uneven OSTs
 	test_mkdir -p $DIR/$tdir/OST${MINI}
-	declare -i FILL
-	FILL=$(($MINV / 4))
-	echo "Filling 25% remaining space in OST${MINI} with ${FILL}Kb"
-	$SETSTRIPE -i $MINI -c 1 $DIR/$tdir/OST${MINI}||error "setstripe failed"
-	i=0
-	while [ $FILL -gt 0 ]; do
-	    i=$(($i + 1))
-	    dd if=/dev/zero of=$DIR/$tdir/OST${MINI}/$tfile-$i bs=2M count=1 2>/dev/null
-	    FILL=$(($FILL - 2048))
-	    echo -n .
-	done
-	FILL=$(($MINV / 4))
-	sync
-	sleep_maxage
+	local FILL=$(($MINV / 4))
+	local DIFF=$(($MAXV - $MINV))
+	local DIFF2=$(($DIFF * 100 / $MINV))
+
+	local threshold=$(do_facet $SINGLEMDS \
+		lctl get_param -n *.*MDT0000-mdtlov.qos_threshold_rr | head -1)
+	threshold=${threshold%%%}
+	echo -n "Check for uneven OSTs: "
+	echo -n "diff=${DIFF}KB (${DIFF2}%) must be > ${threshold}% ..."
+
+	if [ $DIFF2 -gt $threshold ]; then
+		echo "ok"
+		echo "Don't need to fill OST$MINI"
+	else
+		# generate uneven OSTs. Write 2% over the QOS threshold value
+		echo "no"
+		DIFF=$(($threshold - $DIFF2 + 2))
+		DIFF2=$(( ($MINV * $DIFF)/100 ))
+		echo "Fill ${DIFF}% remaining space in OST${MINI} with ${DIFF2}KB"
+		$SETSTRIPE -i $MINI -c 1 $DIR/$tdir/OST${MINI} ||
+			error "setstripe failed"
+		DIFF=$(($DIFF2 / 2048))
+		i=0
+		while [ $i -lt $DIFF ]; do
+			i=$(($i + 1))
+			dd if=/dev/zero of=$DIR/$tdir/OST${MINI}/$tfile-$i \
+				bs=2M count=1 2>/dev/null
+			echo -n .
+		done
+		echo .
+		sync
+		sleep_maxage
+		free_min_max
+	fi
 
-	free_min_max
 	DIFF=$(($MAXV - $MINV))
 	DIFF2=$(($DIFF * 100 / $MINV))
-	echo -n "diff=${DIFF}=${DIFF2}% must be > 20% for QOS mode..."
-	if [ $DIFF2 -gt 20 ]; then
-	    echo "ok"
+	echo -n "diff=${DIFF}=${DIFF2}% must be > ${threshold}% for QOS mode..."
+	if [ $DIFF2 -gt $threshold ]; then
+		echo "ok"
 	else
-	    echo "failed - QOS mode won't be used"
-	    error_ignore "QOS imbalance criteria not met"
-	    return
+		echo "failed - QOS mode won't be used"
+		error_ignore 0000 "QOS imbalance criteria not met"
+		simple_cleanup_common
+		return
 	fi
 
 	MINI1=$MINI; MINV1=$MINV
 	MAXI1=$MAXI; MAXV1=$MAXV
 
 	# now fill using QOS
-	echo writing a bunch of files to QOS-assigned OSTs
 	$SETSTRIPE -c 1 $DIR/$tdir
+	FILL=$(($FILL / 200))
+	if [ $FILL -gt 600 ]; then
+		FILL=600
+	fi
+	echo "writing $FILL files to QOS-assigned OSTs"
 	i=0
-	while [ $FILL -gt 0 ]; do
-	    i=$(($i + 1))
-	    dd if=/dev/zero of=$DIR/$tdir/$tfile-$i bs=1024 count=200 2>/dev/null
-	    FILL=$(($FILL - 200))
-	    echo -n .
+	while [ $i -lt $FILL ]; do
+		i=$(($i + 1))
+		dd if=/dev/zero of=$DIR/$tdir/$tfile-$i bs=200k \
+			count=1 2>/dev/null
+		echo -n .
 	done
 	echo "wrote $i 200k files"
 	sync
@@ -6636,26 +6721,31 @@ test_116a() { # was previously test_116()
 	echo "free space delta: orig $DIFF final $DIFF2"
 	[ $DIFF2 -gt $DIFF ] && echo "delta got worse!"
 	DIFF=$(($MINV1 - ${AVAIL[$MINI1]}))
-	echo "Wrote $DIFF to smaller OST $MINI1"
+	echo "Wrote ${DIFF}KB to smaller OST $MINI1"
 	DIFF2=$(($MAXV1 - ${AVAIL[$MAXI1]}))
-	echo "Wrote $DIFF2 to larger OST $MAXI1"
-	[ $DIFF -gt 0 ] && echo "Wrote $(($DIFF2 * 100 / $DIFF - 100))% more data to larger OST $MAXI1"
+	echo "Wrote ${DIFF2}KB to larger OST $MAXI1"
+	FILL=$(($DIFF2 * 100 / $DIFF - 100))
+	[ $DIFF -gt 0 ] &&
+		echo "Wrote ${FILL}% more data to larger OST $MAXI1"
 
 	# Figure out which files were written where
 	UUID=$(lctl get_param -n lov.${FSNAME}-clilov-*.target_obd |
-               awk '/'$MINI1': / {print $2; exit}')
+		  awk '/'$MINI1': / {print $2; exit}')
 	echo $UUID
-        MINC=$($GETSTRIPE --obd $UUID $DIR/$tdir | wc -l)
+	MINC=$($GETSTRIPE --ost $UUID $DIR/$tdir | grep $DIR | wc -l)
 	echo "$MINC files created on smaller OST $MINI1"
 	UUID=$(lctl get_param -n lov.${FSNAME}-clilov-*.target_obd |
-               awk '/'$MAXI1': / {print $2; exit}')
+		  awk '/'$MAXI1': / {print $2; exit}')
 	echo $UUID
-        MAXC=$($GETSTRIPE --obd $UUID $DIR/$tdir | wc -l)
+	MAXC=$($GETSTRIPE --ost $UUID $DIR/$tdir | grep $DIR | wc -l)
 	echo "$MAXC files created on larger OST $MAXI1"
-	[ $MINC -gt 0 ] && echo "Wrote $(($MAXC * 100 / $MINC - 100))% more files to larger OST $MAXI1"
-	[ $MAXC -gt $MINC ] || error_ignore "stripe QOS didn't balance free space"
+	FILL=$(($MAXC * 100 / $MINC - 100))
+	[ $MINC -gt 0 ] &&
+		echo "Wrote ${FILL}% more files to larger OST $MAXI1"
+	[ $MAXC -gt $MINC ] ||
+		error_ignore 0000 "stripe QOS didn't balance free space"
 
-	rm -rf $DIR/$tdir
+	simple_cleanup_common
 }
 run_test 116a "stripe QOS: free space balance ==================="
 
@@ -8001,10 +8091,14 @@ test_130d() {
 	$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"
+
+	local actual_stripecnt=$($GETSTRIPE -c $fm_file)
+	dd if=/dev/zero of=$fm_file bs=1M count=$actual_stripecnt ||
+		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`
 
@@ -8028,7 +8122,7 @@ test_130d() {
 		(( tot_len += ext_len ))
 		last_lun=$frag_lun
 	done
-	if (( num_luns != OSTCOUNT || tot_len != 1024 )); then
+	if (( num_luns != actual_stripecnt || tot_len != 1024 )); then
 		cleanup_130
 		error "FIEMAP on $fm_file failed; returned wrong number of luns or wrong len for OST $last_lun"
 		return
@@ -8615,12 +8709,48 @@ test_150() {
 }
 run_test 150 "truncate/append tests"
 
+#LU-2902 roc_hit was not able to read all values from lproc
+function roc_hit_init() {
+	local list=$(comma_list $(osts_nodes))
+	local dir=$DIR/$tdir-check
+	local file=$dir/file
+	local BEFORE
+	local AFTER
+	local idx
+
+	test_mkdir -p $dir
+	#use setstripe to do a write to every ost
+	for i in $(seq 0 $((OSTCOUNT-1))); do
+		$SETSTRIPE -c 1 -i $i $dir || error "$SETSTRIPE $file failed"
+		dd if=/dev/urandom of=$file bs=4k count=4 2>&1 > /dev/null
+		idx=$(printf %04x $i)
+		BEFORE=$(get_osd_param $list *OST*$idx stats |
+		    awk '$1 == "cache_access" {sum += $2} END { print sum }')
+		if [ -z "$BEFORE" ]; then
+			BEFORE=0
+		fi
+
+		cancel_lru_locks osc
+		cat $file >/dev/null
+
+		AFTER=$(get_osd_param $list *OST*$idx stats |
+		    awk '$1 == "cache_access" {sum += $2} END { print sum }')
+
+		echo BEFORE:$BEFORE AFTER:$AFTER
+		if ! let "AFTER - BEFORE == 4"; then
+			rm -rf $dir
+			error "roc_hit is not safe to use"
+		fi
+		rm $file
+	done
+
+	rm -rf $dir
+}
+
 function roc_hit() {
 	local list=$(comma_list $(osts_nodes))
-	#debug temp debug for LU-2902: lets see what values we get back
-	echo $(get_osd_param $list '' stats) 1>&2
 	echo $(get_osd_param $list '' stats |
-	       awk '/'cache_hit'/ {sum+=$2} END {print sum}')
+		awk '$1 == "cache_hit" {sum += $2} END { print sum }')
 }
 
 function set_cache() {
@@ -8662,6 +8792,8 @@ test_151() {
 		return 0
 	fi
 
+	roc_hit_init
+
 	#define OBD_FAIL_OBD_NO_LRU  0x609
 	do_nodes $list $LCTL set_param fail_loc=0x609
 
@@ -8814,20 +8946,23 @@ dot_lustre_fid_permission_check() {
 	mrename $test_dir/$tdir $MOUNT/.lustre/fid &&
 		error "rename to $MOUNT/.lustre/fid should fail."
 
-	local old_obf_mode=$(stat --format="%a" $DIR/.lustre/fid)
-	local new_obf_mode=777
+	if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.51) ]
+	then		# LU-3547
+		local old_obf_mode=$(stat --format="%a" $DIR/.lustre/fid)
+		local new_obf_mode=777
 
-	echo "change mode of $DIR/.lustre/fid to $new_obf_mode"
-	chmod $new_obf_mode $DIR/.lustre/fid ||
-		error "chmod $new_obf_mode $DIR/.lustre/fid failed"
+		echo "change mode of $DIR/.lustre/fid to $new_obf_mode"
+		chmod $new_obf_mode $DIR/.lustre/fid ||
+			error "chmod $new_obf_mode $DIR/.lustre/fid failed"
 
-	local obf_mode=$(stat --format=%a $DIR/.lustre/fid)
-	[ $obf_mode -eq $new_obf_mode ] ||
-		error "stat $DIR/.lustre/fid returned wrong mode $obf_mode"
+		local obf_mode=$(stat --format=%a $DIR/.lustre/fid)
+		[ $obf_mode -eq $new_obf_mode ] ||
+			error "stat $DIR/.lustre/fid returned wrong mode $obf_mode"
 
-	echo "restore mode of $DIR/.lustre/fid to $old_obf_mode"
-	chmod $old_obf_mode $DIR/.lustre/fid ||
-		error "chmod $old_obf_mode $DIR/.lustre/fid failed"
+		echo "restore mode of $DIR/.lustre/fid to $old_obf_mode"
+		chmod $old_obf_mode $DIR/.lustre/fid ||
+			error "chmod $old_obf_mode $DIR/.lustre/fid failed"
+	fi
 
 	$OPENFILE -f O_LOV_DELAY_CREATE:O_CREAT $test_dir/$tfile-2
 	fid=$($LFS path2fid $test_dir/$tfile-2)
@@ -8845,6 +8980,24 @@ dot_lustre_fid_permission_check() {
 	rm -rf $test_dir/$tfile-2
 }
 
+test_154A() {
+	[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.1) ]] &&
+		skip "Need MDS version at least 2.4.1" && return
+
+	touch $DIR/$tfile
+	local FID=$($LFS path2fid $DIR/$tfile)
+	[ -z "$FID" ] && error "path2fid unable to get $DIR/$tfile FID"
+
+	# check that we get the same pathname back
+	local FOUND=$($LFS fid2path $MOUNT $FID)
+	[ -z "$FOUND" ] && error "fid2path unable to get $FID path"
+	[ "$FOUND" != "$DIR/$tfile" ] &&
+		error "fid2path(path2fid($DIR/$tfile)) = $FOUND != $DIR/$tfile"
+
+	rm -rf $DIR/$tfile
+}
+run_test 154A "lfs path2fid and fid2path basic checks"
+
 test_154a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] ||
@@ -8898,6 +9051,33 @@ test_154b() {
 }
 run_test 154b "Open-by-FID for remote directory"
 
+test_154c() {
+	[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.1) ]] &&
+		skip "Need MDS version at least 2.4.1" && return
+
+	touch $DIR/$tfile.1 $DIR/$tfile.2 $DIR/$tfile.3
+	local FID1=$($LFS path2fid $DIR/$tfile.1)
+	local FID2=$($LFS path2fid $DIR/$tfile.2)
+	local FID3=$($LFS path2fid $DIR/$tfile.3)
+
+	local N=1
+	$LFS path2fid $DIR/$tfile.[123] | while read PATHNAME FID; do
+		[ "$PATHNAME" = "$DIR/$tfile.$N:" ] ||
+			error "path2fid pathname $PATHNAME != $DIR/$tfile.$N:"
+		local want=FID$N
+		[ "$FID" = "${!want}" ] ||
+			error "path2fid $PATHNAME FID $FID != FID$N ${!want}"
+		N=$((N + 1))
+	done
+
+	$LFS fid2path $MOUNT $FID1 $FID2 $FID3 | while read PATHNAME; do
+		[ "$PATHNAME" = "$DIR/$tfile.$N" ] ||
+			error "fid2path pathname $PATHNAME != $DIR/$tfile.$N:"
+		N=$((N + 1))
+	done
+}
+run_test 154c "lfs path2fid and fid2path multiple arguments"
+
 test_155_small_load() {
     local temp=$TMP/$tfile
     local file=$DIR/$tfile
@@ -9029,6 +9209,8 @@ test_156() {
 		skip "LU-1956/LU-2261: stats unimplemented on OSD ZFS" &&
 		return
 
+	roc_hit_init
+
     log "Turn on read and write cache"
     set_cache read on
     set_cache writethrough on
@@ -9183,7 +9365,18 @@ changelog_chmask()
 	fi
 }
 
-test_160() {
+changelog_extract_field() {
+	local mdt=$1
+	local cltype=$2
+	local file=$3
+	local identifier=$4
+
+	$LFS changelog $mdt | gawk "/$cltype.*$file$/ {
+		print gensub(/^.* "$identifier'(\[[^\]]*\]).*$/,"\\1",1)}' |
+		tail -1
+}
+
+test_160a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] ||
@@ -9228,14 +9421,14 @@ test_160() {
 
 	# verify contents
 	echo "verifying target fid"
-	fidc=$($LFS changelog $MDT0|awk '/CREAT.*timestamp$/{print $6}'|tail -1)
+	fidc=$(changelog_extract_field $MDT0 "CREAT" "timestamp" "t=")
 	fidf=$($LFS path2fid $DIR/$tdir/pics/zach/timestamp)
-	[ "$fidc" == "t=$fidf" ] ||
+	[ "$fidc" == "$fidf" ] ||
 		err17935 "fid in changelog $fidc != file fid $fidf"
 	echo "verifying parent fid"
-	fidc=$($LFS changelog $MDT0|awk '/CREAT.*timestamp$/{print $7}'|tail -1)
+	fidc=$(changelog_extract_field $MDT0 "CREAT" "timestamp" "p=")
 	fidf=$($LFS path2fid $DIR/$tdir/pics/zach)
-	[ "$fidc" == "p=$fidf" ] ||
+	[ "$fidc" == "$fidf" ] ||
 		err17935 "pfid in changelog $fidc != dir fid $fidf"
 
 	USER_REC1=$($GET_CL_USERS | awk "\$1 == \"$USER\" {print \$2}")
@@ -9279,7 +9472,38 @@ test_160() {
 		echo "$USERS other changelog users; can't verify off"
 	fi
 }
-run_test 160 "changelog sanity"
+run_test 160a "changelog sanity"
+
+test_160b() { # LU-3587
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] ||
+		{ skip "Need MDS version at least 2.2.0"; return; }
+
+	local CL_USERS="mdd.$MDT0.changelog_users"
+	local GET_CL_USERS="do_facet $SINGLEMDS $LCTL get_param -n $CL_USERS"
+	USER=$(do_facet $SINGLEMDS $LCTL --device $MDT0 changelog_register -n)
+	echo "Registered as changelog user $USER"
+	$GET_CL_USERS | grep -q $USER ||
+		error "User $USER not found in changelog_users"
+
+	local LONGNAME1=$(str_repeat a 255)
+	local LONGNAME2=$(str_repeat b 255)
+
+	cd $DIR
+	echo "creating very long named file"
+	touch $LONGNAME1 || error "create of $LONGNAME1 failed"
+	echo "moving very long named file"
+	mv $LONGNAME1 $LONGNAME2
+
+	$LFS changelog $MDT0 | grep RENME
+
+	echo "deregistering $USER"
+	do_facet $SINGLEMDS $LCTL --device $MDT0 changelog_deregister $USER
+
+	rm -f $LONGNAME2
+}
+run_test 160b "Verify that very long rename doesn't crash in changelog"
 
 test_161a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -9375,6 +9599,93 @@ test_161b() {
 }
 run_test 161b "link ea sanity under remote directory"
 
+test_161c() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.1.5) ]] &&
+		skip "Need MDS version at least 2.1.5" && return
+
+	# define CLF_RENAME_LAST 0x0001
+	# rename overwrite a target having nlink = 1 (changelog flag 0x1)
+	local USER=$(do_facet $SINGLEMDS $LCTL --device $MDT0 \
+		changelog_register -n)
+	rm -rf $DIR/$tdir
+	mkdir -p $DIR/$tdir
+	touch $DIR/$tdir/foo_161c
+	touch $DIR/$tdir/bar_161c
+	mv -f $DIR/$tdir/foo_161c $DIR/$tdir/bar_161c
+	$LFS changelog $MDT0 | grep RENME
+	local flags=$($LFS changelog $MDT0 | grep RENME | tail -1 | \
+		cut -f5 -d' ')
+	$LFS changelog_clear $MDT0 $USER 0
+	if [ x$flags != "x0x1" ]; then
+		do_facet $SINGLEMDS $LCTL --device $MDT0 changelog_deregister \
+			$USER
+		error "flag $flags is not 0x1"
+	fi
+	echo "rename overwrite a target having nlink = 1," \
+		"changelog record has flags of $flags"
+
+	# rename overwrite a target having nlink > 1 (changelog flag 0x0)
+	touch $DIR/$tdir/foo_161c
+	touch $DIR/$tdir/bar_161c
+	ln $DIR/$tdir/bar_161c $DIR/$tdir/foobar_161c
+	mv -f $DIR/$tdir/foo_161c $DIR/$tdir/bar_161c
+	$LFS changelog $MDT0 | grep RENME
+	flags=$($LFS changelog $MDT0 | grep RENME | tail -1 | cut -f5 -d' ')
+	$LFS changelog_clear $MDT0 $USER 0
+	if [ x$flags != "x0x0" ]; then
+		do_facet $SINGLEMDS $LCTL --device $MDT0 changelog_deregister \
+			$USER
+		error "flag $flags is not 0x0"
+	fi
+	echo "rename overwrite a target having nlink > 1," \
+		"changelog record has flags of $flags"
+
+	# rename doesn't overwrite a target (changelog flag 0x0)
+	touch $DIR/$tdir/foo_161c
+	mv -f $DIR/$tdir/foo_161c $DIR/$tdir/foo2_161c
+	$LFS changelog $MDT0 | grep RENME
+	flags=$($LFS changelog $MDT0 | grep RENME | tail -1 | cut -f5 -d' ')
+	$LFS changelog_clear $MDT0 $USER 0
+	if [ x$flags != "x0x0" ]; then
+		do_facet $SINGLEMDS $LCTL --device $MDT0 changelog_deregister \
+			$USER
+		error "flag $flags is not 0x0"
+	fi
+	echo "rename doesn't overwrite a target," \
+		"changelog record has flags of $flags"
+
+	# define CLF_UNLINK_LAST 0x0001
+	# unlink a file having nlink = 1 (changelog flag 0x1)
+	rm -f $DIR/$tdir/foo2_161c
+	$LFS changelog $MDT0 | grep UNLNK
+	flags=$($LFS changelog $MDT0 | grep UNLNK | tail -1 | cut -f5 -d' ')
+	$LFS changelog_clear $MDT0 $USER 0
+	if [ x$flags != "x0x1" ]; then
+		do_facet $SINGLEMDS $LCTL --device $MDT0 changelog_deregister \
+			$USER
+		error "flag $flags is not 0x1"
+	fi
+	echo "unlink a file having nlink = 1," \
+		"changelog record has flags of $flags"
+
+	# unlink a file having nlink > 1 (changelog flag 0x0)
+	ln -f $DIR/$tdir/bar_161c $DIR/$tdir/foobar_161c
+	rm -f $DIR/$tdir/foobar_161c
+	$LFS changelog $MDT0 | grep UNLNK
+	flags=$($LFS changelog $MDT0 | grep UNLNK | tail -1 | cut -f5 -d' ')
+	$LFS changelog_clear $MDT0 $USER 0
+	if [ x$flags != "x0x0" ]; then
+		do_facet $SINGLEMDS $LCTL --device $MDT0 changelog_deregister \
+			$USER
+		error "flag $flags is not 0x0"
+	fi
+	echo "unlink a file having nlink > 1," \
+		"changelog record has flags of $flags"
+	do_facet $SINGLEMDS $LCTL --device $MDT0 changelog_deregister $USER
+}
+run_test 161c "check CL_RENME[UNLINK] changelog record flags"
+
 check_path() {
     local expected=$1
     shift
@@ -9437,20 +9748,6 @@ test_162() {
 }
 run_test 162 "path lookup sanity"
 
-test_163() {
-	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	remote_mds_nodsh && skip "remote MDS with nodsh" && return
-	copytool --test $FSNAME || { skip "copytool not runnable: $?" && return; }
-	copytool $FSNAME &
-	sleep 1
-	local uuid=$($LCTL get_param -n mdc.${FSNAME}-MDT0000-mdc-*.uuid)
-	# this proc file is temporary and linux-only
-	do_facet $SINGLEMDS lctl set_param mdt.${FSNAME}-MDT0000.mdccomm=$uuid ||\
-         error "kernel->userspace send failed"
-	kill -INT $!
-}
-run_test 163 "kernel <-> userspace comms"
-
 test_169() {
 	# do directio so as not to populate the page cache
 	log "creating a 10 Mb file"
@@ -9707,6 +10004,9 @@ test_182() {
 run_test 182 "Disable MDC RPCs semaphore wouldn't crash client ================"
 
 test_183() { # LU-2275
+	[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.56) ]] &&
+		skip "Need MDS version at least 2.3.56" && return
+
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
 	echo aaa > $DIR/$tdir/$tfile
@@ -9866,6 +10166,10 @@ run_test 184d "allow stripeless layouts swap"
 
 
 test_185() { # LU-2441
+	# LU-3553 - no volatile file support in old servers
+	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.60) ]] ||
+		{ skip "Need MDS version at least 2.3.60"; return 0; }
+
 	mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
 	touch $DIR/$tdir/spoo
 	local mtime1=$(stat -c "%Y" $DIR/$tdir)
@@ -10487,6 +10791,57 @@ test_207b() {
 }
 run_test 207b "can refresh layout at open"
 
+test_208() {
+	# FIXME: in this test suite, only RD lease is used. This is okay
+	# for now as only exclusive open is supported. After generic lease
+	# is done, this test suite should be revised. - Jinshan
+
+	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.4.52) ]] ||
+		{ skip "Need MDS version at least 2.4.52"; return 0; }
+
+	echo "==== test 1: verify get lease work"
+	$MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:eRE+eU || error "get lease error"
+
+	echo "==== test 2: verify lease can be broken by upcoming open"
+	$MULTIOP $DIR/$tfile oO_RDONLY:eR_E-eUc &
+	local PID=$!
+	sleep 1
+
+	$MULTIOP $DIR/$tfile oO_RDONLY:c
+	kill -USR1 $PID && wait $PID || error "break lease error"
+
+	echo "==== test 3: verify lease can't be granted if an open already exists"
+	$MULTIOP $DIR/$tfile oO_RDONLY:_c &
+	local PID=$!
+	sleep 1
+
+	$MULTIOP $DIR/$tfile oO_RDONLY:eReUc && error "apply lease should fail"
+	kill -USR1 $PID && wait $PID || error "open file error"
+
+	echo "==== test 4: lease can sustain over recovery"
+	$MULTIOP $DIR/$tfile oO_RDONLY:eR_E+eUc &
+	PID=$!
+	sleep 1
+
+	fail mds1
+
+	kill -USR1 $PID && wait $PID || error "lease broken over recovery"
+
+	echo "==== test 5: lease broken can't be regained by replay"
+	$MULTIOP $DIR/$tfile oO_RDONLY:eR_E-eUc &
+	PID=$!
+	sleep 1
+
+	# open file to break lease and then recovery
+	$MULTIOP $DIR/$tfile oO_RDWR:c || error "open file error"
+	fail mds1
+
+	kill -USR1 $PID && wait $PID || error "lease not broken over recovery"
+
+	rm -f $DIR/$tfile
+}
+run_test 208 "Exclusive open"
+
 test_212() {
 	size=`date +%s`
 	size=$((size % 8192 + 1))
@@ -10508,14 +10863,15 @@ test_213() {
 run_test 213 "OSC lock completion and cancel race don't crash - bug 18829"
 
 test_214() { # for bug 20133
-	test_mkdir -p $DIR/d214p/d214c
+	mkdir -p $DIR/$tdir/d214c || error "mkdir $DIR/$tdir/d214c failed"
 	for (( i=0; i < 340; i++ )) ; do
-		touch $DIR/d214p/d214c/a$i
+		touch $DIR/$tdir/d214c/a$i
 	done
 
-	ls -l $DIR/d214p || error "ls -l $DIR/d214p failed"
-	mv $DIR/d214p/d214c $DIR/ || error "mv $DIR/d214p/d214c $DIR/ failed"
+	ls -l $DIR/$tdir || error "ls -l $DIR/d214p failed"
+	mv $DIR/$tdir/d214c $DIR/ || error "mv $DIR/d214p/d214c $DIR/ failed"
 	ls $DIR/d214c || error "ls $DIR/d214c failed"
+	rm -rf $DIR/$tdir || error "rm -rf $DIR/d214* failed"
 	rm -rf $DIR/d214* || error "rm -rf $DIR/d214* failed"
 }
 run_test 214 "hash-indexed directory test - bug 20133"
@@ -10587,12 +10943,13 @@ test_215() { # for bugs 18102, 21079, 21517
 
 	# /proc/sys/lnet/routes should look like this:
 	# Routing disabled/enabled
-	# net hops state router
-	# where net is a string like tcp0, hops >= 0, state is up/down,
+	# net hops priority state router
+	# where net is a string like tcp0, hops > 0, priority >= 0,
+	# state is up/down,
 	# router is a string like 192.168.1.1@tcp2
 	L1="^Routing (disabled|enabled)$"
-	L2="^net +hops +state +router$"
-	BR="^$NET +$N +(up|down) +$NID$"
+	L2="^net +hops +priority +state +router$"
+	BR="^$NET +$N +(0|1) +(up|down) +$NID$"
 	create_lnet_proc_files "routes"
 	check_lnet_proc_entry "routes.out" "/proc/sys/lnet/routes" "$BR" "$L1" "$L2"
 	check_lnet_proc_entry "routes.sys" "lnet.routes" "$BR" "$L1" "$L2"
@@ -11167,29 +11524,23 @@ test_229() { # LU-2482, LU-3448
 
 	$GETSTRIPE -v $DIR/$tfile
 
-	local pattern=$($GETSTRIPE -v $DIR/$tfile |
-			grep lmm_stripe_pattern | awk '{print $2}')
+	local pattern=$($GETSTRIPE -L $DIR/$tfile)
 	[ X"$pattern" = X"80000001" ] || error "pattern error ($pattern)"
 
 	local stripe_count=$($GETSTRIPE -c $DIR/$tfile) || error "getstripe"
 	[ $stripe_count -eq 2 ] || error "stripe count not 2 ($stripe_count)"
 	stat $DIR/$tfile || error "failed to stat released file"
 
-	# Truncate should fail.
-	$TRUNCATE $DIR/$tfile 200000 &&
-		error "truncate of released file should fail"
-
-	# Ensure that nothing happened anyway.
-	$CHECKSTAT -s 0 $DIR/$tfile ||
-		error "released file size should not change"
+	chown $RUNAS_ID $DIR/$tfile ||
+		error "chown $RUNAS_ID $DIR/$tfile failed"
 
-	# Stripe count should be no change after truncate
-	stripe_count=$($GETSTRIPE -c $DIR/$tfile) || error "getstripe failed"
-	[ $stripe_count -eq 2 ] || error "after trunc: ($stripe_count)"
+	chgrp $RUNAS_ID $DIR/$tfile ||
+		error "chgrp $RUNAS_ID $DIR/$tfile failed"
 
+	touch $DIR/$tfile || error "touch $DIR/$tfile failed"
 	rm $DIR/$tfile || error "failed to remove released file"
 }
-run_test 229 "getstripe/stat/rm work on released files (stripe count = 2)"
+run_test 229 "getstripe/stat/rm/attr changes work on released files"
 
 test_230a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -11318,12 +11669,81 @@ test_232() {
 run_test 232 "failed lock should not block umount"
 
 test_233() {
+	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.64) ] ||
+	{ skip "Need MDS version at least 2.3.64"; return; }
+
 	local fid=$($LFS path2fid $MOUNT)
 	stat $MOUNT/.lustre/fid/$fid > /dev/null ||
 		error "cannot access $MOUNT using its FID '$fid'"
 }
 run_test 233 "checking that OBF of the FS root succeeds"
 
+test_234() {
+	local p="$TMP/sanityN-$TESTNAME.parameters"
+	save_lustre_params client "llite.*.xattr_cache" > $p
+	lctl set_param llite.*.xattr_cache 1 ||
+		{ skip "xattr cache is not supported"; return 0; }
+
+	mkdir -p $DIR/$tdir || error "mkdir failed"
+	touch $DIR/$tdir/$tfile || error "touch failed"
+	# OBD_FAIL_LLITE_XATTR_ENOMEM
+	$LCTL set_param fail_loc=0x1405
+	if [ ! -f /etc/SuSE-release ]; then
+		# attr pre-2.4.44-7 had a bug with rc
+		# LU-3703 - SLES clients have older attr
+		getfattr -n user.attr $DIR/$tdir/$tfile &&
+			error "getfattr should have failed with ENOMEM"
+	fi
+	$LCTL set_param fail_loc=0x0
+	rm -rf $DIR/$tdir
+
+	restore_lustre_params < $p
+	rm -f $p
+}
+run_test 234 "xattr cache should not crash on ENOMEM"
+
+test_235() {
+	 [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.52) ] &&
+		skip "Need MDS version at least 2.4.52" && return
+	flock_deadlock $DIR/$tfile
+	local RC=$?
+	case $RC in
+		0)
+		;;
+		124) error "process hangs on a deadlock"
+		;;
+		*) error "error executing flock_deadlock $DIR/$tfile"
+		;;
+	esac
+}
+run_test 235 "LU-1715: flock deadlock detection does not work properly"
+
+#LU-2935
+test_236() {
+	check_swap_layouts_support && return 0
+	test_mkdir -p $DIR/$tdir || error "mkdir $tdir failed"
+
+	local ref1=/etc/passwd
+	local ref2=/etc/group
+	local file1=$DIR/$tdir/f1
+	local file2=$DIR/$tdir/f2
+
+	$SETSTRIPE -c 1 $file1 || error "cannot setstripe on '$file1': rc = $?"
+	cp $ref1 $file1 || error "cp $ref1 $file1 failed: rc = $?"
+	$SETSTRIPE -c 2 $file2 || error "cannot setstripe on '$file2': rc = $?"
+	cp $ref2 $file2 || error "cp $ref2 $file2 failed: rc = $?"
+	exec {FD}<>$file2
+	rm $file2
+	$LFS swap_layouts $file1 /proc/self/fd/${FD} ||
+		error "cannot swap layouts of '$file1' and /proc/self/fd/${FD}"
+	exec {FD}>&-
+	cmp $ref2 $file1 || error "content compare failed ($ref2 != $file1)"
+
+	#cleanup
+	rm -rf $DIR/$tdir
+}
+run_test 236 "Layout swap on open unlinked file"
+
 #
 # tests that do cleanup/setup should be run at the end
 #