X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=f9371d6d73e3fa54cc79f4451da8de228f3b8c2e;hp=824ba8faac2c66df360dfcfbc420c583bc98082f;hb=bcb95d6b82f4208998201cc12f63fc1074c3003c;hpb=5725559786086f328f4c899936967eb6e5dce46e

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
old mode 100644
new mode 100755
index 824ba8f..f9371d6
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -16,6 +16,24 @@ ALWAYS_EXCEPT="                42a  42b  42c  42d  45   51d   68b   $SANITY_EXCE
 # bug number for skipped tests: LU-2036
 ALWAYS_EXCEPT="                 76     $ALWAYS_EXCEPT"
 
+is_sles11()						# LU-4341
+{
+	if [ -r /etc/SuSE-release ]
+	then
+		local vers=$(grep VERSION /etc/SuSE-release | awk '{print $3}')
+		local patchlev=$(grep PATCHLEVEL /etc/SuSE-release |
+			awk '{ print $3 }')
+		if [ $vers -eq 11 ] && [ $patchlev -ge 3 ]; then
+			return 0
+		fi
+	fi
+	return 1
+}
+
+if is_sles11; then					# LU-4341
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 170"
+fi
+
 SRCDIR=$(cd $(dirname $0); echo $PWD)
 export PATH=$PATH:/sbin
 
@@ -38,7 +56,6 @@ SOCKETCLIENT=${SOCKETCLIENT:-socketclient}
 MEMHOG=${MEMHOG:-memhog}
 DIRECTIO=${DIRECTIO:-directio}
 ACCEPTOR_PORT=${ACCEPTOR_PORT:-988}
-UMOUNT=${UMOUNT:-"umount -d"}
 STRIPES_PER_OBJ=-1
 CHECK_GRANT=${CHECK_GRANT:-"yes"}
 GRANT_CHECK_LIST=${GRANT_CHECK_LIST:-""}
@@ -94,11 +111,6 @@ 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
@@ -539,11 +551,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) ] &&
@@ -576,49 +584,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
 }
@@ -1080,6 +1081,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
@@ -1425,6 +1430,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
@@ -1868,6 +1876,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"
@@ -2348,7 +2357,7 @@ run_test 31p "remove of open striped directory"
 
 cleanup_test32_mount() {
 	trap 0
-	$UMOUNT -d $DIR/$tdir/ext2-mountpoint
+	$UMOUNT $DIR/$tdir/ext2-mountpoint
 }
 
 test_32a() {
@@ -2555,7 +2564,7 @@ run_test 32p "open d32p/symlink->tmp/symlink->lustre-root/$tfile"
 
 cleanup_testdir_mount() {
 	trap 0
-	$UMOUNT -d $DIR/$tdir
+	$UMOUNT $DIR/$tdir
 }
 
 test_32q() {
@@ -4296,7 +4305,7 @@ cleanup_54c() {
 	loopdev="$DIR/loop54c"
 
 	trap 0
-	$UMOUNT -d $DIR/$tdir || rc=$?
+	$UMOUNT $DIR/$tdir || rc=$?
 	losetup -d $loopdev || true
 	losetup -d $LOOPDEV || true
 	rm -rf $loopdev $DIR/$tfile $DIR/$tdir
@@ -4841,7 +4850,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
@@ -5212,19 +5223,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 ========"
@@ -5260,6 +5271,15 @@ test_60d() {
 }
 run_test 60d "test printk console message masking"
 
+test_60e() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	touch $DIR/$tfile
+#define OBD_FAIL_MDS_LLOG_CREATE_FAILED2  0x15b
+	do_facet mds1 lctl set_param fail_loc=0x15b
+	rm $DIR/$tfile
+}
+run_test 60e "no space while new llog is being created"
+
 test_61() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	f="$DIR/f61"
@@ -5355,28 +5375,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
@@ -5390,7 +5417,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
@@ -5414,6 +5441,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"
@@ -5425,6 +5454,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
@@ -5623,7 +5654,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
@@ -6185,7 +6216,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
 }
@@ -7571,7 +7602,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=$?
@@ -8672,7 +8703,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() {
@@ -8684,6 +8726,7 @@ 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
@@ -8691,8 +8734,8 @@ test_129() {
 	# 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
@@ -8701,15 +8744,25 @@ test_129() {
 	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"
 
+			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")
 
 			if [ $(lustre_version_code $SINGLEMDS) -lt \
@@ -8721,7 +8774,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
@@ -8729,7 +8782,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 ========================"
@@ -9374,31 +9427,24 @@ 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/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 \
@@ -9414,20 +9460,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 \
@@ -9441,6 +9474,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 \
@@ -10571,6 +10605,36 @@ test_160c() {
 }
 run_test 160c "verify that changelog log catch the truncate event"
 
+test_160d() {
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+
+	local server_version=$(lustre_version_code mds1)
+	local CL_MASK_PARAM="mdd.$MDT0.changelog_mask"
+
+	[[ $server_version -ge $(version_code 2.7.60) ]] ||
+		{ skip "Need MDS version at least 2.7.60+"; return; }
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+
+	# Registration step
+	local USER=$(do_facet mds1 $LCTL --device $MDT0 \
+		changelog_register -n)
+
+	mkdir -p $DIR/$tdir/migrate_dir
+	$LFS changelog_clear $MDT0 $USER 0
+
+	$LFS migrate -m 1 $DIR/$tdir/migrate_dir || error "migrate fails"
+	$LFS changelog $MDT0
+	MIGRATES=$($LFS changelog $MDT0 | tail -5 | grep -c "MIGRT")
+	$LFS changelog_clear $MDT0 $USER 0
+	[ $MIGRATES -eq 1 ] ||
+		error "MIGRATE changelog mask count $MIGRATES != 1"
+
+	# Deregistration step
+	do_facet mds1 $LCTL --device $MDT0 changelog_deregister $USER
+}
+run_test 160d "verify that changelog log catch the migrate event"
+
 test_161a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	test_mkdir -p -c1 $DIR/$tdir
@@ -10775,7 +10839,7 @@ check_path() {
     echo "fid $fid resolves to path $path (expected $expected)"
 }
 
-test_162() {
+test_162a() { # was test_162
 	# Make changes to filesystem
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	test_mkdir -p -c1 $DIR/$tdir/d2
@@ -10823,7 +10887,7 @@ test_162() {
 
 	return 0
 }
-run_test 162 "path lookup sanity"
+run_test 162a "path lookup sanity"
 
 test_162b() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
@@ -11606,7 +11670,12 @@ elif [ -n "$LOADL_STEPID" ]; then # LoadLeveller
 elif [ -n "$JOB_ID" ]; then # Sun Grid Engine
 	JOBENV=JOB_ID
 else
-	JOBENV=FAKE_JOBID
+	$LCTL list_param jobid_name > /dev/null 2>&1
+	if [ $? -eq 0 ]; then
+		JOBENV=nodelocal
+	else
+		JOBENV=FAKE_JOBID
+	fi
 fi
 
 verify_jobstats() {
@@ -11627,6 +11696,13 @@ verify_jobstats() {
 		FAKE_JOBID=id.$testnum.$(basename ${cmd[0]}).$RANDOM
 
 	JOBVAL=${!JOBENV}
+
+	[ "$JOBENV" = "nodelocal" ] && {
+		FAKE_JOBID=id.$testnum.$(basename ${cmd[0]}).$RANDOM
+		$LCTL set_param jobid_name=$FAKE_JOBID
+		JOBVAL=$FAKE_JOBID
+	}
+
 	log "Test: ${cmd[*]}"
 	log "Using JobID environment variable $JOBENV=$JOBVAL"
 
@@ -11725,7 +11801,7 @@ test_205() { # Job stats
 	cmd="mv -f $DIR/$tfile $DIR/$tdir.rename"
 	verify_jobstats "$cmd" "$SINGLEMDS"
 	# jobstats expiry - sleep until old stats should be expired
-	local left=$((interval_new - (SECONDS - start)))
+	local left=$((interval_new + 2 - (SECONDS - start)))
 	[ $left -ge 0 ] && echo "sleep $left for expiry" && sleep $((left + 1))
 	cmd="mkdir $DIR/$tdir.expire"
 	verify_jobstats "$cmd" "$SINGLEMDS"
@@ -12907,6 +12983,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"
@@ -12936,7 +13013,94 @@ test_230e() {
 
 	rm -rf $DIR/$tdir || error "rm dir failed after migration"
 }
-run_test 230e "migrate mulitple link files"
+run_test 230e "migrate mulitple local link files"
+
+test_230f() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	local a_fid
+	local ln_fid
+
+	mkdir -p $DIR/$tdir
+	mkdir $DIR/$tdir/migrate_dir
+	$LFS mkdir -i1 $DIR/$tdir/other_dir
+	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 ||
+		error "migrate dir fails"
+	mdt_index=$($LFS getstripe -M $DIR/$tdir/migrate_dir)
+	[ $mdt_index == 1 ] || error "migrate_dir is not on MDT1"
+	mdt_index=$($LFS getstripe -M $DIR/$tdir/migrate_dir/a)
+	[ $mdt_index == 1 ] || error "a is not on MDT1"
+
+	# a should stay on MDT1, because it is a mulitple link file
+	$LFS migrate -m 0 $DIR/$tdir/migrate_dir ||
+		error "migrate dir fails"
+	mdt_index=$($LFS getstripe -M $DIR/$tdir/migrate_dir/a)
+	[ $mdt_index == 1 ] || error "a is not on MDT1"
+
+	$LFS migrate -m 1 $DIR/$tdir/migrate_dir ||
+		error "migrate dir fails"
+
+	a_fid=$($LFS path2fid $DIR/$tdir/migrate_dir/a)
+	ln_fid=$($LFS path2fid $DIR/$tdir/other_dir/ln1)
+	[ "$a_fid" = "$ln_fid" ] || error "different fid after migrate to MDT1"
+
+	rm -rf $DIR/$tdir/other_dir/ln1 || error "unlink ln1 fails"
+	rm -rf $DIR/$tdir/other_dir/ln2 || error "unlink ln2 fails"
+
+	# a should be migrated to MDT0, since no other links on MDT1
+	$LFS migrate -m 0 $DIR/$tdir/migrate_dir ||
+		error "migrate dir fails"
+	mdt_index=$($LFS getstripe -M $DIR/$tdir/migrate_dir/a)
+	[ $mdt_index == 0 ] || error "a is not on MDT0"
+
+	rm -rf $DIR/$tdir || error "rm dir failed after migration"
+}
+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_231a()
 {
@@ -12949,16 +13113,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
 
@@ -12971,7 +13139,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"
@@ -13196,7 +13365,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
 }
 
@@ -13283,6 +13452,19 @@ 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_250() {
 	[ "$(facet_fstype ost$(($($GETSTRIPE -i $DIR/$tfile) + 1)))" = "zfs" ] \
 	 && skip "no 16TB file size limit on ZFS" && return
@@ -13962,6 +14144,24 @@ 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"
+
 prepare_remote_file() {
 	mkdir $DIR/$tdir/src_dir ||
 		error "create remote source failed"
@@ -14093,6 +14293,26 @@ test_400b() { # LU-1606, LU-5011
 }
 run_test 400b "packaged headers can be compiled"
 
+test_401() { #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 2>/dev/null | wc -l)
+
+	[ $params -eq $procs ] ||
+		error "found $params parameters vs. $procs proc files"
+}
+run_test 401 "Verify if 'lctl list_param -R' can list parameters recursively"
+
+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"
+
 #
 # tests that do cleanup/setup should be run at the end
 #