X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=87d9bade292be1093732f7c58ffa4aa474703c4b;hb=6c2bbc022832087f2ff0f65d83e3b0a460e45911;hp=f43e434304ddba4fb7b661ed9aaf5b1b60ea515d;hpb=9126d8159d5d5b61a600e7427d0c173084a710e6;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
old mode 100755
new mode 100644
index f43e434..87d9bad
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -8,13 +8,13 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 13297 2108 9789 3637 9789 3561 12622 5188
-ALWAYS_EXCEPT="                42a  42b  42c  42d  45   51d   68b   $SANITY_EXCEPT"
+# bug number for skipped test: 13297 2108 9789 3637 9789 3561 5188
+ALWAYS_EXCEPT="                42a  42b  42c  42d  45   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"
+# bug number for skipped tests: LU-2036 LU-8139
+ALWAYS_EXCEPT="                 76	101g	$ALWAYS_EXCEPT"
 
 is_sles11()						# LU-4341
 {
@@ -75,11 +75,13 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/${NAME}.sh}
 init_logging
 
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="24o 24D 27m 64b 68 71 77f 78 115 124b 300o"
+#                                  5              12          (min)"
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="24D 27m 64b 68 71 115 300o"
 
 if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
 	# bug number for skipped test: LU-4536 LU-1957 LU-2805
 	ALWAYS_EXCEPT="$ALWAYS_EXCEPT  65ic    180     184c"
+	#                                               4   13    (min)"
 	[ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 51b 51ba"
 fi
 
@@ -105,17 +107,11 @@ check_swap_layouts_support()
 }
 
 check_and_setup_lustre
-
 DIR=${DIR:-$MOUNT}
 assert_DIR
 
 MDT0=$($LCTL get_param -n mdc.*.mds_server_uuid |
 	awk '{ gsub(/_UUID/,""); print $1 }' | head -n1)
-LOVNAME=$($LCTL get_param -n llite.*.lov.common_name | tail -n 1)
-OSTCOUNT=$($LCTL get_param -n lov.$LOVNAME.numobd)
-STRIPECOUNT=$($LCTL get_param -n lov.$LOVNAME.stripecount)
-STRIPESIZE=$($LCTL get_param -n lov.$LOVNAME.stripesize)
-ORIGFREE=$($LCTL get_param -n lov.$LOVNAME.kbytesavail)
 MAXFREE=${MAXFREE:-$((200000 * $OSTCOUNT))}
 
 [ -f $DIR/d52a/foo ] && chattr -a $DIR/d52a/foo
@@ -556,11 +552,7 @@ run_test 17l "Ensure lgetxattr's returned xattr size is consistent ========"
 test_17m() {
 	local short_sym="0123456789"
 	local WDIR=$DIR/${tdir}m
-	local mds_index
-	local devname
-	local cmd
 	local i
-	local rc=0
 
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.0) ] &&
@@ -593,49 +585,42 @@ test_17m() {
 	echo "recreate the 512 symlink files with a shorter string"
 	for ((i = 0; i < 512; ++i)); do
 		# rewrite the symlink file with a shorter string
-		ln -sf ${long_sym} $WDIR/long-$i
-		ln -sf ${short_sym} $WDIR/short-$i
+		ln -sf ${long_sym} $WDIR/long-$i || error "long_sym failed"
+		ln -sf ${short_sym} $WDIR/short-$i || error "short_sym failed"
 	done
 
-	mds_index=$($LFS getstripe -M $WDIR)
-	mds_index=$((mds_index+1))
-	devname=$(mdsdevname $mds_index)
-	cmd="$E2FSCK -fnvd $devname"
+	local mds_index=$(($($LFS getstripe -M $WDIR) + 1))
+	local devname=$(mdsdevname $mds_index)
 
-	echo "stop and checking mds${mds_index}: $cmd"
+	echo "stop and checking mds${mds_index}:"
 	# e2fsck should not return error
 	stop mds${mds_index}
-	do_facet mds${mds_index} $cmd || rc=$?
+	run_e2fsck $(facet_active_host mds${mds_index}) $devname -n
+	rc=$?
 
 	start mds${mds_index} $devname $MDS_MOUNT_OPTS || error "start failed"
 	df $MOUNT > /dev/null 2>&1
-	[ $rc -ne 0 ] && error "e2fsck should not report error upon "\
-		"short/long symlink MDT: rc=$rc"
-	return $rc
+	[ $rc -eq 0 ] ||
+		error "e2fsck detected error for short/long symlink: rc=$rc"
 }
 run_test 17m "run e2fsck against MDT which contains short/long symlink"
 
 check_fs_consistency_17n() {
 	local mdt_index
-	local devname
-	local cmd
 	local rc=0
 
 	# create/unlink in 17n only change 2 MDTs(MDT1/MDT2),
 	# so it only check MDT1/MDT2 instead of all of MDTs.
-	for mdt_index in $(seq 1 2); do
-		devname=$(mdsdevname $mdt_index)
-		cmd="$E2FSCK -fnvd $devname"
-
-		echo "stop and checking mds${mdt_index}: $cmd"
+	for mdt_index in 1 2; do
+		local devname=$(mdsdevname $mdt_index)
 		# e2fsck should not return error
 		stop mds${mdt_index}
-		do_facet mds${mdt_index} $cmd || rc=$?
+		run_e2fsck $(facet_active_host mds$mdt_index) $devname -n ||
+			rc=$((rc + $?))
 
 		start mds${mdt_index} $devname $MDS_MOUNT_OPTS ||
-			error "mount mds${mdt_index} failed"
+			error "mount mds$mdt_index failed"
 		df $MOUNT > /dev/null 2>&1
-		[ $rc -ne 0 ] && break
 	done
 	return $rc
 }
@@ -1097,6 +1082,10 @@ run_test 24w "Reading a file larger than 4Gb"
 
 test_24x() {
 	[[ $MDSCOUNT -lt 2 ]] && skip "needs >= 2 MDTs" && return
+
+	[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.56) ]] &&
+		skip "Need MDS version at least 2.7.56" && return
+
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	local MDTIDX=1
 	local remote_dir=$DIR/$tdir/remote_dir
@@ -1442,6 +1431,9 @@ run_test 27l "check setstripe permissions (should return error)"
 test_27m() {
 	[[ $OSTCOUNT -lt 2 ]] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" &&
 		return
+
+	ORIGFREE=$($LCTL get_param -n lov.$FSNAME-clilov-*.kbytesavail |
+		   head -n1)
 	if [[ $ORIGFREE -gt $MAXFREE ]]; then
 		skip "$ORIGFREE > $MAXFREE skipping out-of-space test on OST0"
 		return
@@ -1885,6 +1877,7 @@ check_seq_oid()
 				$(facet_mntpt ost$ost)/$obj_file)
 			unmount_fstype ost$ost
 			start ost$ost $dev $OST_MOUNT_OPTS
+			clients_up
 		fi
 
 		[ -z "$ff" ] && error "$obj_file: no filter_fid info"
@@ -2028,6 +2021,7 @@ run_test 27C "check full striping across all OSTs"
 
 test_27D() {
 	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return
+	[ -n "$FILESET" ] && skip "SKIP due to FILESET set" && return
 	local POOL=${POOL:-testpool}
 	local first_ost=0
 	local last_ost=$(($OSTCOUNT - 1))
@@ -2048,6 +2042,8 @@ run_test 27D "validate llapi_layout API"
 # accessing a widely striped file.
 test_27E() {
 	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return
+	[ $(lustre_version_code client) -lt $(version_code 2.5.57) ] &&
+		skip "client does not have LU-3338 fix" && return
 
 	# 72 bytes is the minimum space required to store striping
 	# information for a file striped across one OST:
@@ -2073,6 +2069,46 @@ test_27E() {
 }
 run_test 27E "check that default extended attribute size properly increases"
 
+test_27F() { # LU-5346/LU-7975
+
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+
+	[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.51) ]] &&
+		skip "Need MDS version at least 2.8.51" && return
+
+	test_mkdir -p $DIR/$tdir
+	rm -f $DIR/$tdir/f0
+	$SETSTRIPE -c 2 $DIR/$tdir
+
+	# stop all OSTs to reproduce situation for LU-7975 ticket
+	for num in $(seq $OSTCOUNT); do
+		stop ost$num
+	done
+
+	# open/create f0 with O_LOV_DELAY_CREATE
+	# truncate f0 to a non-0 size
+	# close
+	multiop $DIR/$tdir/f0 oO_RDWR:O_CREAT:O_LOV_DELAY_CREATE:T1050000c
+
+	$CHECKSTAT -s 1050000 $DIR/$tdir/f0 || error "checkstat failed"
+	# open/write it again to force delayed layout creation
+	cat /etc/hosts > $DIR/$tdir/f0 &
+	catpid=$!
+
+	# restart OSTs
+	for num in $(seq $OSTCOUNT); do
+		start ost$num $(ostdevname $num) $OST_MOUNT_OPTS ||
+			error "ost$num failed to start"
+	done
+
+	wait $catpid || error "cat failed"
+
+	cmp /etc/hosts $DIR/$tdir/f0 || error "cmp failed"
+	[[ $($GETSTRIPE -c $DIR/$tdir/f0) == 2 ]] || error "wrong stripecount"
+
+}
+run_test 27F "Client resend delayed layout creation with non-zero size"
+
 # createtest also checks that device nodes are created and
 # then visible correctly (#2091)
 test_28() { # bug 2091
@@ -2082,8 +2118,8 @@ test_28() { # bug 2091
 run_test 28 "create/mknod/mkdir with bad file types ============"
 
 test_29() {
-	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	cancel_lru_locks mdc
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return 0
+	cancel_lru_locks
 	test_mkdir $DIR/d29
 	touch $DIR/d29/foo
 	log 'first d29'
@@ -2093,7 +2129,7 @@ test_29() {
 	for lock_count in $(lctl get_param -n ldlm.namespaces.*mdc*.lock_count); do
 		let LOCKCOUNTORIG=$LOCKCOUNTORIG+$lock_count
 	done
-	[ $LOCKCOUNTORIG -eq 0 ] && echo "No mdc lock count" && return 1
+	[ $LOCKCOUNTORIG -eq 0 ] && error "No mdc lock count" && return 1
 
 	declare -i LOCKUNUSEDCOUNTORIG=0
 	for unused_count in $(lctl get_param -n ldlm.namespaces.*mdc*.lock_unused_count); do
@@ -3340,29 +3376,27 @@ test_39l() {
 	# test setting directory atime to future
 	touch -a -d @$TEST_39_ATIME $DIR/$tdir
 	local atime=$(stat -c %X $DIR/$tdir)
-	[ "$atime" = $TEST_39_ATIME ] || \
+	[ "$atime" = $TEST_39_ATIME ] ||
 		error "atime is not set to future: $atime, $TEST_39_ATIME"
 
 	# test setting directory atime from future to now
-	local d1=$(date +%s)
-	ls $DIR/$tdir
-	local d2=$(date +%s)
+	local now=$(date +%s)
+	touch -a -d @$now $DIR/$tdir
 
-	cancel_lru_locks mdc
 	atime=$(stat -c %X $DIR/$tdir)
-	[ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] || \
-		error "atime is not updated from future: $atime, $d1<atime<$d2"
+	[ "$atime" -eq "$now"  ] ||
+		error "atime is not updated from future: $atime, $now"
 
 	do_facet $SINGLEMDS lctl set_param -n mdd.*MDT0000*.atime_diff=2
 	sleep 3
 
 	# test setting directory atime when now > dir atime + atime_diff
-	d1=$(date +%s)
+	local d1=$(date +%s)
 	ls $DIR/$tdir
-	d2=$(date +%s)
+	local d2=$(date +%s)
 	cancel_lru_locks mdc
 	atime=$(stat -c %X $DIR/$tdir)
-	[ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] || \
+	[ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] ||
 		error "atime is not updated  : $atime, should be $d2"
 
 	do_facet $SINGLEMDS lctl set_param -n mdd.*MDT0000*.atime_diff=60
@@ -3372,7 +3406,7 @@ test_39l() {
 	ls $DIR/$tdir
 	cancel_lru_locks mdc
 	atime=$(stat -c %X $DIR/$tdir)
-	[ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] || \
+	[ "$atime" -ge "$d1" -a "$atime" -le "$d2" ] ||
 		error "atime is updated to $atime, should remain $d1<atime<$d2"
 
 	do_facet $SINGLEMDS \
@@ -3476,6 +3510,18 @@ test_39p() {
 run_test 39p "remote directory cached attributes updated after create ========"
 
 
+test_39p() { # LU-8041
+	local testdir=$DIR/$tdir
+	mkdir -p $testdir
+	multiop_bg_pause $testdir D_c || error "multiop failed"
+	local multipid=$!
+	cancel_lru_locks mdc
+	kill -USR1 $multipid
+	local atime=$(stat -c %X $testdir)
+	[ "$atime" -ne 0 ] || error "atime is zero"
+}
+run_test 39p "close won't zero out atime"
+
 test_40() {
 	dd if=/dev/zero of=$DIR/$tfile bs=4096 count=1
 	$RUNAS $OPENFILE -f O_WRONLY:O_TRUNC $DIR/$tfile &&
@@ -3910,7 +3956,6 @@ test_48b() { # bug 2399
 	test_mkdir .foo && error "'mkdir .foo' worked after removing cwd"
 	ls . > /dev/null && error "'ls .' worked after removing cwd"
 	ls .. > /dev/null || error "'ls ..' failed after removing cwd"
-	is_patchless || ( cd . && error "'cd .' worked after removing cwd" )
 	test_mkdir . && error "'mkdir .' worked after removing cwd"
 	rmdir . && error "'rmdir .' worked after removing cwd"
 	ln -s . foo && error "'ln -s .' worked after removing cwd"
@@ -3931,8 +3976,6 @@ test_48c() { # bug 2350
 	test_mkdir .foo && error "mkdir .foo worked after removing cwd"
 	$TRACE ls . && error "'ls .' worked after removing cwd"
 	$TRACE ls .. || error "'ls ..' failed after removing cwd"
-	is_patchless || ( $TRACE cd . &&
-			error "'cd .' worked after removing cwd" )
 	$TRACE test_mkdir . && error "'mkdir .' worked after removing cwd"
 	$TRACE rmdir . && error "'rmdir .' worked after removing cwd"
 	$TRACE ln -s . foo && error "'ln -s .' worked after removing cwd"
@@ -3954,13 +3997,10 @@ test_48d() { # bug 2350
 	test_mkdir .foo && error "mkdir .foo worked after removing parent"
 	$TRACE ls . && error "'ls .' worked after removing parent"
 	$TRACE ls .. && error "'ls ..' worked after removing parent"
-	is_patchless || ( $TRACE cd . &&
-			error "'cd .' worked after recreate parent" )
 	$TRACE test_mkdir . && error "'mkdir .' worked after removing parent"
 	$TRACE rmdir . && error "'rmdir .' worked after removing parent"
 	$TRACE ln -s . foo && error "'ln -s .' worked after removing parent"
-	is_patchless || ( $TRACE cd .. &&
-			error "'cd ..' worked after removing parent" || true )
+	true
 }
 run_test 48d "Access removed parent subdir (should return errors)"
 
@@ -4035,87 +4075,62 @@ test_51a() {	# was test_51
 }
 run_test 51a "special situations: split htree with empty entry =="
 
-export NUMTEST=70000
 test_51b() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	local BASE=$DIR/d${base}.${TESTSUITE}
+	local dir=$DIR/$tdir
+
+	local nrdirs=$((65536 + 100))
 
 	# cleanup the directory
-	rm -fr $BASE
+	rm -fr $dir
 
-	test_mkdir -p -c1 $BASE
+	test_mkdir -p -c1 $dir
 
 	$LFS df
 	$LFS df -i
-	local mdtidx=$(printf "%04x" $($LFS getstripe -M $BASE))
+	local mdtidx=$(printf "%04x" $($LFS getstripe -M $dir))
 	local numfree=$(lctl get_param -n mdc.$FSNAME-MDT$mdtidx*.filesfree)
-	[[ $numfree -lt 21000 ]] &&
+	[[ $numfree -lt $nrdirs ]] &&
 		skip "not enough free inodes ($numfree) on MDT$mdtidx" &&
 		return
 
-	[[ $numfree -lt $NUMTEST ]] && NUMTEST=$(($numfree - 50)) &&
-		echo "reduced count to $NUMTEST due to inodes on MDT$mdtidx"
-
 	# 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 on MDT$mdtidx"
-
-	createmany -d $BASE/d $NUMTEST && echo $NUMTEST > $BASE/fnum ||
-	{
-		$LFS df
-		$LFS df -i
-		echo "failed" > $BASE/fnum
-		error "failed to create $NUMTEST subdirs in MDT$mdtidx:$BASE"
-	}
-}
-run_test 51b "exceed 64k subdirectory nlink limit"
+	[[ $numfree -lt $nrdirs ]] && skip "not enough blocks ($numfree)" &&
+		return
 
-test_51ba() { # LU-993
-	local BASE=$DIR/d${base}.${TESTSUITE}
-	# unlink all but 100 subdirectories, then check it still works
-	local LEFT=100
-	[ -f $BASE/fnum ] && local NUMPREV=$(cat $BASE/fnum) && rm $BASE/fnum
+	# create files
+	createmany -d $dir/d $nrdirs ||
+		error "failed to create $nrdirs subdirs in MDT$mdtidx:$dir"
 
-	[ "$NUMPREV" != "failed" ] && NUMTEST=$NUMPREV
-	local DELETE=$((NUMTEST - LEFT))
+	# really created :
+	nrdirs=$(ls -U $dir | wc -l)
 
-	# continue on to run this test even if 51b didn't finish,
-	# just to delete the many subdirectories created.
-	[ ! -d "${BASE}/d1" ] && skip "test_51b() not run" && return 0
+	# unlink all but 100 subdirectories, then check it still works
+	local left=100
+	local delete=$((nrdirs - left))
 
 	# for ldiskfs the nlink count should be 1, but this is OSD specific
 	# and so this is listed for informational purposes only
-	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
+	echo "nlink before: $(stat -c %h $dir), created before: $nrdirs"
+	unlinkmany -d $dir/d $delete ||
+		error "unlink of first $delete subdirs failed"
 
-	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"
+	echo "nlink between: $(stat -c %h $dir)"
+	local found=$(ls -U $dir | wc -l)
+	[ $found -ne $left ] &&
+		error "can't find subdirs: found only $found, expected $left"
 
-	unlinkmany -d $BASE/d $DELETE $LEFT ||
-		error "unlink of second $LEFT subdirs failed"
+	unlinkmany -d $dir/d $delete $left ||
+		error "unlink of second $left subdirs failed"
 	# 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"
+	local after=$(stat -c %h $dir)
+	[[ $after -gt 2 ]] && error "nlink after: $after > 2" ||
+		echo "nlink after: $after"
 }
-run_test 51ba "verify nlink for many subdirectory cleanup"
+run_test 51b "exceed 64k subdirectory nlink limit on create, verify unlink"
 
 test_51d() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -4123,11 +4138,11 @@ test_51d() {
 		skip_env "skipping test with few OSTs" && return
 	test_mkdir -p $DIR/$tdir
 	createmany -o $DIR/$tdir/t- 1000
-	$GETSTRIPE $DIR/$tdir > $TMP/files
+	$GETSTRIPE $DIR/$tdir > $TMP/$tfile
 	for N in $(seq 0 $((OSTCOUNT - 1))); do
 		OBJS[$N]=$(awk -vobjs=0 '($1 == '$N') { objs += 1 } \
-			END { printf("%0.0f", objs) }' $TMP/files)
-		OBJS0[$N]=$(grep -A 1 idx $TMP/files | awk -vobjs=0 \
+			END { printf("%0.0f", objs) }' $TMP/$tfile)
+		OBJS0[$N]=$(grep -A 1 idx $TMP/$tfile | awk -vobjs=0 \
 			'($1 == '$N') { objs += 1 } \
 			END { printf("%0.0f", objs) }')
 		log "OST$N has ${OBJS[$N]} objects, ${OBJS0[$N]} are index 0"
@@ -4151,8 +4166,9 @@ test_51d() {
 			      " (${OBJS0[$N]} < ${OBJS0[$NLAST]}"
 		NLAST=$N
 	done
+	rm -f $TMP/$tfile
 }
-run_test 51d "check object distribution ===================="
+run_test 51d "check object distribution"
 
 test_51e() {
 	if [ "$(facet_fstype $SINGLEMDS)" != ldiskfs ]; then
@@ -4186,10 +4202,10 @@ test_52a() {
 	lsattr $DIR/$tdir/foo | egrep -q "^-+a[-e]+ $DIR/$tdir/foo" ||
 						     error "lsattr"
 	chattr -a $DIR/$tdir/foo || error "chattr -a failed"
-        cp -r $DIR/$tdir /tmp/
-	rm -fr $DIR/$tdir || error "cleanup rm failed"
+	cp -r $DIR/$tdir $TMP/
+	rm -fr $DIR/$tdir $TMP/$tdir || error "cleanup rm failed"
 }
-run_test 52a "append-only flag test (should return errors) ====="
+run_test 52a "append-only flag test (should return errors)"
 
 test_52b() {
 	[ -f $DIR/$tdir/foo ] && chattr -i $DIR/$tdir/foo
@@ -4858,7 +4874,9 @@ test_56w() {
     local file_size=$((stripe_size * OSTCOUNT))
     local file_num=$((NUMDIRS * NUMFILES + NUMFILES))
     local required_space=$((file_num * file_size))
-    local free_space=$($LCTL get_param -n lov.$LOVNAME.kbytesavail)
+
+    local free_space=$($LCTL get_param -n lov.$FSNAME-clilov-*.kbytesavail |
+			head -n1)
     [[ $free_space -le $((required_space / 1024)) ]] &&
         skip_env "need at least $required_space bytes free space," \
                  "have $free_space kbytes" && return
@@ -4966,6 +4984,29 @@ test_56x() {
 }
 run_test 56x "lfs migration support"
 
+test_56xa() {
+	check_swap_layouts_support && return 0
+	[[ $OSTCOUNT -lt 2 ]] &&
+		skip_env "need 2 OST, skipping test" && return
+
+	local dir0=$DIR/$tdir/$testnum
+	test_mkdir -p $dir0 || error "creating dir $dir0"
+
+	local ref1=/etc/passwd
+	local file1=$dir0/file1
+
+	$SETSTRIPE -c 2 $file1
+	cp $ref1 $file1
+	$LFS migrate --block -c 1 $file1 || error "migrate failed rc = $?"
+	local stripe=$($GETSTRIPE -c $file1)
+	[[ $stripe == 1 ]] || error "stripe of $file1 is $stripe != 1"
+	cmp $file1 $ref1 || error "content mismatch $file1 differs from $ref1"
+
+	# clean up
+	rm -f $file1
+}
+run_test 56xa "lfs migration --block support"
+
 test_56y() {
 	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.53) ] &&
 		skip "No HSM $(lustre_build_version $SINGLEMDS) MDS < 2.4.53" &&
@@ -5229,19 +5270,19 @@ run_test 60a "llog_test run from kernel module and test llog_reader =========="
 test_60b() { # bug 6411
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	dmesg > $DIR/$tfile
-	LLOG_COUNT=`dmesg | awk "/$TEST60_HEAD/{marker = 1; from_marker = 0;}
-				 /llog.test/ {
-					 if (marker)
-						 from_marker++
-					 from_begin++
-				 }
-				 END {
-					 if (marker)
-						 print from_marker
-					 else
-						 print from_begin
-				 }"`
-	[[ $LLOG_COUNT -gt 50 ]] &&
+	LLOG_COUNT=$(dmesg | awk "/$TEST60_HEAD/ { marker = 1; from_marker = 0; }
+				/llog.test/ {
+					if (marker)
+						from_marker++
+					from_begin++
+				}
+				END {
+					if (marker)
+						print from_marker
+					else
+						print from_begin
+				}")
+	[[ $LLOG_COUNT -gt 100 ]] &&
 		error "CDEBUG_LIMIT not limiting messages ($LLOG_COUNT)" || true
 }
 run_test 60b "limit repeated messages from CERROR/CWARN ========"
@@ -5263,14 +5304,14 @@ test_60d() {
 
 	# verify "lctl mark" is even working"
 	MESSAGE="test message ID $RANDOM $$"
-	$LCTL mark "$MESSAGE" || error "$LCTL mark failed"
+	$LCTL mark "$HOSTNAME $MESSAGE" || error "$LCTL mark failed"
 	dmesg | grep -q "$MESSAGE" || error "didn't find debug marker in log"
 
 	lctl set_param printk=0 || error "set lnet.printk failed"
 	lctl get_param -n printk | grep emerg || error "lnet.printk dropped emerg"
 	MESSAGE="new test message ID $RANDOM $$"
 	# Assume here that libcfs_debug_mark_buffer() uses D_WARNING
-	$LCTL mark "$MESSAGE" || error "$LCTL mark failed"
+	$LCTL mark "$HOSTNAME $MESSAGE" || error "$LCTL mark failed"
 	dmesg | grep -q "$MESSAGE" && error "D_WARNING wasn't masked" || true
 
 	lctl set_param -n printk="$SAVEPRINTK"
@@ -5381,28 +5422,35 @@ run_test 65a "directory with no stripe info ===================="
 test_65b() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	test_mkdir -p $DIR/$tdir
+	local STRIPESIZE=$($GETSTRIPE -S $DIR/$tdir)
+
 	$SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/$tdir ||
 						error "setstripe"
 	touch $DIR/$tdir/f2
 	$LVERIFY $DIR/$tdir $DIR/$tdir/f2 || error "lverify failed"
 }
-run_test 65b "directory setstripe -S $((STRIPESIZE * 2)) -i 0 -c 1"
+run_test 65b "directory setstripe -S stripe_size*2 -i 0 -c 1"
 
 test_65c() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	if [[ $OSTCOUNT -gt 1 ]]; then
 		test_mkdir -p $DIR/$tdir
+		local STRIPESIZE=$($GETSTRIPE -S $DIR/$tdir)
+
 		$SETSTRIPE -S $(($STRIPESIZE * 4)) -i 1 \
 			-c $(($OSTCOUNT - 1)) $DIR/$tdir || error "setstripe"
 		touch $DIR/$tdir/f3
 		$LVERIFY $DIR/$tdir $DIR/$tdir/f3 || error "lverify failed"
 	fi
 }
-run_test 65c "directory setstripe -S $((STRIPESIZE*4)) -i 1 -c $((OSTCOUNT-1))"
+run_test 65c "directory setstripe -S stripe_size*4 -i 1 -c $((OSTCOUNT-1))"
 
 test_65d() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	test_mkdir -p $DIR/$tdir
+	local STRIPECOUNT=$($GETSTRIPE -c $DIR/$tdir)
+	local STRIPESIZE=$($GETSTRIPE -S $DIR/$tdir)
+
 	if [[ $STRIPECOUNT -le 0 ]]; then
 		sc=1
 	elif [[ $STRIPECOUNT -gt 2000 ]]; then
@@ -5416,7 +5464,7 @@ test_65d() {
 	$LVERIFY $DIR/$tdir $DIR/$tdir/f4 $DIR/$tdir/f5 ||
 		error "lverify failed"
 }
-run_test 65d "directory setstripe -S $STRIPESIZE -c stripe_count"
+run_test 65d "directory setstripe -S stripe_size -c stripe_count"
 
 test_65e() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -5440,6 +5488,8 @@ run_test 65f "dir setstripe permission (should return error) ==="
 test_65g() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         test_mkdir -p $DIR/$tdir
+	local STRIPESIZE=$($GETSTRIPE -S $DIR/$tdir)
+
         $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/$tdir ||
 							error "setstripe"
         $SETSTRIPE -d $DIR/$tdir || error "setstripe"
@@ -5451,6 +5501,8 @@ run_test 65g "directory setstripe -d ==========================="
 test_65h() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         test_mkdir -p $DIR/$tdir
+	local STRIPESIZE=$($GETSTRIPE -S $DIR/$tdir)
+
         $SETSTRIPE -S $((STRIPESIZE * 2)) -i 0 -c 1 $DIR/$tdir ||
 							error "setstripe"
         test_mkdir -p $DIR/$tdir/dd1
@@ -5649,7 +5701,7 @@ test_68b() {  # was test_68
 run_test 68b "support swapping to Lustre ========================"
 
 # bug5265, obdfilter oa2dentry return -ENOENT
-# #define OBD_FAIL_OST_ENOENT 0x217
+# #define OBD_FAIL_SRV_ENOENT 0x217
 test_69() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
@@ -6211,7 +6263,7 @@ test_99b() {
 	# some versions of cvs import exit(1) when asked to import links or
 	# files they can't read.  ignore those files.
 	TOIGNORE=$(find . -type l -printf '-I %f\n' -o \
-			! -perm +4 -printf '-I %f\n')
+			! -perm /4 -printf '-I %f\n')
 	$RUNAS cvs -d $DIR/d99cvsroot import -m "nomesg" $TOIGNORE \
 		d99reposname vtag rtag
 }
@@ -6548,41 +6600,88 @@ test_101e() {
 }
 run_test 101e "check read-ahead for small read(1k) for small files(500k)"
 
-cleanup_test101f() {
-    trap 0
-    $LCTL set_param -n llite.*.max_read_ahead_whole_mb $MAX_WHOLE_MB
-    rm -rf $DIR/$tfile 2>/dev/null
+test_101f() {
+	which iozone || { skip "no iozone installed" && return; }
+
+	# create a test file
+	iozone -i 0 -+n -r 1m -s 128m -w -f $DIR/$tfile > /dev/null 2>&1
+
+	echo Cancel LRU locks on lustre client to flush the client cache
+	cancel_lru_locks osc
+
+	echo Reset readahead stats
+	$LCTL set_param -n llite.*.read_ahead_stats 0
+
+	echo mmap read the file with small block size
+	iozone -i 1 -+n -r 32k -s 128m -B -f $DIR/$tfile > /dev/null 2>&1
+
+	echo checking missing pages
+	local miss=$($LCTL get_param -n llite.*.read_ahead_stats |
+			get_named_value 'misses' | cut -d" " -f1 | calc_total)
+
+	[ $miss -lt 3 ] || error "misses too much pages!"
+	rm -f $DIR/$tfile
 }
+run_test 101f "check mmap read performance"
 
-test_101f() {
-	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-    local file=$DIR/$tfile
-    local nreads=1000
+test_101g() {
+	local rpcs
+	local osts=$(get_facets OST)
+	local list=$(comma_list $(osts_nodes))
+	local p="$TMP/$TESTSUITE-$TESTNAME.parameters"
 
-    MAX_WHOLE_MB=$($LCTL get_param -n llite.*.max_read_ahead_whole_mb)
-    $LCTL set_param -n llite.*.max_read_ahead_whole_mb 2
-    dd if=/dev/zero of=${file} bs=2097152 count=1 2>/dev/null
-    trap cleanup_test101f EXIT
+	save_lustre_params $osts "obdfilter.*.brw_size" > $p
 
-    echo Cancel LRU locks on lustre client to flush the client cache
-    cancel_lru_locks osc
+	$LFS setstripe -c 1 $DIR/$tfile
+
+	if [ $(lustre_version_code ost1) -ge $(version_code 2.8.52) ]; then
+		set_osd_param $list '' brw_size 16M
 
-    echo Reset readahead stats
-    $LCTL set_param -n llite.*.read_ahead_stats 0
-    # Random read in a 2M file, because max_read_ahead_whole_mb = 2M,
-    # readahead should read in 2M file on second read, so only miss
-    # 2 pages.
-    echo Random 4K reads on 2M file for 1000 times
-    $READS -f $file -s 2097152 -b 4096 -n $nreads
+		echo "remount client to enable large RPC size"
+		remount_client $MOUNT || error "remount_client failed"
 
-    echo checking missing pages
-    local miss=$($LCTL get_param -n llite.*.read_ahead_stats |
-          get_named_value 'misses' | cut -d" " -f1 | calc_total)
+		for mp in $($LCTL get_param -n osc.*.max_pages_per_rpc); do
+			[ "$mp" -eq 4096 ] ||
+				error "max_pages_per_rpc not correctly set"
+		done
+
+		$LCTL set_param -n osc.*.rpc_stats=0
+
+		# 10*16 MiB should be enough for the test
+		dd if=/dev/zero of=$DIR/$tfile bs=16M count=10
+		cancel_lru_locks osc
+		dd of=/dev/null if=$DIR/$tfile bs=16M count=10
+
+		# calculate 16 MiB RPCs
+		rpcs=$($LCTL get_param 'osc.*.rpc_stats' |
+		       sed -n '/pages per rpc/,/^$/p' |
+		       awk 'BEGIN { sum = 0 }; /4096:/ { sum += $2 };
+			    END { print sum }')
+		echo $rpcs RPCs
+		[ "$rpcs" -eq 10 ] || error "not all RPCs are 16 MiB BRW rpcs"
+	fi
+
+	echo "set RPC size to 4MB"
+
+	$LCTL set_param -n osc.*.max_pages_per_rpc=4M osc.*.rpc_stats=0
+	dd if=/dev/zero of=$DIR/$tfile bs=4M count=25
+	cancel_lru_locks osc
+	dd of=/dev/null if=$DIR/$tfile bs=4M count=25
+
+	# calculate 4 MiB RPCs
+	rpcs=$($LCTL get_param 'osc.*.rpc_stats' |
+		sed -n '/pages per rpc/,/^$/p' |
+		awk 'BEGIN { sum = 0 }; /1024:/ { sum += $2 };
+		     END { print sum }')
+	echo $rpcs RPCs
+	[ "$rpcs" -eq 25 ] || error "not all RPCs are 4 MiB BRW rpcs"
+
+	restore_lustre_params < $p
+	remount_client $MOUNT || error "remount_client failed"
 
-    [ $miss -lt 3 ] || error "misses too much pages!"
-    cleanup_test101f
+	rm -f $p $DIR/$tfile
 }
-run_test 101f "check read-ahead for max_read_ahead_whole_mb"
+run_test 101g "Big bulk(4/16 MiB) readahead"
 
 setup_test102() {
 	test_mkdir -p $DIR/$tdir
@@ -6975,7 +7074,7 @@ test_102n() { # LU-4101 mdt: protect internal xattrs
 	# Get 'before' xattrs of $file1.
 	getfattr --absolute-names --dump --match=- $file1 > $xattr0
 
-	for name in lov lma lmv link fid version som hsm lfsck_namespace; do
+	for name in lov lma lmv link fid version som hsm; do
 		# Try to copy xattr from $file0 to $file1.
 		value=$(getxattr $file0 trusted.$name 2> /dev/null)
 
@@ -7493,9 +7592,10 @@ test_116a() { # was previously test_116()
 	echo "Wrote ${DIFF}KB to smaller OST $MINI1"
 	DIFF2=$(($MAXV1 - ${AVAIL[$MAXI1]}))
 	echo "Wrote ${DIFF2}KB to larger OST $MAXI1"
-	FILL=$(($DIFF2 * 100 / $DIFF - 100))
-	[ $DIFF -gt 0 ] &&
+	if [[ $DIFF -gt 0 ]]; then
+		FILL=$(($DIFF2 * 100 / $DIFF - 100))
 		echo "Wrote ${FILL}% more data to larger OST $MAXI1"
+	fi
 
 	# Figure out which files were written where
 	UUID=$(lctl get_param -n lov.${FSNAME}-clilov-*.target_obd |
@@ -7508,9 +7608,10 @@ test_116a() { # was previously test_116()
 	echo $UUID
 	MAXC=$($GETSTRIPE --ost $UUID $DIR/$tdir | grep $DIR | wc -l)
 	echo "$MAXC files created on larger OST $MAXI1"
-	FILL=$(($MAXC * 100 / $MINC - 100))
-	[[ $MINC -gt 0 ]] &&
+	if [[ $MINC -gt 0 ]]; then
+		FILL=$(($MAXC * 100 / $MINC - 100))
 		echo "Wrote ${FILL}% more files to larger OST $MAXI1"
+	fi
 	[[ $MAXC -gt $MINC ]] ||
 		error_ignore LU-9 "stripe QOS didn't balance free space"
 	simple_cleanup_common
@@ -7597,7 +7698,7 @@ test_118b()
 
 	reset_async
 
-	#define OBD_FAIL_OST_ENOENT 0x217
+	#define OBD_FAIL_SRV_ENOENT 0x217
 	set_nodes_failloc "$(osts_nodes)" 0x217
 	$MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:O_SYNC:w4096c
 	RC=$?
@@ -8132,16 +8233,20 @@ run_test 120d "Early Lock Cancel: setattr test"
 
 test_120e() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-        test_mkdir -p -c1 $DIR/$tdir
-        [ -z "`lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel`" ] && \
-               skip "no early lock cancel on server" && return 0
-        lru_resize_disable mdc
-        lru_resize_disable osc
-        dd if=/dev/zero of=$DIR/$tdir/f1 count=1
-        cancel_lru_locks mdc
-        cancel_lru_locks osc
-        dd if=$DIR/$tdir/f1 of=/dev/null
-        stat $DIR/$tdir $DIR/$tdir/f1 > /dev/null
+	! $($LCTL get_param -n mdc.*.connect_flags | grep -q early_lock_can) &&
+		skip "no early lock cancel on server" && return 0
+	local dlmtrace_set=false
+
+	test_mkdir -p -c1 $DIR/$tdir
+	lru_resize_disable mdc
+	lru_resize_disable osc
+	! $LCTL get_param debug | grep -q dlmtrace &&
+		$LCTL set_param debug=+dlmtrace && dlmtrace_set=true
+	dd if=/dev/zero of=$DIR/$tdir/f1 count=1
+	cancel_lru_locks mdc
+	cancel_lru_locks osc
+	dd if=$DIR/$tdir/f1 of=/dev/null
+	stat $DIR/$tdir $DIR/$tdir/f1 > /dev/null
 	# XXX client can not do early lock cancel of OST lock
 	# during unlink (LU-4206), so cancel osc lock now.
 	cancel_lru_locks osc
@@ -8157,8 +8262,11 @@ test_120e() {
 	       awk '/ldlm_cancel/ {print $2}')
 	blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats |
 	       awk '/ldlm_bl_callback/ {print $2}')
-	[ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured."
-	[ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured."
+	[ $can1 -ne $can2 ] && error "$((can2 - can1)) cancel RPC occured" &&
+		$LCTL dk $TMP/cancel.debug.txt
+	[ $blk1 -ne $blk2 ] && error "$((blk2 - blk1)) blocking RPC occured" &&
+		$LCTL dk $TMP/blocking.debug.txt
+	$dlmtrace_set && $LCTL set_param debug=-dlmtrace
 	lru_resize_enable mdc
 	lru_resize_enable osc
 }
@@ -8663,11 +8771,13 @@ test_127b() { # bug LU-333
                 esac
         done < $TMP/${tfile}.tmp
 
-        #check that we actually got some stats
-        [ "$read_bytes" ] || error "Missing read_bytes stats"
-        [ "$write_bytes" ] || error "Missing write_bytes stats"
-        [ "$read_bytes" != 0 ] || error "no read done"
-        [ "$write_bytes" != 0 ] || error "no write done"
+	#check that we actually got some stats
+	[ "$read_bytes" ] || error "Missing read_bytes stats"
+	[ "$write_bytes" ] || error "Missing write_bytes stats"
+	[ "$read_bytes" != 0 ] || error "no read done"
+	[ "$write_bytes" != 0 ] || error "no write done"
+
+	rm -f $TMP/${tfile}.tmp
 }
 run_test 127b "verify the llite client stats are sane"
 
@@ -8679,8 +8789,9 @@ test_128() { # bug 15212
 	EOF
 
 	result=$(grep error $TMP/$tfile.log)
-	rm -f $DIR/$tfile
-	[ -z "$result" ] || error "consecutive find's under interactive lfs failed"
+	rm -f $DIR/$tfile $TMP/$tfile.log
+	[ -z "$result" ] ||
+		error "consecutive find's under interactive lfs failed"
 }
 run_test 128 "interactive lfs for 2 consecutive find's"
 
@@ -8698,7 +8809,18 @@ set_dir_limits () {
 		do_facet $facet "test -e $LDPROC/$canondev/max_dir_size" ||
 						LDPROC=/sys/fs/ldiskfs
 		do_facet $facet "echo $1 >$LDPROC/$canondev/max_dir_size"
+		do_facet $facet "test -e $LDPROC/$canondev/warning_dir_size" ||
+						LDPROC=/sys/fs/ldiskfs
+		do_facet $facet "echo $2 >$LDPROC/$canondev/warning_dir_size"
+	done
+}
+
+check_mds_dmesg() {
+	local facets=$(get_facets MDS)
+	for facet in ${facets//,/ }; do
+		do_facet $facet "dmesg | tail -3 | grep -q $1" && return 0
 	done
+	return 1
 }
 
 test_129() {
@@ -8710,31 +8832,40 @@ test_129() {
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	ENOSPC=28
 	EFBIG=27
+	has_warning=0
 
 	rm -rf $DIR/$tdir
-	test_mkdir -p $DIR/$tdir
+	mkdir -p $DIR/$tdir
 
 	# block size of mds1
 	local MDT_DEV=$(mdsdevname ${SINGLEMDS//mds/})
 	local MDSBLOCKSIZE=$($LCTL get_param -n mdc.*MDT0000*.blocksize)
-	local MAX=$((MDSBLOCKSIZE * 3))
-	set_dir_limits $MAX
+	local MAX=$((MDSBLOCKSIZE * 5))
+	set_dir_limits $MAX $MAX
 	local I=$(stat -c%s "$DIR/$tdir")
 	local J=0
-	local STRIPE_COUNT=1
-	[[ $MDSCOUNT -ge 2 ]] && STRIPE_COUNT=$($LFS getdirstripe -c $DIR/$tdir)
-	MAX=$((MAX*STRIPE_COUNT))
 	while [[ $I -le $MAX ]]; do
 		$MULTIOP $DIR/$tdir/$J Oc
 		rc=$?
+		if [ $has_warning -eq 0 ]; then
+			check_mds_dmesg '"is approaching"' &&
+				has_warning=1
+		fi
 		#check two errors ENOSPC for new version of ext4 max_dir_size patch
 		#mainline kernel commit df981d03eeff7971ac7e6ff37000bfa702327ef1
 		#and EFBIG for previous versions
 		if [ $rc -eq $EFBIG -o $rc -eq $ENOSPC ]; then
-			set_dir_limits 0
+			set_dir_limits 0 0
 			echo "return code $rc received as expected"
-			multiop $DIR/$tdir/$J Oc ||
-				error_exit "multiop failed w/o dir size limit"
+
+			createmany -o $DIR/$tdir/$J_file_ 1000 ||
+				error_exit "create failed w/o dir size limit"
+
+			check_mds_dmesg '"has reached"' ||
+				error_exit "has reached message should be output"
+
+			[ $has_warning ] ||
+				error_exit "warning message should be output"
 
 			I=$(stat -c%s "$DIR/$tdir")
 
@@ -8747,7 +8878,7 @@ test_129() {
 			fi
 			error_exit "current dir size $I, previous limit $MAX"
 		elif [ $rc -ne 0 ]; then
-			set_dir_limits 0
+			set_dir_limits 0 0
 			error_exit "return code $rc received instead of expected " \
 				   "$EFBIG or $ENOSPC, files in dir $I"
 		fi
@@ -8755,7 +8886,7 @@ test_129() {
 		I=$(stat -c%s "$DIR/$tdir")
 	done
 
-	set_dir_limits 0
+	set_dir_limits 0 0
 	error "exceeded dir size limit $MAX($MDSCOUNT) : $I bytes"
 }
 run_test 129 "test directory size limit ========================"
@@ -8785,8 +8916,8 @@ test_130a() {
 		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")
+	filefrag_op=$(filefrag -ve $fm_file |
+			sed -n '/ext:/,/found/{/ext:/d; /found/d; p}')
 	lun=$($GETSTRIPE -i $fm_file)
 
 	start_blk=`echo $filefrag_op | cut -d: -f2 | cut -d. -f1`
@@ -8818,10 +8949,7 @@ run_test 130a "FIEMAP (1-stripe file)"
 
 test_130b() {
 	[ "$OSTCOUNT" -lt "2" ] &&
-		skip_env "skipping FIEMAP on 2-stripe file test" && return
-
-	[ "$OSTCOUNT" -ge "10" ] &&
-		skip_env "skipping FIEMAP with >= 10 OSTs" && return
+		skip_env "skipping FIEMAP on $OSTCOUNT-stripe file" && return
 
 	local filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
 	[ -n "$filefrag_op" ] && skip_env "filefrag does not support FIEMAP" &&
@@ -8830,30 +8958,34 @@ test_130b() {
 	trap cleanup_130 EXIT RETURN
 
 	local fm_file=$DIR/$tfile
-	$SETSTRIPE -S 65536 -c 2 $fm_file || error "setstripe on $fm_file"
+	$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=2 ||
+	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"
-	filefrag_op=$(filefrag -ve $fm_file | grep -A 100 "ext:" |
-		      grep -v "ext:" | grep -v "found")
+	filefrag_op=$(filefrag -ve $fm_file |
+			sed -n '/ext:/,/found/{/ext:/d; /found/d; p}')
 
-	last_lun=$(echo $filefrag_op | cut -d: -f5)
+	last_lun=$(echo $filefrag_op | cut -d: -f5 |
+		sed -e 's/^[ \t]*/0x/' | sed -e 's/0x0x/0x/')
 
 	IFS=$'\n'
 	tot_len=0
 	num_luns=1
 	for line in $filefrag_op
 	do
-		frag_lun=`echo $line | cut -d: -f5`
-		ext_len=`echo $line | cut -d: -f4`
+		frag_lun=$(echo $line | cut -d: -f5 |
+			sed -e 's/^[ \t]*/0x/' | sed -e 's/0x0x/0x/')
+		ext_len=$(echo $line | cut -d: -f4)
 		if (( $frag_lun != $last_lun )); then
 			if (( tot_len != 1024 )); then
 				cleanup_130
-				error "FIEMAP on $fm_file failed; returned len $tot_len for OST $last_lun instead of 256"
+				error "FIEMAP on $fm_file failed; returned " \
+				"len $tot_len for OST $last_lun instead of 1024"
 				return
 			else
 				(( num_luns += 1 ))
@@ -8863,25 +8995,23 @@ test_130b() {
 		(( tot_len += ext_len ))
 		last_lun=$frag_lun
 	done
-	if (( num_luns != 2 || tot_len != 1024 )); then
+	if (( num_luns != $OSTCOUNT || tot_len != 1024 )); then
 		cleanup_130
-		error "FIEMAP on $fm_file failed; returned wrong number of luns or wrong len for OST $last_lun"
+		error "FIEMAP on $fm_file failed; returned wrong number of " \
+			"luns or wrong len for OST $last_lun"
 		return
 	fi
 
 	cleanup_130
 
-	echo "FIEMAP on 2-stripe file succeeded"
+	echo "FIEMAP on $OSTCOUNT-stripe file succeeded"
 }
-run_test 130b "FIEMAP (2-stripe file)"
+run_test 130b "FIEMAP ($OSTCOUNT-stripe file)"
 
 test_130c() {
 	[ "$OSTCOUNT" -lt "2" ] &&
 		skip_env "skipping FIEMAP on 2-stripe file" && return
 
-	[ "$OSTCOUNT" -ge "10" ] &&
-		skip_env "skipping FIEMAP with >= 10 OSTs" && return
-
 	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
 	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" &&
 		return
@@ -8893,30 +9023,36 @@ test_130c() {
 	[ "$(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"
+	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"
-	filefrag_op=`filefrag -ve $fm_file | grep -A 100 "ext:" | grep -v "ext:" | grep -v "found"`
+	filefrag_op=$(filefrag -ve $fm_file |
+		sed -n '/ext:/,/found/{/ext:/d; /found/d; p}')
 
-	last_lun=`echo $filefrag_op | cut -d: -f5`
+	last_lun=$(echo $filefrag_op | cut -d: -f5 |
+		sed -e 's/^[ \t]*/0x/' | sed -e 's/0x0x/0x/')
 
 	IFS=$'\n'
 	tot_len=0
 	num_luns=1
 	for line in $filefrag_op
 	do
-		frag_lun=`echo $line | cut -d: -f5`
-		ext_len=`echo $line | cut -d: -f4`
+		frag_lun=$(echo $line | cut -d: -f5 |
+			sed -e 's/^[ \t]*/0x/' | sed -e 's/0x0x/0x/')
+		ext_len=$(echo $line | cut -d: -f4)
 		if (( $frag_lun != $last_lun )); then
 			logical=`echo $line | cut -d: -f2 | cut -d. -f1`
 			if (( logical != 512 )); then
 				cleanup_130
-				error "FIEMAP on $fm_file failed; returned logical start for lun $logical instead of 512"
+				error "FIEMAP on $fm_file failed; returned " \
+				"logical start for lun $logical instead of 512"
 				return
 			fi
 			if (( tot_len != 512 )); then
 				cleanup_130
-				error "FIEMAP on $fm_file failed; returned len $tot_len for OST $last_lun instead of 1024"
+				error "FIEMAP on $fm_file failed; returned " \
+				"len $tot_len for OST $last_lun instead of 1024"
 				return
 			else
 				(( num_luns += 1 ))
@@ -8928,7 +9064,8 @@ test_130c() {
 	done
 	if (( num_luns != 2 || tot_len != 512 )); then
 		cleanup_130
-		error "FIEMAP on $fm_file failed; returned wrong number of luns or wrong len for OST $last_lun"
+		error "FIEMAP on $fm_file failed; returned wrong number of " \
+			"luns or wrong len for OST $last_lun"
 		return
 	fi
 
@@ -8939,18 +9076,18 @@ test_130c() {
 run_test 130c "FIEMAP (2-stripe file with hole)"
 
 test_130d() {
-	[ "$OSTCOUNT" -lt "3" ] && skip_env "skipping FIEMAP on N-stripe file test" && return
-
-	[ "$OSTCOUNT" -ge "10" ] &&
-		skip_env "skipping FIEMAP with >= 10 OSTs" && return
+	[ "$OSTCOUNT" -lt "3" ] &&
+		skip_env "skipping FIEMAP on N-stripe file test" && 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 $OSTCOUNT $fm_file||error "setstripe on $fm_file"
+	$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
 
@@ -8959,22 +9096,25 @@ test_130d() {
 		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 |
+			sed -n '/ext:/,/found/{/ext:/d; /found/d; p}')
 
-	last_lun=`echo $filefrag_op | cut -d: -f5`
+	last_lun=$(echo $filefrag_op | cut -d: -f5 |
+		sed -e 's/^[ \t]*/0x/' | sed -e 's/0x0x/0x/')
 
 	IFS=$'\n'
 	tot_len=0
 	num_luns=1
 	for line in $filefrag_op
 	do
-		frag_lun=`echo $line | cut -d: -f5`
-		ext_len=`echo $line | cut -d: -f4`
+		frag_lun=$(echo $line | cut -d: -f5 |
+			sed -e 's/^[ \t]*/0x/' | sed -e 's/0x0x/0x/')
+		ext_len=$(echo $line | cut -d: -f4)
 		if (( $frag_lun != $last_lun )); then
 			if (( tot_len != 1024 )); then
 				cleanup_130
-				error "FIEMAP on $fm_file failed; returned len $tot_len for OST $last_lun instead of 1024"
+				error "FIEMAP on $fm_file failed; returned " \
+				"len $tot_len for OST $last_lun instead of 1024"
 				return
 			else
 				(( num_luns += 1 ))
@@ -8986,7 +9126,8 @@ test_130d() {
 	done
 	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"
+		error "FIEMAP on $fm_file failed; returned wrong number of " \
+			"luns or wrong len for OST $last_lun"
 		return
 	fi
 
@@ -8997,10 +9138,8 @@ test_130d() {
 run_test 130d "FIEMAP (N-stripe file)"
 
 test_130e() {
-	[ "$OSTCOUNT" -lt "2" ] && skip_env "skipping continuation FIEMAP test" && return
-
-	[ "$OSTCOUNT" -ge "10" ] &&
-		skip_env "skipping FIEMAP with >= 10 OSTs" && return
+	[ "$OSTCOUNT" -lt "2" ] &&
+		skip_env "skipping continuation FIEMAP test" && return
 
 	filefrag_op=$(filefrag -e 2>&1 | grep "invalid option")
 	[ -n "$filefrag_op" ] && skip "filefrag does not support FIEMAP" && return
@@ -9020,21 +9159,26 @@ test_130e() {
 	done
 
 	filefrag -ves $fm_file || error "filefrag $fm_file failed"
-	filefrag_op=`filefrag -ve $fm_file | grep -A 12000 "ext:" | grep -v "ext:" | grep -v "found"`
+	filefrag_op=$(filefrag -ve $fm_file |
+			sed -n '/ext:/,/found/{/ext:/d; /found/d; p}')
 
-	last_lun=`echo $filefrag_op | cut -d: -f5`
+	last_lun=$(echo $filefrag_op | cut -d: -f5 |
+		sed -e 's/^[ \t]*/0x/' | sed -e 's/0x0x/0x/')
 
 	IFS=$'\n'
 	tot_len=0
 	num_luns=1
 	for line in $filefrag_op
 	do
-		frag_lun=`echo $line | cut -d: -f5`
-		ext_len=`echo $line | cut -d: -f4`
+		frag_lun=$(echo $line | cut -d: -f5 |
+			sed -e 's/^[ \t]*/0x/' | sed -e 's/0x0x/0x/')
+		ext_len=$(echo $line | cut -d: -f4)
 		if (( $frag_lun != $last_lun )); then
 			if (( tot_len != $EXPECTED_LEN )); then
 				cleanup_130
-				error "FIEMAP on $fm_file failed; returned len $tot_len for OST $last_lun instead of $EXPECTED_LEN"
+				error "FIEMAP on $fm_file failed; returned " \
+				"len $tot_len for OST $last_lun instead " \
+				"of $EXPECTED_LEN"
 				return
 			else
 				(( num_luns += 1 ))
@@ -9046,7 +9190,8 @@ test_130e() {
 	done
 	if (( num_luns != 2 || tot_len != $EXPECTED_LEN )); then
 		cleanup_130
-		error "FIEMAP on $fm_file failed; returned wrong number of luns or wrong len for OST $last_lun"
+		error "FIEMAP on $fm_file failed; returned wrong number " \
+			"of luns or wrong len for OST $last_lun"
 		return
 	fi
 
@@ -9139,8 +9284,10 @@ test_133a() {
 	touch ${testdir}/${tfile} || "touch failed"
 	check_stats $SINGLEMDS "open" 1
 	check_stats $SINGLEMDS "close" 1
-	mknod ${testdir}/${tfile}-pipe p || "mknod failed"
-	check_stats $SINGLEMDS "mknod" 1
+	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.8.54) ] && {
+		mknod ${testdir}/${tfile}-pipe p || "mknod failed"
+		check_stats $SINGLEMDS "mknod" 2
+	}
 	rm -f ${testdir}/${tfile}-pipe || "pipe remove failed"
 	check_stats $SINGLEMDS "unlink" 1
 	rm -f ${testdir}/${tfile} || error "file remove failed"
@@ -9400,31 +9547,25 @@ test_133e() {
 }
 run_test 133e "Verifying OST {read,write}_bytes nid stats ================="
 
-test_133f() {
-	local proc_dirs
-
-	local dirs="/proc/fs/lustre/ /proc/sys/lnet/ /proc/sys/lustre/ \
-/sys/fs/lustre/ /sys/fs/lnet/"
-	local dir
-	for dir in $dirs; do
-		if [ -d $dir ]; then
-			proc_dirs="$proc_dirs $dir"
-		fi
-	done
-
-	local facet
+proc_dirs=""
+for dir in /proc/fs/lustre/ /proc/sys/lnet/ /proc/sys/lustre/ \
+	   /sys/fs/lustre/ /sys/fs/lnet/ /sys/kernel/debug/lnet/ \
+	   /sys/kernel/debug/lustre/; do
+	[[ -d $dir ]] && proc_dirs+=" $dir"
+done
 
+test_133f() {
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
 	remote_ost_nodsh && skip "remote OST with nodsh" && return
 	# First without trusting modes.
 	find $proc_dirs -exec cat '{}' \; &> /dev/null
 
 	# Second verifying readability.
-	find $proc_dirs \
-		-type f \
-		-exec cat '{}' \; &> /dev/null ||
-			error "proc file read failed"
+	$LCTL get_param -R '*' &> /dev/null || error "proc file read failed"
 
+	# eventually, this can also be replaced with "lctl get_param -R",
+	# but not until that option is always available on the server
+	local facet
 	for facet in $SINGLEMDS ost1; do
 		do_facet $facet find $proc_dirs \
 			! -name req_history \
@@ -9440,20 +9581,7 @@ test_133f() {
 run_test 133f "Check for LBUGs/Oopses/unreadable files in /proc"
 
 test_133g() {
-	local proc_dirs
-
-	local dirs="/proc/fs/lustre/ /proc/sys/lnet/ /proc/sys/lustre/ \
-/sys/fs/lustre/ /sys/fs/lnet/"
-	local dir
-	for dir in $dirs; do
-		if [ -d $dir ]; then
-			proc_dirs="$proc_dirs $dir"
-		fi
-	done
-
-	local facet
-
-	# Second verifying readability.
+	# Second verifying writability.
 	find $proc_dirs \
 		-type f \
 		-not -name force_lbug \
@@ -9467,6 +9595,7 @@ test_133g() {
 	[ $(lustre_version_code ost1) -le $(version_code 2.5.54) ] &&
 		skip "Too old lustre on ost1" && return
 
+	local facet
 	for facet in $SINGLEMDS ost1; do
 		do_facet $facet find $proc_dirs \
 			-type f \
@@ -9930,6 +10059,7 @@ test_154a() {
 	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] ||
 		{ skip "Need MDS version at least 2.2.51"; return 0; }
 	[ -z "$(which setfacl)" ] && skip "must have setfacl tool" && return
+	[ -n "$FILESET" ] && skip "SKIP due to FILESET set" && return
 
 	cp /etc/hosts $DIR/$tfile
 
@@ -9956,6 +10086,7 @@ test_154b() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.2.51) ]] ||
 		{ skip "Need MDS version at least 2.2.51"; return 0; }
+	[ -n "$FILESET" ] && skip "SKIP due to FILESET set" && return
 
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 
@@ -10052,6 +10183,7 @@ test_154e()
 run_test 154e ".lustre is not returned by readdir"
 
 test_154f() {
+	[ -n "$FILESET" ] && skip "SKIP due to FILESET set" && return
 	# create parent directory on a single MDT to avoid cross-MDT hardlinks
 	test_mkdir -p -c1 $DIR/$tdir/d
 	# test dirs inherit from its stripe
@@ -10124,6 +10256,7 @@ test_154f() {
 
 	rm -f $DIR/f
 	restore_lustre_params < $save
+	rm -f $save
 }
 run_test 154f "get parent fids by reading link ea"
 
@@ -10131,6 +10264,7 @@ test_154g()
 {
 	[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.92) ]] ||
 		{ skip "Need MDS version at least 2.6.92"; return 0; }
+	[ -n "$FILESET" ] && skip "SKIP due to FILESET set" && return
 
 	mkdir -p $DIR/$tdir
 	llapi_fid_test -d $DIR/$tdir
@@ -10672,8 +10806,7 @@ run_test 161a "link ea sanity"
 
 test_161b() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-	[ $MDSCOUNT -lt 2 ] &&
-		skip "skipping remote directory test" && return
+	[ $MDSCOUNT -lt 2 ] && skip "skipping remote directory test" && return
 	local MDTIDX=1
 	local remote_dir=$DIR/$tdir/remote_dir
 
@@ -11419,6 +11552,7 @@ test_185() { # LU-2441
 	local mtime1=$(stat -c "%Y" $DIR/$tdir)
 	local fid=$($MULTIOP $DIR/$tdir VFw4096c) ||
 		error "cannot create/write a volatile file"
+	[ "$FILESET" == "" ] &&
 	$CHECKSTAT -t file $MOUNT/.lustre/fid/$fid 2>/dev/null &&
 		error "FID is still valid after close"
 
@@ -11433,8 +11567,10 @@ test_185() { # LU-2441
 	# is unfortunately eaten by multiop_bg_pause
 	local n=$((${fidv[1]} + 1))
 	local next_fid="${fidv[0]}:$(printf "0x%x" $n):${fidv[2]}"
-	$CHECKSTAT -t file $MOUNT/.lustre/fid/$next_fid ||
-		error "FID is missing before close"
+	if [ "$FILESET" == "" ]; then
+		$CHECKSTAT -t file $MOUNT/.lustre/fid/$next_fid ||
+			error "FID is missing before close"
+	fi
 	kill -USR1 $multi_pid
 	# 1 second delay, so if mtime change we will see it
 	sleep 1
@@ -11485,6 +11621,7 @@ run_test 187b "Test data version change on volatile file"
 test_200() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	remote_mgs_nodsh && skip "remote MGS with nodsh" && return
+	[ -n "$FILESET" ] && skip "SKIP due to FILESET set" && return
 
 	local POOL=${POOL:-cea1}
 	local POOL_ROOT=${POOL_ROOT:-$DIR/d200.pools}
@@ -11784,6 +11921,7 @@ test_205() { # Job stats
 	cmd="dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 oflag=sync"
 	verify_jobstats "$cmd" "ost1"
 	# read
+	cancel_lru_locks osc
 	cmd="dd if=$DIR/$tfile of=/dev/null bs=1M count=1 iflag=direct"
 	verify_jobstats "$cmd" "ost1"
 	# truncate
@@ -12975,6 +13113,7 @@ test_230e() {
 	mkdir $DIR/$tdir/other_dir
 	touch $DIR/$tdir/migrate_dir/a
 	ln $DIR/$tdir/migrate_dir/a $DIR/$tdir/other_dir/b
+	ls $DIR/$tdir/other_dir
 
 	$LFS migrate -m 1 $DIR/$tdir/migrate_dir ||
 		error "migrate dir fails"
@@ -13018,6 +13157,7 @@ test_230f() {
 	touch $DIR/$tdir/migrate_dir/a
 	ln $DIR/$tdir/migrate_dir/a $DIR/$tdir/other_dir/ln1
 	ln $DIR/$tdir/migrate_dir/a $DIR/$tdir/other_dir/ln2
+	ls $DIR/$tdir/other_dir
 
 	# a should be migrated to MDT1, since no other links on MDT0
 	$LFS migrate -m 1 $DIR/$tdir/migrate_dir ||
@@ -13053,6 +13193,59 @@ test_230f() {
 }
 run_test 230f "migrate mulitple remote link files"
 
+test_230g() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+
+	mkdir -p $DIR/$tdir/migrate_dir
+
+	$LFS migrate -m 1000 $DIR/$tdir/migrate_dir &&
+		error "migrating dir to non-exist MDT succeeds"
+	true
+}
+run_test 230g "migrate dir to non-exist MDT"
+
+test_230h() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.64) ] &&
+		skip "Need MDS version at least 2.7.64" && return
+	local mdt_index
+
+	mkdir -p $DIR/$tdir/migrate_dir
+
+	$LFS migrate -m1 $DIR &&
+		error "migrating mountpoint1 should fail"
+
+	$LFS migrate -m1 $DIR/$tdir/.. &&
+		error "migrating mountpoint2 should fail"
+
+	$LFS migrate -m1 $DIR/$tdir/migrate_dir/.. ||
+		error "migrating $tdir fail"
+
+	mdt_index=$($LFS getstripe -M $DIR/$tdir)
+	[ $mdt_index == 1 ] || error "$mdt_index != 1 after migration"
+
+	mdt_index=$($LFS getstripe -M $DIR/$tdir/migrate_dir)
+	[ $mdt_index == 1 ] || error "$mdt_index != 1 after migration"
+
+}
+run_test 230h "migrate .. and root"
+
+test_230i() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+
+	mkdir -p $DIR/$tdir/migrate_dir
+
+	$LFS migrate -m 1 $DIR/$tdir/migrate_dir/ ||
+		error "migration fails with a tailing slash"
+
+	$LFS migrate -m 0 $DIR/$tdir/migrate_dir// ||
+		error "migration fails with two tailing slashes"
+}
+run_test 230i "lfs migrate -m tolerates trailing slashes"
+
 test_231a()
 {
 	# For simplicity this test assumes that max_pages_per_rpc
@@ -13064,16 +13257,20 @@ test_231a()
 
 	# clear the OSC stats
 	$LCTL set_param osc.*.stats=0 &>/dev/null
+	stop_writeback
 
 	# Client writes $bulk_size - there must be 1 rpc for $max_pages.
 	dd if=/dev/zero of=$DIR/$tdir/$tfile bs=$bulk_size count=1 \
 		oflag=direct &>/dev/null || error "dd failed"
 
+	sync; sleep 1; sync # just to be safe
 	local nrpcs=$($LCTL get_param osc.*.stats |awk '/ost_write/ {print $2}')
 	if [ x$nrpcs != "x1" ]; then
-		error "found $nrpc ost_write RPCs, not 1 as expected"
+		$LCTL get_param osc.*.stats
+		error "found $nrpcs ost_write RPCs, not 1 as expected"
 	fi
 
+	start_writeback
 	# Drop the OSC cache, otherwise we will read from it
 	cancel_lru_locks osc
 
@@ -13086,7 +13283,8 @@ test_231a()
 
 	nrpcs=$($LCTL get_param osc.*.stats | awk '/ost_read/ { print $2 }')
 	if [ x$nrpcs != "x1" ]; then
-		error "found $nrpc ost_read RPCs, not 1 as expected"
+		$LCTL get_param osc.*.stats
+		error "found $nrpcs ost_read RPCs, not 1 as expected"
 	fi
 }
 run_test 231a "checking that reading/writing of BRW RPC size results in one RPC"
@@ -13120,6 +13318,7 @@ run_test 232 "failed lock should not block umount"
 test_233a() {
 	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.3.64) ] ||
 	{ skip "Need MDS version at least 2.3.64"; return; }
+	[ -n "$FILESET" ] && skip "SKIP due to FILESET set" && return
 
 	local fid=$($LFS path2fid $MOUNT)
 	stat $MOUNT/.lustre/fid/$fid > /dev/null ||
@@ -13130,6 +13329,7 @@ run_test 233a "checking that OBF of the FS root succeeds"
 test_233b() {
 	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.5.90) ] ||
 	{ skip "Need MDS version at least 2.5.90"; return; }
+	[ -n "$FILESET" ] && skip "SKIP due to FILESET set" && return
 
 	local fid=$($LFS path2fid $MOUNT/.lustre)
 	stat $MOUNT/.lustre/fid/$fid > /dev/null ||
@@ -13311,7 +13511,7 @@ run_test 240 "race between ldlm enqueue and the connection RPC (no ASSERT)"
 test_241_bio() {
 	for LOOP in $(seq $1); do
 		dd if=$DIR/$tfile of=/dev/null bs=40960 count=1 2>/dev/null
-		cancel_lru_locks osc
+		cancel_lru_locks osc || true
 	done
 }
 
@@ -13398,6 +13598,173 @@ test_245() {
 }
 run_test 245 "check mdc connection flag/data: multiple modify RPCs"
 
+test_246() { # LU-7371
+	[ $(lustre_version_code ost1) -lt $(version_code 2.7.62) ] &&
+		skip "Need OST version >= 2.7.62" && return 0
+	do_facet ost1 $LCTL set_param fail_val=4095
+#define OBD_FAIL_OST_READ_SIZE		0x234
+	do_facet ost1 $LCTL set_param fail_loc=0x234
+	$LFS setstripe $DIR/$tfile -i 0 -c 1
+	dd if=/dev/zero of=$DIR/$tfile bs=4095 count=1 > /dev/null 2>&1
+	cancel_lru_locks $FSNAME-OST0000
+	dd if=$DIR/$tfile of=/dev/null bs=1048576 || error "Read failed"
+}
+run_test 246 "Read file of size 4095 should return right length"
+
+test_247a() {
+	lctl get_param -n mdc.$FSNAME-MDT0000*.import |
+		grep -q subtree ||
+		{ skip "Fileset feature is not supported"; return; }
+
+	local submount=${MOUNT}_$tdir
+
+	mkdir $MOUNT/$tdir
+	mkdir -p $submount || error "mkdir $submount failed"
+	FILESET="$FILESET/$tdir" mount_client $submount ||
+		error "mount $submount failed"
+	echo foo > $submount/$tfile || error "write $submount/$tfile failed"
+	[ $(cat $MOUNT/$tdir/$tfile) = "foo" ] ||
+		error "read $MOUNT/$tdir/$tfile failed"
+	umount_client $submount || error "umount $submount failed"
+	rmdir $submount
+}
+run_test 247a "mount subdir as fileset"
+
+test_247b() {
+	lctl get_param -n mdc.$FSNAME-MDT0000*.import | grep -q subtree ||
+		{ skip "Fileset feature is not supported"; return; }
+
+	local submount=${MOUNT}_$tdir
+
+	rm -rf $MOUNT/$tdir
+	mkdir -p $submount || error "mkdir $submount failed"
+	SKIP_FILESET=1
+	FILESET="$FILESET/$tdir" mount_client $submount &&
+		error "mount $submount should fail"
+	rmdir $submount
+}
+run_test 247b "mount subdir that dose not exist"
+
+test_247c() {
+	lctl get_param -n mdc.$FSNAME-MDT0000*.import | grep -q subtree ||
+		{ skip "Fileset feature is not supported"; return; }
+
+	local submount=${MOUNT}_$tdir
+
+	mkdir -p $MOUNT/$tdir/dir1
+	mkdir -p $submount || error "mkdir $submount failed"
+	FILESET="$FILESET/$tdir" mount_client $submount ||
+		error "mount $submount failed"
+	local fid=$($LFS path2fid $MOUNT/)
+	$LFS fid2path $submount $fid && error "fid2path should fail"
+	umount_client $submount || error "umount $submount failed"
+	rmdir $submount
+}
+run_test 247c "running fid2path outside root"
+
+test_247d() {
+	lctl get_param -n mdc.$FSNAME-MDT0000*.import | grep -q subtree ||
+		{ skip "Fileset feature is not supported"; return; }
+
+	local submount=${MOUNT}_$tdir
+
+	mkdir -p $MOUNT/$tdir/dir1
+	mkdir -p $submount || error "mkdir $submount failed"
+	FILESET="$FILESET/$tdir" mount_client $submount ||
+		error "mount $submount failed"
+	local fid=$($LFS path2fid $submount/dir1)
+	$LFS fid2path $submount $fid || error "fid2path should succeed"
+	umount_client $submount || error "umount $submount failed"
+	rmdir $submount
+}
+run_test 247d "running fid2path inside root"
+
+# LU-8037
+test_247e() {
+	lctl get_param -n mdc.$FSNAME-MDT0000*.import |
+		grep -q subtree ||
+		{ skip "Fileset feature is not supported"; return; }
+
+	local submount=${MOUNT}_$tdir
+
+	mkdir $MOUNT/$tdir
+	mkdir -p $submount || error "mkdir $submount failed"
+	FILESET="$FILESET/.." mount_client $submount &&
+		error "mount $submount should fail"
+	rmdir $submount
+}
+run_test 247e "mount .. as fileset"
+
+test_248() {
+	local my_error=error
+
+	# This test case is time sensitive and maloo uses kvm to run auto test.
+	# Therefore the complete time of I/O task is unreliable and depends on
+	# the work load on the host machine when the task is running.
+	which virt-what 2> /dev/null && [ "$(virt-what)" != "kvm" ] ||
+		{ echo "no virt-what installed or running in kvm; ignore error";
+		  my_error="error_ignore env=kvm"; }
+
+	# create a large file for fast read verification
+	dd if=/dev/zero of=$DIR/$tfile bs=128M count=1 > /dev/null 2>&1
+
+	# make sure the file is created correctly
+	$CHECKSTAT -s $((128*1024*1024)) $DIR/$tfile ||
+		{ rm -f $DIR/$tfile; skip "file creation error" && return; }
+
+	local saved_fast_read=$($LCTL get_param -n llite.*.fast_read)
+
+	echo "Test 1: verify that fast read is 4 times faster on cache read"
+
+	# small read with fast read enabled
+	$LCTL set_param -n llite.*.fast_read=1
+	local t_fast=$(eval time -p dd if=$DIR/$tfile of=/dev/null bs=4k 2>&1 |
+		   awk '/real/ { print $2 }')
+
+	# small read with fast read disabled
+	$LCTL set_param -n llite.*.fast_read=0
+	local t_slow=$(eval time -p dd if=$DIR/$tfile of=/dev/null bs=4k 2>&1 |
+		   awk '/real/ { print $2 }')
+
+	# verify that fast read is 4 times faster for cache read
+	[ $(bc <<< "4 * $t_fast < $t_slow") -eq 1 ] ||
+		$my_error "fast read was not 4 times faster: $t_fast vs $t_slow"
+
+	echo "Test 2: verify the performance between big and small read"
+	$LCTL set_param -n llite.*.fast_read=1
+
+	# 1k non-cache read
+	cancel_lru_locks osc
+	local t_1k=$(eval time -p dd if=$DIR/$tfile of=/dev/null bs=1k 2>&1 |
+	     awk '/real/ { print $2 }')
+
+	# 1M non-cache read
+	cancel_lru_locks osc
+	local t_1m=$(eval time -p dd if=$DIR/$tfile of=/dev/null bs=1M 2>&1 |
+	     awk '/real/ { print $2 }')
+
+	# verify that big IO is not 4 times faster than small IO
+	[ $(bc <<< "4 * $t_1k >= $t_1m") -eq 1 ] ||
+		$my_error "bigger IO is way too fast: $t_1k vs $t_1m"
+
+	$LCTL set_param -n llite.*.fast_read=$saved_fast_read
+	rm -f $DIR/$tfile
+}
+run_test 248 "fast read verification"
+
+test_249() { # LU-7890
+	rm -f $DIR/$tfile
+	$SETSTRIPE -c 1 $DIR/$tfile
+
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.53) ] &&
+	skip "Need at least version 2.8.54"
+
+	# Offset 2T == 4k * 512M
+	dd if=/dev/zero of=$DIR/$tfile bs=4k count=1 seek=512M ||
+		error "dd to 2T offset failed"
+}
+run_test 249 "Write above 2T file size"
+
 test_250() {
 	[ "$(facet_fstype ost$(($($GETSTRIPE -i $DIR/$tfile) + 1)))" = "zfs" ] \
 	 && skip "no 16TB file size limit on ZFS" && return
@@ -13480,6 +13847,110 @@ test_252() {
 }
 run_test 252 "check lr_reader tool"
 
+test_254() {
+	local cl_user
+
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	do_facet mds1 $LCTL get_param -n mdd.$MDT0.changelog_size ||
+		{ skip "MDS does not support changelog_size" && return; }
+
+	cl_user=$(do_facet mds1 $LCTL --device $MDT0 changelog_register -n)
+	echo "Registered as changelog user $cl_user"
+
+	$LFS changelog_clear $MDT0 $cl_user 0
+
+	local size1=$(do_facet mds1 \
+		      $LCTL get_param -n mdd.$MDT0.changelog_size)
+	echo "Changelog size $size1"
+
+	rm -rf $DIR/$tdir
+	$LFS mkdir -i 0 $DIR/$tdir
+	# change something
+	mkdir -p $DIR/$tdir/pics/2008/zachy
+	touch $DIR/$tdir/pics/2008/zachy/timestamp
+	cp /etc/hosts $DIR/$tdir/pics/2008/zachy/pic1.jpg
+	mv $DIR/$tdir/pics/2008/zachy $DIR/$tdir/pics/zach
+	ln $DIR/$tdir/pics/zach/pic1.jpg $DIR/$tdir/pics/2008/portland.jpg
+	ln -s $DIR/$tdir/pics/2008/portland.jpg $DIR/$tdir/pics/desktop.jpg
+	rm $DIR/$tdir/pics/desktop.jpg
+
+	local size2=$(do_facet mds1 \
+		      $LCTL get_param -n mdd.$MDT0.changelog_size)
+	echo "Changelog size after work $size2"
+
+	do_facet mds1 $LCTL --device $MDT0 changelog_deregister $cl_user
+
+	if (( size2 <= size1 )); then
+		error "Changelog size after work should be greater than original"
+	fi
+	return 0
+}
+run_test 254 "Check changelog size"
+
+test_256() {
+	local cl_user
+	local cat_sl
+	local mdt_dev
+
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	[ "$(facet_fstype mds1)" != "ldiskfs" ] &&
+		skip "non-ldiskfs backend" && return
+
+	mdt_dev=$(mdsdevname 1)
+	echo $mdt_dev
+	cl_user=$(do_facet mds1 \
+	"$LCTL get_param -n mdd.$MDT0.changelog_users | grep cl")
+	if [[ -n $cl_user ]]; then
+		skip "active changelog user"
+		return
+	fi
+
+	cl_user=$(do_facet mds1 $LCTL --device $MDT0 changelog_register -n)
+	echo "Registered as changelog user $cl_user"
+
+	rm -rf $DIR/$tdir
+	mkdir -p $DIR/$tdir
+
+	$LFS changelog_clear $MDT0 $cl_user 0
+
+	# change something
+	touch $DIR/$tdir/{1..10}
+
+	# stop the MDT
+	stop mds1 || error "Fail to stop MDT."
+
+	# remount the MDT
+	start mds1 $mdt_dev $MDS_MOUNT_OPTS || error "Fail to start MDT."
+
+	#after mount new plainllog is used
+	touch $DIR/$tdir/{11..19}
+	cat_sl=$(do_facet mds1 \
+	"$DEBUGFS -R \\\"dump changelog_catalog cat.dmp\\\" $mdt_dev; \
+	 llog_reader cat.dmp | grep \\\"type=1064553b\\\" | wc -l")
+
+	if (( cat_sl != 2 )); then
+		do_facet mds1 $LCTL --device $MDT0 changelog_deregister $cl_user
+		error "Changelog catalog has wrong number of slots $cat_sl"
+	fi
+
+	$LFS changelog_clear $MDT0 $cl_user 0
+
+	cat_sl=$(do_facet mds1 \
+	"$DEBUGFS -R \\\"dump changelog_catalog cat.dmp\\\" $mdt_dev; \
+	 llog_reader cat.dmp | grep \\\"type=1064553b\\\" | wc -l")
+
+	do_facet mds1 $LCTL --device $MDT0 changelog_deregister $cl_user
+
+	if (( cat_sl == 2 )); then
+		error "Empty plain llog was not deleted from changelog catalog"
+	fi
+	if (( cat_sl != 1 )); then
+		error "Active plain llog shouldn\`t be deleted from catalog"
+	fi
+}
+run_test 256 "Check llog delete for empty and not full state"
 
 cleanup_test_300() {
 	trap 0
@@ -13550,6 +14021,8 @@ test_striped_dir() {
 }
 
 test_300a() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.0) ] &&
+		skip "skipped for lustre < 2.7.0" && return
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 
@@ -13559,6 +14032,8 @@ test_300a() {
 run_test 300a "basic striped dir sanity test"
 
 test_300b() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.0) ] &&
+		skip "skipped for lustre < 2.7.0" && return
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	local i
@@ -13589,6 +14064,8 @@ test_300b() {
 run_test 300b "check ctime/mtime for striped dir"
 
 test_300c() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.0) ] &&
+		skip "skipped for lustre < 2.7.0" && return
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	local file_count
@@ -13612,6 +14089,8 @@ test_300c() {
 run_test 300c "chown && check ls under striped directory"
 
 test_300d() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.0) ] &&
+		skip "skipped for lustre < 2.7.0" && return
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	local stripe_count
@@ -14077,6 +14556,44 @@ test_300o() {
 }
 run_test 300o "unlink big sub stripe(> 65000 subdirs)"
 
+test_300p() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+
+	mkdir -p $DIR/$tdir
+
+	#define OBD_FAIL_OUT_ENOSPC	0x1704
+	do_facet mds2 lctl set_param fail_loc=0x80001704
+	$LFS setdirstripe -c2 $DIR/$tdir/bad_striped_dir > /dev/null 2>&1 &&
+			error "create striped directory should fail"
+
+	[ -e $DIR/$tdir/bad_striped_dir ] && error "striped dir exists"
+
+	$LFS setdirstripe -c2 $DIR/$tdir/bad_striped_dir
+	true
+}
+run_test 300p "create striped directory without space"
+
+test_300q() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+
+	local fd=$(free_fd)
+	local cmd="exec $fd<$tdir"
+	cd $DIR
+	$LFS mkdir -c $MDSCOUNT $tdir || error "create $tdir fails"
+	eval $cmd
+	cmd="exec $fd<&-"
+	trap "eval $cmd" EXIT
+	cd $tdir || error "cd $tdir fails"
+	rmdir  ../$tdir || error "rmdir $tdir fails"
+	mkdir local_dir && error "create dir succeeds"
+	$LFS setdirstripe -i1 remote_dir && error "create remote dir succeeds"
+	eval $cmd
+	return 0
+}
+run_test 300q "create remote directory under orphan directory"
+
 prepare_remote_file() {
 	mkdir $DIR/$tdir/src_dir ||
 		error "create remote source failed"
@@ -14173,6 +14690,7 @@ test_400a() { # LU-1606, was conf-sanity test_74
 		$CC -Wall -Werror $extra_flags -llustreapi -o $out $prog ||
 			error "client api broken"
 	done
+	rm -f $out
 }
 run_test 400a "Lustre client api program can compile and link"
 
@@ -14205,9 +14723,175 @@ test_400b() { # LU-1606, LU-5011
 		$CC -Wall -Werror -include $header -c -x c /dev/null -o $out ||
 			error "cannot compile '$header'"
 	done
+	rm -f $out
 }
 run_test 400b "packaged headers can be compiled"
 
+test_401a() { #LU-7437
+	#count the number of parameters by "list_param -R"
+	local params=$($LCTL list_param -R '*' 2>/dev/null | wc -l)
+	#count the number of parameters by listing proc files
+	local procs=$(find -L $proc_dirs -mindepth 1 -printf '%P\n' 2>/dev/null|
+		      sort -u | wc -l)
+
+	[ $params -eq $procs ] ||
+		error "found $params parameters vs. $procs proc files"
+
+	# test the list_param -D option only returns directories
+	params=$($LCTL list_param -R -D '*' 2>/dev/null | wc -l)
+	#count the number of parameters by listing proc directories
+	procs=$(find -L $proc_dirs -mindepth 1 -type d -printf '%P\n' 2>/dev/null |
+		sort -u | wc -l)
+
+	[ $params -eq $procs ] ||
+		error "found $params parameters vs. $procs proc files"
+}
+run_test 401a "Verify if 'lctl list_param -R' can list parameters recursively"
+
+test_401b() {
+	local save=$($LCTL get_param -n jobid_var)
+	local tmp=testing
+
+	$LCTL set_param foo=bar jobid_var=$tmp bar=baz &&
+		error "no error returned when setting bad parameters"
+
+	local jobid_new=$($LCTL get_param -n foe jobid_var baz)
+	[[ "$jobid_new" == "$tmp" ]] || error "jobid tmp $jobid_new != $tmp"
+
+	$LCTL set_param -n fog=bam jobid_var=$save bat=fog
+	local jobid_old=$($LCTL get_param -n foe jobid_var bag)
+	[[ "$jobid_old" == "$save" ]] || error "jobid new $jobid_old != $save"
+}
+run_test 401b "Verify 'lctl {get,set}_param' continue after error"
+
+test_401c() {
+	local jobid_var_old=$($LCTL get_param -n jobid_var)
+	local jobid_var_new
+
+	$LCTL set_param jobid_var= &&
+		error "no error returned for 'set_param a='"
+
+	jobid_var_new=$($LCTL get_param -n jobid_var)
+	[[ "$jobid_var_old" == "$jobid_var_new" ]] ||
+		error "jobid_var was changed by setting without value"
+
+	$LCTL set_param jobid_var &&
+		error "no error returned for 'set_param a'"
+
+	jobid_var_new=$($LCTL get_param -n jobid_var)
+	[[ "$jobid_var_old" == "$jobid_var_new" ]] ||
+		error "jobid_var was changed by setting without value"
+}
+run_test 401c "Verify 'lctl set_param' without value fails in either format."
+
+test_401d() {
+	local jobid_var_old=$($LCTL get_param -n jobid_var)
+	local jobid_var_new
+	local new_value="foo=bar"
+
+	$LCTL set_param jobid_var=$new_value ||
+		error "'set_param a=b' did not accept a value containing '='"
+
+	jobid_var_new=$($LCTL get_param -n jobid_var)
+	[[ "$jobid_var_new" == "$new_value" ]] ||
+		error "'set_param a=b' failed on a value containing '='"
+
+	# Reset the jobid_var to test the other format
+	$LCTL set_param jobid_var=$jobid_var_old
+	jobid_var_new=$($LCTL get_param -n jobid_var)
+	[[ "$jobid_var_new" == "$jobid_var_old" ]] ||
+		error "failed to reset jobid_var"
+
+	$LCTL set_param jobid_var $new_value ||
+		error "'set_param a b' did not accept a value containing '='"
+
+	jobid_var_new=$($LCTL get_param -n jobid_var)
+	[[ "$jobid_var_new" == "$new_value" ]] ||
+		error "'set_param a b' failed on a value containing '='"
+
+	$LCTL set_param jobid_var $jobid_var_old
+	jobid_var_new=$($LCTL get_param -n jobid_var)
+	[[ "$jobid_var_new" == "$jobid_var_old" ]] ||
+		error "failed to reset jobid_var"
+}
+run_test 401d "Verify 'lctl set_param' accepts values containing '='"
+
+test_402() {
+	$LFS setdirstripe -i 0 $DIR/$tdir || error "setdirstripe -i 0 failed"
+#define OBD_FAIL_MDS_FLD_LOOKUP 0x15c
+	do_facet mds1 "lctl set_param fail_loc=0x8000015c"
+	touch $DIR/$tdir/$tfile && error "touch should fail with ENOENT" ||
+		echo "Touch failed - OK"
+}
+run_test 402 "Return ENOENT to lod_generate_and_set_lovea"
+
+test_403() {
+	local file1=$DIR/$tfile.1
+	local file2=$DIR/$tfile.2
+	local tfile=$TMP/$tfile
+
+	rm -f $file1 $file2 $tfile
+
+	touch $file1
+	ln $file1 $file2
+
+	# 30 sec OBD_TIMEOUT in ll_getattr()
+	# right before populating st_nlink
+	$LCTL set_param fail_loc=0x80001409
+	stat -c %h $file1 > $tfile &
+
+	# create an alias, drop all locks and reclaim the dentry
+	< $file2
+	cancel_lru_locks mdc
+	cancel_lru_locks osc
+	sysctl -w vm.drop_caches=2
+
+	wait
+
+	[ `cat $tfile` -gt 0 ] || error "wrong nlink count: `cat $tfile`"
+
+	rm -f $tfile $file1 $file2
+}
+run_test 403 "i_nlink should not drop to zero due to aliasing"
+
+test_404() { # LU-6601
+	local mosps=$(do_facet $SINGLEMDS $LCTL dl |
+		awk '/osp .*-osc-MDT/ { print $4}')
+
+	local osp
+	for osp in $mosps; do
+		echo "Deactivate: " $osp
+		do_facet $SINGLEMDS $LCTL --device %$osp deactivate
+		local stat=$(do_facet $SINGLEMDS $LCTL dl |
+			awk -vp=$osp '$4 == p { print $2 }')
+		[ $stat = IN ] || {
+			do_facet $SINGLEMDS $LCTL dl | grep -w $osp
+			error "deactivate error"
+		}
+		echo "Activate: " $osp
+		do_facet $SINGLEMDS $LCTL --device %$osp activate
+		local stat=$(do_facet $SINGLEMDS $LCTL dl |
+			awk -vp=$osp '$4 == p { print $2 }')
+		[ $stat = UP ] || {
+			do_facet $SINGLEMDS $LCTL dl | grep -w $osp
+			error "activate error"
+		}
+	done
+}
+run_test 404 "validate manual {de}activated works properly for OSPs"
+
+test_405() {
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.6.92) ] &&
+		skip "Layout swap lock is not supported" && return
+
+	check_swap_layouts_support && return 0
+
+	test_mkdir -p $DIR/$tdir
+	swap_lock_test -d $DIR/$tdir ||
+		error "One layout swap locked test failed"
+}
+run_test 405 "Various layout swap lock tests"
+
 #
 # tests that do cleanup/setup should be run at the end
 #