X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=865cac448248c714b9fd853965bf9d10cbd76f46;hb=d48a0ebb5a8d5d49684325434b503e8aab085397;hp=a79e40940c6e7b45c6ed69ab80369e91a71788e5;hpb=409719608cf0f607635fca5fb66b84a2e4aa1d4f;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index a79e409..865cac4 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -241,12 +241,13 @@ test_0d() { # LU-3397
 	[ "$exp_val" == "$imp_val" ] ||
 		error "export flags '$exp_val' != import flags '$imp_val'"
 
-	# Compare the value of client version
+	# Compare client versions.  Only compare top-3 fields for compatibility
 	exp_client_version=$(awk '/target_version:/ { print $2 }' $temp_exp)
-	exp_val=$(version_code $exp_client_version)
-	imp_val=$CLIENT_VERSION
+	exp_val=$(version_code $(cut -d. -f1,2,3 <<<$exp_client_version))
+	imp_val=$(version_code $(lustre_build_version client | cut -d. -f1,2,3))
 	[ "$exp_val" == "$imp_val" ] ||
-		error "export client version '$exp_val' != '$imp_val'"
+		error "exp version '$exp_client_version'($exp_val) != " \
+			"'$(lustre_build_version client)'($imp_val)"
 }
 run_test 0d "check export proc ============================="
 
@@ -1640,7 +1641,7 @@ test_27ce() {
 	[[ $($LCTL get_param mdc.*.import) =~ connect_flags.*overstriping ]] ||
 		skip "server does not support overstriping"
 	# We do one more stripe than we have OSTs
-	[ $OSTCOUNT -ge 159 ] || large_xattr_enabled ||
+	[ $OSTCOUNT -lt 159 ] || large_xattr_enabled ||
 		skip_env "ea_inode feature disabled"
 
 	test_mkdir -p $DIR/$tdir
@@ -1907,6 +1908,57 @@ test_27o() {
 }
 run_test 27o "create file with all full OSTs (should error)"
 
+function create_and_checktime() {
+	local fname=$1
+	local loops=$2
+	local i
+
+	for ((i=0; i < $loops; i++)); do
+		local start=$SECONDS
+		multiop $fname-$i Oc
+		((SECONDS-start < TIMEOUT)) ||
+			error "creation took " $((SECONDS-$start)) && return 1
+	done
+}
+
+test_27oo() {
+	local mdts=$(comma_list $(mdts_nodes))
+
+	[ $MDS1_VERSION -lt $(version_code 2.13.57) ] &&
+		skip "Need MDS version at least 2.13.57"
+
+	local f0=$DIR/${tfile}-0
+	local f1=$DIR/${tfile}-1
+
+	wait_delete_completed
+
+	# refill precreated objects
+	$LFS setstripe -i0 -c1 $f0
+
+	saved=$(do_facet mds1 $LCTL get_param -n lov.*0000*.qos_threshold_rr)
+	# force QoS allocation policy
+	do_nodes $mdts $LCTL set_param lov.*.qos_threshold_rr=0%
+	stack_trap "do_nodes $mdts $LCTL set_param \
+		lov.*.qos_threshold_rr=$saved" EXIT
+	sleep_maxage
+
+	# one OST is unavailable, but still have few objects preallocated
+	stop ost1
+	stack_trap "start ost1 $(ostdevname 1) $OST_MOUNT_OPTS; \
+		rm -rf $f1 $DIR/$tdir*" EXIT
+
+	for ((i=0; i < 7; i++)); do
+		mkdir $DIR/$tdir$i || error "can't create dir"
+		$LFS setstripe -c$((OSTCOUNT-1)) $DIR/$tdir$i ||
+			error "can't set striping"
+	done
+	for ((i=0; i < 7; i++)); do
+		create_and_checktime $DIR/$tdir$i/$tfile 100 &
+	done
+	wait
+}
+run_test 27oo "don't let few threads to reserve too many objects"
+
 test_27p() {
 	[[ $OSTCOUNT -lt 2 ]] && skip_env "needs >= 2 OSTs"
 	[ $PARALLEL == "yes" ] && skip "skip parallel run"
@@ -2396,7 +2448,7 @@ test_27Cb() {
 
 	test_mkdir -p $DIR/$tdir
 	local setcount=$(($OSTCOUNT * 2))
-	[ $setcount -ge 160 ] || large_xattr_enabled ||
+	[ $setcount -lt 160 ] || large_xattr_enabled ||
 		skip_env "ea_inode feature disabled"
 
 	$LFS setstripe -C $setcount $DIR/$tdir/$tfile ||
@@ -2422,7 +2474,7 @@ test_27Cc() {
 	test_mkdir -p $DIR/$tdir
 	local setcount=$(($OSTCOUNT - 1))
 
-	[ $setcount -ge 160 ] || large_xattr_enabled ||
+	[ $setcount -lt 160 ] || large_xattr_enabled ||
 		skip_env "ea_inode feature disabled"
 
 	$LFS setstripe -C $setcount $DIR/$tdir/$tfile ||
@@ -2502,7 +2554,7 @@ test_27Cf() {
 	test_mkdir -p $DIR/$tdir
 
 	local setcount=$(($OSTCOUNT * 2))
-	[ $setcount -ge 160 ] || large_xattr_enabled ||
+	[ $setcount -lt 160 ] || large_xattr_enabled ||
 		skip_env "ea_inode feature disabled"
 
 	$LFS setstripe  -C $setcount $DIR/$tdir/ ||
@@ -2720,6 +2772,17 @@ test_27J() {
 	local uuid2=$(cat /proc/sys/kernel/random/uuid)
 
 	# create foreign file (raw way)
+	! $LFS setstripe --flags 0xda08 $DIR/$tdir/$tfile ||
+		error "creating $tfile w/ hex flags w/o --foreign should fail"
+
+	! $LFS setstripe --foreign --flags foo \
+		--xattr ${uuid1}@${uuid2} $DIR/$tdir/$tfile ||
+			error "creating $tfile with '--flags foo' should fail"
+
+	! $LFS setstripe --foreign --flags 0xffffffff \
+		--xattr ${uuid1}@${uuid2} $DIR/$tdir/$tfile ||
+			error "creating $tfile w/ 0xffffffff flags should fail"
+
 	create_foreign_file -f $DIR/$tdir/$tfile -x "${uuid1}@${uuid2}" \
 		-t 1 -F 0xda08 || error "create_foreign_file failed"
 
@@ -2746,7 +2809,7 @@ test_27J() {
 		error "$DIR/$tdir/$tfile: invalid LOV EA foreign value"
 
 	# create foreign file (lfs + API)
-	$LFS setstripe --foreign=daos --flags 0xda08 \
+	$LFS setstripe --foreign=none --flags 0xda08 \
 		-x "${uuid1}@${uuid2}" $DIR/$tdir/${tfile}2 ||
 		error "$DIR/$tdir/${tfile}2: create failed"
 
@@ -2756,7 +2819,7 @@ test_27J() {
 	# lfm_length is LOV EA size - sizeof(lfm_magic) - sizeof(lfm_length)
 	$LFS getstripe -v $DIR/$tdir/${tfile}2 | grep "lfm_length:.*73" ||
 		error "$DIR/$tdir/${tfile}2: invalid LOV EA foreign size"
-	$LFS getstripe -v $DIR/$tdir/${tfile}2 | grep "lfm_type:.*daos" ||
+	$LFS getstripe -v $DIR/$tdir/${tfile}2 | grep "lfm_type:.*none" ||
 		error "$DIR/$tdir/${tfile}2: invalid LOV EA foreign type"
 	$LFS getstripe -v $DIR/$tdir/${tfile}2 |
 		grep "lfm_flags:.*0x0000DA08" ||
@@ -2815,6 +2878,17 @@ test_27K() {
 	local uuid2=$(cat /proc/sys/kernel/random/uuid)
 
 	# create foreign dir (raw way)
+	! $LFS setdirstripe --flags 0xda08 $DIR/$tdir/$tdir ||
+		error "creating $tdir w/ hex flags w/o --foreign should fail"
+
+	! $LFS setdirstripe --foreign --flags foo \
+		--xattr ${uuid1}@${uuid2} $DIR/$tdir/$tdir ||
+			error "creating $tdir with '--flags foo' should fail"
+
+	! $LFS setdirstripe --foreign --flags 0xffffffff \
+		--xattr ${uuid1}@${uuid2} $DIR/$tdir/$tdir ||
+			error "creating $tdir w/ 0xffffffff flags should fail"
+
 	create_foreign_dir -d $DIR/$tdir/$tdir -x "${uuid1}@${uuid2}" -t 1 ||
 		error "create_foreign_dir FAILED"
 
@@ -2826,7 +2900,8 @@ test_27K() {
 		error "$DIR/$tdir/$tdir: invalid LMV EA size"
 	parse_foreign_dir -d $DIR/$tdir/$tdir | grep "lmv_foreign_type: 1$" ||
 		error "$DIR/$tdir/$tdir: invalid LMV EA type"
-	parse_foreign_dir -d $DIR/$tdir/$tdir | grep "lmv_foreign_flags: 0$" ||
+	parse_foreign_dir -d $DIR/$tdir/$tdir |
+		grep "lmv_foreign_flags: 55813$" ||
 		error "$DIR/$tdir/$tdir: invalid LMV EA flags"
 	local lmv=$(parse_foreign_dir -d $DIR/$tdir/$tdir |
 		grep "lmv_foreign_value: 0x" |
@@ -2836,7 +2911,7 @@ test_27K() {
 	[[ $lmv == $lmv2 ]] || error "$DIR/$tdir/$tdir: invalid LMV EA value"
 
 	# create foreign dir (lfs + API)
-	$LFS mkdir --foreign=daos --xattr="${uuid1}@${uuid2}" --flags=0xda05 \
+	$LFS mkdir --foreign=none --xattr="${uuid1}@${uuid2}" --flags=0xda05 \
 		$DIR/$tdir/${tdir}2 ||
 		error "$DIR/$tdir/${tdir}2: create failed"
 
@@ -2847,7 +2922,7 @@ test_27K() {
 	# - sizeof(lfm_type) - sizeof(lfm_flags)
 	$LFS getdirstripe -v $DIR/$tdir/${tdir}2 | grep "lfm_length:.*73" ||
 		error "$DIR/$tdir/${tdir}2: invalid LMV EA size"
-	$LFS getdirstripe -v $DIR/$tdir/${tdir}2 | grep "lfm_type:.*daos" ||
+	$LFS getdirstripe -v $DIR/$tdir/${tdir}2 | grep "lfm_type:.*none" ||
 		error "$DIR/$tdir/${tdir}2: invalid LMV EA type"
 	$LFS getdirstripe -v $DIR/$tdir/${tdir}2 |
 		grep "lfm_flags:.*0x0000DA05" ||
@@ -3046,6 +3121,204 @@ test_27N() {
 }
 run_test 27N "lctl pool_list on separate MGS gives correct pool name"
 
+clean_foreign_symlink() {
+	trap 0
+	lctl set_param llite/$FSNAME-*/foreign_symlink_enable=0
+	for i in $DIR/$tdir/* ; do
+		$LFS unlink_foreign $i || true
+	done
+}
+
+test_27O() {
+	[[ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.12.51) ]] &&
+		skip "Need MDS version newer than 2.12.51"
+
+	test_mkdir $DIR/$tdir
+	local uuid1=$(cat /proc/sys/kernel/random/uuid)
+	local uuid2=$(cat /proc/sys/kernel/random/uuid)
+
+	trap clean_foreign_symlink EXIT
+
+	# enable foreign_symlink behaviour
+	$LCTL set_param llite/$FSNAME-*/foreign_symlink_enable=1
+
+	# foreign symlink LOV format is a partial path by default
+
+	# create foreign file (lfs + API)
+	$LFS setstripe --foreign=symlink --flags 0xda05 \
+		-x "${uuid1}/${uuid2}" --mode 0600 $DIR/$tdir/${tfile} ||
+		error "$DIR/$tdir/${tfile}: create failed"
+
+	$LFS getstripe -v $DIR/$tdir/${tfile} |
+		grep "lfm_magic:.*0x0BD70BD0" ||
+		error "$DIR/$tdir/${tfile}: invalid LOV EA foreign magic"
+	$LFS getstripe -v $DIR/$tdir/${tfile} | grep "lfm_type:.*symlink" ||
+		error "$DIR/$tdir/${tfile}: invalid LOV EA foreign type"
+	$LFS getstripe -v $DIR/$tdir/${tfile} |
+		grep "lfm_flags:.*0x0000DA05" ||
+		error "$DIR/$tdir/${tfile}: invalid LOV EA foreign flags"
+	$LFS getstripe $DIR/$tdir/${tfile} |
+		grep "lfm_value:.*${uuid1}/${uuid2}" ||
+		error "$DIR/$tdir/${tfile}: invalid LOV EA foreign value"
+
+	# modify striping should fail
+	$LFS setstripe -c 2 $DIR/$tdir/$tfile &&
+		error "$DIR/$tdir/$tfile: setstripe should fail"
+
+	# R/W should fail ("/{foreign_symlink_prefix}/${uuid1}/" missing)
+	cat $DIR/$tdir/$tfile && error "$DIR/$tdir/$tfile: read should fail"
+	cat /etc/passwd > $DIR/$tdir/$tfile &&
+		error "$DIR/$tdir/$tfile: write should fail"
+
+	# rename should succeed
+	mv $DIR/$tdir/$tfile $DIR/$tdir/${tfile}.new ||
+		error "$DIR/$tdir/$tfile: rename has failed"
+
+	#remove foreign_symlink file should fail
+	rm $DIR/$tdir/${tfile}.new &&
+		error "$DIR/$tdir/${tfile}.new: remove of foreign_symlink file should fail"
+
+	#test fake symlink
+	mkdir /tmp/${uuid1} ||
+		error "/tmp/${uuid1}: mkdir has failed"
+	echo FOOFOO > /tmp/${uuid1}/${uuid2} ||
+		error "/tmp/${uuid1}/${uuid2}: echo has failed"
+	$LCTL set_param llite/$FSNAME-*/foreign_symlink_prefix=/tmp/
+	$CHECKSTAT -t link -l /tmp/${uuid1}/${uuid2} $DIR/$tdir/${tfile}.new ||
+		error "$DIR/$tdir/${tfile}.new: not seen as a symlink"
+	#read should succeed now
+	cat $DIR/$tdir/${tfile}.new | grep FOOFOO ||
+		error "$DIR/$tdir/${tfile}.new: symlink resolution has failed"
+	#write should succeed now
+	cat /etc/passwd > $DIR/$tdir/${tfile}.new ||
+		error "$DIR/$tdir/${tfile}.new: write should succeed"
+	diff /etc/passwd $DIR/$tdir/${tfile}.new ||
+		error "$DIR/$tdir/${tfile}.new: diff has failed"
+	diff /etc/passwd /tmp/${uuid1}/${uuid2} ||
+		error "/tmp/${uuid1}/${uuid2}: diff has failed"
+
+	#check that getstripe still works
+	$LFS getstripe $DIR/$tdir/${tfile}.new ||
+		error "$DIR/$tdir/${tfile}.new: getstripe should still work with foreign_symlink enabled"
+
+	# chmod should still succeed
+	chmod 644 $DIR/$tdir/${tfile}.new ||
+		error "$DIR/$tdir/${tfile}.new: chmod has failed"
+
+	# chown should still succeed
+	chown $RUNAS_ID:$RUNAS_GID $DIR/$tdir/${tfile}.new ||
+		error "$DIR/$tdir/${tfile}.new: chown has failed"
+
+	# rename should still succeed
+	mv $DIR/$tdir/${tfile}.new $DIR/$tdir/${tfile} ||
+		error "$DIR/$tdir/${tfile}.new: rename has failed"
+
+	#remove foreign_symlink file should still fail
+	rm $DIR/$tdir/${tfile} &&
+		error "$DIR/$tdir/${tfile}: remove of foreign_symlink file should fail"
+
+	#use special ioctl() to unlink foreign_symlink file
+	$LFS unlink_foreign $DIR/$tdir/${tfile} ||
+		error "$DIR/$tdir/$tfile: unlink/ioctl failed"
+
+}
+run_test 27O "basic ops on foreign file of symlink type"
+
+test_27P() {
+	[[ $(lustre_version_code $SINGLEMDS) -le $(version_code 2.12.49) ]] &&
+		skip "Need MDS version newer than 2.12.49"
+
+	test_mkdir $DIR/$tdir
+	local uuid1=$(cat /proc/sys/kernel/random/uuid)
+	local uuid2=$(cat /proc/sys/kernel/random/uuid)
+
+	trap clean_foreign_symlink EXIT
+
+	# enable foreign_symlink behaviour
+	$LCTL set_param llite/$FSNAME-*/foreign_symlink_enable=1
+
+	# foreign symlink LMV format is a partial path by default
+
+	# create foreign dir (lfs + API)
+	$LFS mkdir --foreign=symlink --xattr="${uuid1}/${uuid2}" \
+		--flags=0xda05 --mode 0750 $DIR/$tdir/${tdir} ||
+		error "$DIR/$tdir/${tdir}: create failed"
+
+	$LFS getdirstripe -v $DIR/$tdir/${tdir} |
+		grep "lfm_magic:.*0x0CD50CD0" ||
+		error "$DIR/$tdir/${tdir}: invalid LMV EA magic"
+	$LFS getdirstripe -v $DIR/$tdir/${tdir} | grep "lfm_type:.*symlink" ||
+		error "$DIR/$tdir/${tdir}: invalid LMV EA type"
+	$LFS getdirstripe -v $DIR/$tdir/${tdir} |
+		grep "lfm_flags:.*0x0000DA05" ||
+		error "$DIR/$tdir/${tdir}: invalid LMV EA flags"
+	$LFS getdirstripe $DIR/$tdir/${tdir} |
+		grep "lfm_value.*${uuid1}/${uuid2}" ||
+		error "$DIR/$tdir/${tdir}: invalid LMV EA value"
+
+	# file create in dir should fail
+	# ("/{foreign_symlink_prefix}/${uuid1}/${uuid2}/" missing)
+	touch $DIR/$tdir/$tdir/$tfile && "$DIR/$tdir: file create should fail"
+
+	# rename should succeed
+	mv $DIR/$tdir/$tdir $DIR/$tdir/${tdir}.new ||
+		error "$DIR/$tdir/$tdir: rename of foreign_symlink dir has failed"
+
+	#remove foreign_symlink dir should fail
+	rmdir $DIR/$tdir/${tdir}.new &&
+		error "$DIR/$tdir/${tdir}.new: remove of foreign_symlink dir should fail"
+
+	#test fake symlink
+	mkdir -p /tmp/${uuid1}/${uuid2} ||
+		error "/tmp/${uuid1}/${uuid2}: mkdir has failed"
+	echo FOOFOO > /tmp/${uuid1}/${uuid2}/foo ||
+		error "/tmp/${uuid1}/${uuid2}/foo: echo has failed"
+	$LCTL set_param llite/$FSNAME-*/foreign_symlink_prefix=/tmp/
+	$CHECKSTAT -t link -l /tmp/${uuid1}/${uuid2} $DIR/$tdir/${tdir}.new ||
+		error "$DIR/$tdir/${tdir}.new: not seen as a symlink"
+	cat $DIR/$tdir/${tdir}.new/foo | grep FOOFOO ||
+		error "$DIR/$tdir/${tdir}.new: symlink resolution has failed"
+
+	#check that getstripe fails now that foreign_symlink enabled
+	$LFS getdirstripe $DIR/$tdir/${tdir}.new ||
+		error "$DIR/$tdir/${tdir}.new: getdirstripe should still work with foreign_symlink enabled"
+
+	# file create in dir should work now
+	cp /etc/passwd $DIR/$tdir/${tdir}.new/$tfile ||
+		error "$DIR/$tdir/${tdir}.new/$tfile: file create should fail"
+	diff /etc/passwd $DIR/$tdir/${tdir}.new/$tfile ||
+		error "$DIR/$tdir/${tdir}.new/$tfile: diff has failed"
+	diff /etc/passwd /tmp/${uuid1}/${uuid2}/$tfile ||
+		error "/tmp/${uuid1}/${uuid2}/$tfile: diff has failed"
+
+	# chmod should still succeed
+	chmod 755 $DIR/$tdir/${tdir}.new ||
+		error "$DIR/$tdir/${tdir}.new: chmod has failed"
+
+	# chown should still succeed
+	chown $RUNAS_ID:$RUNAS_GID $DIR/$tdir/${tdir}.new ||
+		error "$DIR/$tdir/${tdir}.new: chown has failed"
+
+	# rename should still succeed
+	mv $DIR/$tdir/${tdir}.new $DIR/$tdir/${tdir} ||
+		error "$DIR/$tdir/${tdir}.new: rename of foreign_symlink dir has failed"
+
+	#remove foreign_symlink dir should still fail
+	rmdir $DIR/$tdir/${tdir} &&
+		error "$DIR/$tdir/${tdir}: remove of foreign_symlink dir should fail"
+
+	#use special ioctl() to unlink foreign_symlink file
+	$LFS unlink_foreign $DIR/$tdir/${tdir} ||
+		error "$DIR/$tdir/$tdir: unlink/ioctl failed"
+
+	#created file should still exist
+	[[ -f /tmp/${uuid1}/${uuid2}/$tfile ]] ||
+		error "/tmp/${uuid1}/${uuid2}/$tfile has been removed"
+	diff /etc/passwd /tmp/${uuid1}/${uuid2}/$tfile ||
+		error "/tmp/${uuid1}/${uuid2}/$tfile: diff has failed"
+}
+run_test 27P "basic ops on foreign dir of foreign_symlink type"
+
 # createtest also checks that device nodes are created and
 # then visible correctly (#2091)
 test_28() { # bug 2091
@@ -4631,7 +4904,8 @@ test_39r() {
 
 	# exceed atime_diff and access file
 	sleep 6
-	dd if=$DIR/$tfile of=/dev/null || error "can't udpate atime"
+	dd if=$DIR/$tfile of=/dev/null bs=4k count=1 ||
+		error "can't udpate atime"
 
 	local atime_cli=$(stat -c %X $DIR/$tfile)
 	echo "client atime: $atime_cli"
@@ -4968,17 +5242,14 @@ test_44A() { # was test_44
 run_test 44A "zero length read from a sparse stripe"
 
 test_44a() {
-	local nstripe=$($LCTL lov_getconfig $DIR | grep default_stripe_count: |
-		awk '{ print $2 }')
+	local nstripe=$($LFS getstripe -c -d $DIR)
 	[ -z "$nstripe" ] && skip "can't get stripe info"
 	[[ $nstripe -gt $OSTCOUNT ]] &&
-		skip "Wrong default_stripe_count: $nstripe OSTCOUNT: $OSTCOUNT"
+		skip "Wrong default stripe_count: $nstripe OSTCOUNT: $OSTCOUNT"
 
-	local stride=$($LCTL lov_getconfig $DIR | grep default_stripe_size: |
-		awk '{ print $2 }')
+	local stride=$($LFS getstripe -S -d $DIR)
 	if [[ $nstripe -eq 0 || $nstripe -eq -1 ]]; then
-		nstripe=$($LCTL lov_getconfig $DIR | grep obd_count: |
-			awk '{ print $2 }')
+		nstripe=$($LFS df $DIR | grep OST: | wc -l)
 	fi
 
 	OFFSETS="0 $((stride/2)) $((stride-1))"
@@ -10499,6 +10770,21 @@ test_103c() {
 }
 run_test 103c "'cp -rp' won't set empty acl"
 
+test_103e() {
+	(( $MDS1_VERSION >= $(version_code 2.13.59) )) ||
+		skip "MDS needs to be at least 2.13.59"
+
+	mkdir -p $DIR/$tdir
+	# one default ACL will be created for the file owner
+	for U in {2..256}; do
+		setfacl -m default:user:$U:rwx $DIR/$tdir
+		numacl=$(getfacl $DIR/$tdir |& grep -c "default:user")
+		touch $DIR/$tdir/$tfile.$U ||
+			error "failed to create $tfile.$U with $numacl ACLs"
+	done
+}
+run_test 103e "inheritance of big amount of default ACLs"
+
 test_104a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run"
 
@@ -13405,6 +13691,7 @@ test_150a() {
 
 	local TF="$TMP/$tfile"
 
+	stack_trap "rm -f $DIR/$tfile; wait_delete_completed"
 	dd if=/dev/urandom of=$TF bs=6096 count=1 || error "dd failed"
 	cp $TF $DIR/$tfile
 	cancel_lru_locks $OSC
@@ -13427,29 +13714,46 @@ test_150a() {
 	echo "12345" >>$DIR/$tfile
 	cancel_lru_locks $OSC
 	cmp $TF $DIR/$tfile || error "$TF $DIR/$tfile differ (append2)"
-
-	rm -f $TF
-	true
 }
 run_test 150a "truncate/append tests"
 
 test_150b() {
-	[ "$ost1_FSTYPE" != ldiskfs ] && skip "non-ldiskfs backend"
-	[ $OST1_VERSION -lt $(version_code 2.13.50) ] &&
-		skip "Need OST version at least 2.13.53"
+	check_set_fallocate_or_skip
+
 	touch $DIR/$tfile
+	stack_trap "rm -f $DIR/$tfile; wait_delete_completed"
 	check_fallocate $DIR/$tfile || error "fallocate failed"
 }
 run_test 150b "Verify fallocate (prealloc) functionality"
 
-test_150c() {
-	local bytes
-	local want
+test_150bb() {
+	check_set_fallocate_or_skip
+
+	touch $DIR/$tfile
+	stack_trap "rm -f $DIR/$tfile; wait_delete_completed"
+	dd if=/dev/urandom of=$DIR/$tfile bs=1M count=20 || error "dd failed"
+	> $DIR/$tfile
+	fallocate -l $((1048576 * 20)) $DIR/$tfile || error "fallocate failed"
+	# precomputed md5sum for 20MB of zeroes
+	local expect="8f4e33f3dc3e414ff94e5fb6905cba8c"
+	local sum=($(md5sum $DIR/$tfile))
+
+	[[ "${sum[0]}" == "$expect" ]] || error "fallocate unwritten is not zero"
 
-	[ "$ost1_FSTYPE" != ldiskfs ] && skip "non-ldiskfs backend"
-	[ $OST1_VERSION -lt $(version_code 2.13.50) ] &&
-		skip "Need OST version at least 2.13.53"
+	check_set_fallocate 1
 
+	> $DIR/$tfile
+	fallocate -l $((1048576 * 20)) $DIR/$tfile || error "fallocate failed"
+	sum=($(md5sum $DIR/$tfile))
+
+	[[ "${sum[0]}" == "$expect" ]] || error "fallocate zero is not zero"
+}
+run_test 150bb "Verify fallocate modes both zero space"
+
+test_150c() {
+	check_set_fallocate_or_skip
+
+	stack_trap "rm -f $DIR/$tfile; wait_delete_completed"
 	$LFS setstripe -c $OSTCOUNT -S1M $DIR/$tfile || error "setstripe failed"
 	fallocate -l ${OSTCOUNT}m $DIR/$tfile || error "fallocate failed"
 	sync; sync_all_data
@@ -13471,8 +13775,8 @@ test_150c() {
 	sync; sync_all_data
 	cancel_lru_locks $OSC
 	sleep 5
-	bytes=$(($(stat -c '%b * %B' $DIR/$tfile)))
-	want=$((1024 * 1048576))
+	local bytes=$(($(stat -c '%b * %B' $DIR/$tfile)))
+	local want=$((1024 * 1048576))
 
 	# Must allocate all requested space, not more than 5% extra
 	(( $bytes >= $want && $bytes < $want * 105 / 100 )) ||
@@ -13481,20 +13785,16 @@ test_150c() {
 run_test 150c "Verify fallocate Size and Blocks"
 
 test_150d() {
-	local bytes
-	local want
-
-	[ "$ost1_FSTYPE" != ldiskfs ] && skip "non-ldiskfs backend"
-	[ $OST1_VERSION -lt $(version_code 2.13.50) ] &&
-		skip "Need OST version at least 2.13.53"
+	check_set_fallocate_or_skip
 
+	stack_trap "rm -f $DIR/$tfile; wait_delete_completed"
 	$LFS setstripe -c $OSTCOUNT -S1M $DIR/$tdir || error "setstripe failed"
 	fallocate -o 1G -l ${OSTCOUNT}m $DIR/$tdir || error "fallocate failed"
 	sync; sync_all_data
 	cancel_lru_locks $OSC
 	sleep 5
-	bytes=$(($(stat -c '%b * %B' $DIR/$tdir)))
-	want=$((OSTCOUNT * 1048576))
+	local bytes=$(($(stat -c '%b * %B' $DIR/$tdir)))
+	local want=$((OSTCOUNT * 1048576))
 
 	# Must allocate all requested space, not more than 5% extra
 	(( $bytes >= $want && $bytes < $want * 105 / 100 )) ||
@@ -13503,12 +13803,11 @@ test_150d() {
 run_test 150d "Verify fallocate Size and Blocks - Non zero start"
 
 test_150e() {
-	[ "$ost1_FSTYPE" != ldiskfs ] && skip "non-ldiskfs backend"
-	[ $OST1_VERSION -ge $(version_code 2.13.55) ] ||
-		skip "Need OST version at least 2.13.55"
+	check_set_fallocate_or_skip
 
 	echo "df before:"
 	$LFS df
+	stack_trap "rm -f $DIR/$tfile; wait_delete_completed"
 	$LFS setstripe -c${OSTCOUNT} $DIR/$tfile ||
 		error "$LFS setstripe -c${OSTCOUNT} $DIR/$tfile failed"
 
@@ -13516,8 +13815,13 @@ test_150e() {
 	min_size_ost=$($LFS df | awk "/$FSNAME-OST/ { print \$4 }" |
 		       sort -un | head -1)
 
-	# Get 90% of the available space
-	local space=$(((min_size_ost * 90)/100 * OSTCOUNT))
+	# Get 100MB per OST of the available space to reduce run time
+	# else 60% of the available space if we are running SLOW tests
+	if [ $SLOW == "no" ]; then
+		local space=$((1024 * 100 * OSTCOUNT))
+	else
+		local space=$(((min_size_ost * 60)/100 * OSTCOUNT))
+	fi
 
 	fallocate -l${space}k $DIR/$tfile ||
 		error "fallocate ${space}k $DIR/$tfile failed"
@@ -13545,7 +13849,7 @@ test_150e() {
 	echo "df after unlink:"
 	$LFS df
 }
-run_test 150e "Verify 90% of available OST space consumed by fallocate"
+run_test 150e "Verify 60% of available OST space consumed by fallocate"
 
 #LU-2902 roc_hit was not able to read all values from lproc
 function roc_hit_init() {
@@ -14666,12 +14970,14 @@ test_160f() {
 	local i
 
 	# generate some changelog records to accumulate on each MDT
-	# use fnv1a because created files should be evenly distributed
-	test_mkdir -c $MDSCOUNT -H fnv_1a_64 $DIR/$tdir ||
+	# use all_char because created files should be evenly distributed
+	test_mkdir -c $MDSCOUNT -H all_char $DIR/$tdir ||
 		error "test_mkdir $tdir failed"
 	log "$(date +%s): creating first files"
-	createmany -m $DIR/$tdir/$tfile $((MDSCOUNT * 2)) ||
-		error "create $DIR/$tdir/$tfile failed"
+	for ((i = 0; i < MDSCOUNT * 2; i++)); do
+		$LFS mkdir -i $((i%MDSCOUNT)) $DIR/$tdir/d$i.$((i/MDSCOUNT)) ||
+			error "create $DIR/$tdir/d$i.$((i/MDSCOUNT)) failed"
+	done
 
 	# check changelogs have been generated
 	local start=$SECONDS
@@ -14699,7 +15005,7 @@ test_160f() {
 
 	# simulate changelog catalog almost full
 	#define OBD_FAIL_CAT_FREE_RECORDS	0x1313
-	do_nodes $mdts $LCTL set_param fail_loc=0x1313 fail_val=3
+	do_nodes $mdts "$LCTL set_param fail_loc=0x1313 fail_val=3"
 
 	for i in $(seq $MDSCOUNT); do
 		cl_users=(${CL_USERS[mds$i]})
@@ -14739,18 +15045,19 @@ test_160f() {
 	# Generate one more changelog to trigger GC at fail_loc for cl_user2.
 	# cl_user1 should be OK because it recently processed records.
 	echo "$(date +%s): creating $((MDSCOUNT * 2)) files"
-	createmany -m $DIR/$tdir/${tfile}b $((MDSCOUNT * 2)) ||
-		error "create $DIR/$tdir/${tfile}b failed"
+	for ((i = 0; i < MDSCOUNT * 2; i++)); do
+		$LFS mkdir -i $((i%MDSCOUNT)) $DIR/$tdir/d$i.$((i/MDSCOUNT+2))||
+			error "create $DIR/$tdir/d$i.$((i/MDSCOUNT+2)) failed"
+	done
 
 	# ensure gc thread is done
 	for i in $(mdts_nodes); do
-		wait_update $i \
-			"ps -e -o comm= | grep chlg_gc_thread" "" 20 ||
+		wait_update $i "ps -e -o comm= | grep chlg_gc_thread" "" 20 ||
 			error "$i: GC-thread not done"
 	done
 
 	local first_rec
-	for i in $(seq $MDSCOUNT); do
+	for (( i = 1; i <= MDSCOUNT; i++ )); do
 		# check cl_user1 still registered
 		changelog_users mds$i | grep -q "${cl_user1[mds$i]}" ||
 			error "mds$i: User ${cl_user1[mds$i]} not registered"
@@ -14765,10 +15072,9 @@ test_160f() {
 		first_rec=$($LFS changelog $(facet_svc mds$i) |
 			    awk '{ print $1; exit; }')
 
-		echo "mds$i: verifying first index $user_rec1 + 1 == $first_rec"
+		echo "mds$i: $(date +%s) verify rec $user_rec1+1 == $first_rec"
 		[ $((user_rec1 + 1)) == $first_rec ] ||
-			error "mds$i: first index should be $user_rec1 + 1, " \
-			      "but is $first_rec"
+			error "mds$i: rec $first_rec != $user_rec1 + 1"
 	done
 }
 run_test 160f "changelog garbage collect (timestamped users)"
@@ -14794,20 +15100,20 @@ test_160g() {
 	local i
 
 	# generate some changelog records to accumulate on each MDT
-	# use fnv1a because created files should be evenly distributed
-	test_mkdir -c $MDSCOUNT -H fnv_1a_64 $DIR/$tdir ||
-		error "mkdir $tdir failed"
-	createmany -m $DIR/$tdir/$tfile $((MDSCOUNT * 2)) ||
-		error "create $DIR/$tdir/$tfile failed"
+	# use all_char because created files should be evenly distributed
+	test_mkdir -c $MDSCOUNT -H all_char $DIR/$tdir ||
+		error "test_mkdir $tdir failed"
+	for ((i = 0; i < MDSCOUNT; i++)); do
+		$LFS mkdir -i $i $DIR/$tdir/d$i.1 $DIR/$tdir/d$i.2 ||
+			error "create $DIR/$tdir/d$i.1 failed"
+	done
 
 	# check changelogs have been generated
 	local nbcl=$(changelog_dump | wc -l)
-	[[ $nbcl -eq 0 ]] && error "no changelogs found"
+	(( $nbcl > 0 )) || error "no changelogs found"
 
 	# reduce the max_idle_indexes value to make sure we exceed it
-	max_ndx=$((nbcl / 2 - 1))
-
-	for param in "changelog_max_idle_indexes=$max_ndx" \
+	for param in "changelog_max_idle_indexes=1" \
 		     "changelog_gc=1" \
 		     "changelog_min_gc_interval=2" \
 		     "changelog_min_free_cat_entries=3"; do
@@ -14822,8 +15128,9 @@ test_160g() {
 
 	# simulate changelog catalog almost full
 	#define OBD_FAIL_CAT_FREE_RECORDS	0x1313
-	do_nodes $mdts $LCTL set_param fail_loc=0x1313 fail_val=3
+	do_nodes $mdts "$LCTL set_param fail_loc=0x1313 fail_val=3"
 
+	local start=$SECONDS
 	for i in $(seq $MDSCOUNT); do
 		cl_users=(${CL_USERS[mds$i]})
 		cl_user1[mds$i]="${cl_users[0]}"
@@ -14855,21 +15162,24 @@ test_160g() {
 	done
 
 	# ensure we are past the previous changelog_min_gc_interval set above
-	sleep 2
+	local sleep2=$((start + 2 - SECONDS))
+	(( sleep2 > 0 )) && echo "sleep $sleep2 for interval" && sleep $sleep2
 
-	# generate one more changelog to trigger fail_loc
-	createmany -m $DIR/$tdir/${tfile}bis $((MDSCOUNT * 2)) ||
-		error "create $DIR/$tdir/${tfile}bis failed"
+	# Generate one more changelog to trigger GC at fail_loc for cl_user2.
+	# cl_user1 should be OK because it recently processed records.
+	for ((i = 0; i < MDSCOUNT; i++)); do
+		$LFS mkdir -i $i $DIR/$tdir/d$i.3 $DIR/$tdir/d$i.4 ||
+			error "create $DIR/$tdir/d$i.3 failed"
+	done
 
 	# ensure gc thread is done
 	for i in $(mdts_nodes); do
-		wait_update $i \
-			"ps -e -o comm= | grep chlg_gc_thread" "" 20 ||
+		wait_update $i "ps -e -o comm= | grep chlg_gc_thread" "" 20 ||
 			error "$i: GC-thread not done"
 	done
 
 	local first_rec
-	for i in $(seq $MDSCOUNT); do
+	for (( i = 1; i <= MDSCOUNT; i++ )); do
 		# check cl_user1 still registered
 		changelog_users mds$i | grep -q "${cl_user1[mds$i]}" ||
 			error "mds$i: User ${cl_user1[mds$i]} not registered"
@@ -14884,10 +15194,9 @@ test_160g() {
 		first_rec=$($LFS changelog $(facet_svc mds$i) |
 			    awk '{ print $1; exit; }')
 
-		echo "mds$i: verifying first index $user_rec1 + 1 == $first_rec"
+		echo "mds$i: $(date +%s) verify rec $user_rec1+1 == $first_rec"
 		[ $((user_rec1 + 1)) == $first_rec ] ||
-			error "mds$i: first index should be $user_rec1 + 1, " \
-			      "but is $first_rec"
+			error "mds$i: rec $first_rec != $user_rec1 + 1"
 	done
 }
 run_test 160g "changelog garbage collect (old users)"
@@ -14910,11 +15219,13 @@ test_160h() {
 	local i
 
 	# generate some changelog records to accumulate on each MDT
-	# use fnv1a because created files should be evenly distributed
-	test_mkdir -c $MDSCOUNT -H fnv_1a_64 $DIR/$tdir ||
+	# use all_char because created files should be evenly distributed
+	test_mkdir -c $MDSCOUNT -H all_char $DIR/$tdir ||
 		error "test_mkdir $tdir failed"
-	createmany -m $DIR/$tdir/$tfile $((MDSCOUNT * 2)) ||
-		error "create $DIR/$tdir/$tfile failed"
+	for ((i = 0; i < MDSCOUNT; i++)); do
+		$LFS mkdir -i $i $DIR/$tdir/d$i.1 $DIR/$tdir/d$i.2 ||
+			error "create $DIR/$tdir/d$i.1 failed"
+	done
 
 	# check changelogs have been generated
 	local nbcl=$(changelog_dump | wc -l)
@@ -15061,11 +15372,13 @@ test_160i() {
 	changelog_register || error "first changelog_register failed"
 
 	# generate some changelog records to accumulate on each MDT
-	# use fnv1a because created files should be evenly distributed
-	test_mkdir -c $MDSCOUNT -H fnv_1a_64 $DIR/$tdir ||
-		error "mkdir $tdir failed"
-	createmany -m $DIR/$tdir/$tfile $((MDSCOUNT * 2)) ||
-		error "create $DIR/$tdir/$tfile failed"
+	# use all_char because created files should be evenly distributed
+	test_mkdir -c $MDSCOUNT -H all_char $DIR/$tdir ||
+		error "test_mkdir $tdir failed"
+	for ((i = 0; i < MDSCOUNT; i++)); do
+		$LFS mkdir -i $i $DIR/$tdir/d$i.1 $DIR/$tdir/d$i.2 ||
+			error "create $DIR/$tdir/d$i.1 failed"
+	done
 
 	# check changelogs have been generated
 	local nbcl=$(changelog_dump | wc -l)
@@ -15128,11 +15441,13 @@ test_160j() {
 	stack_trap "changelog_deregister" EXIT
 
 	# generate some changelog
-	# use fnv1a because created files should be evenly distributed
-	test_mkdir -c $MDSCOUNT -H fnv_1a_64 $DIR/$tdir ||
+	# use all_char because created files should be evenly distributed
+	test_mkdir -c $MDSCOUNT -H all_char $DIR/$tdir ||
 		error "mkdir $tdir failed"
-	createmany -m $DIR/$tdir/${tfile}bis $((MDSCOUNT * 2)) ||
-		error "create $DIR/$tdir/${tfile}bis failed"
+	for ((i = 0; i < MDSCOUNT; i++)); do
+		$LFS mkdir -i $i $DIR/$tdir/d$i.1 $DIR/$tdir/d$i.2 ||
+			error "create $DIR/$tdir/d$i.1 failed"
+	done
 
 	# open the changelog device
 	exec 3>/dev/changelog-$FSNAME-MDT0000
@@ -15144,8 +15459,8 @@ test_160j() {
 	umount $MOUNT
 	stack_trap "mount_client $MOUNT" EXIT
 
-	# read changelog
-	cat <&4 >/dev/null || error "read changelog failed"
+	# read changelog, which may or may not fail, but should not crash
+	cat <&4 >/dev/null
 
 	# clear changelog
 	local cl_user="${CL_USERS[$SINGLEMDS]%% *}"
@@ -15154,7 +15469,7 @@ test_160j() {
 
 	printf 'clear:'$cl_user':0' >&3
 }
-run_test 160j "client can be umounted  while its chanangelog is being used"
+run_test 160j "client can be umounted while its chanangelog is being used"
 
 test_160k() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run"
@@ -15178,9 +15493,6 @@ test_160k() {
 	sleep 4
 
 	changelog_dump | grep rmdir || error "rmdir not recorded"
-
-	rm -rf $DIR/$tdir
-	changelog_deregister
 }
 run_test 160k "Verify that changelog records are not lost"
 
@@ -16872,6 +17184,13 @@ test_205a() { # Job stats
 		verify_jobstats "touch $DIR/$tfile" $SINGLEMDS
 	fi
 
+	if lctl set_param jobid_var=USER jobid_name="S.%j.%e.%u.%H.E"; then
+		JOBENV="JOBCOMPLEX"
+		JOBCOMPLEX="S.$USER.touch.$(id -u).$(hostname -s).E"
+
+		verify_jobstats "touch $DIR/$tfile" $SINGLEMDS
+	fi
+
 	# test '%j' access to per-session jobid - if supported
 	if lctl list_param jobid_this_session > /dev/null 2>&1
 	then
@@ -18504,13 +18823,11 @@ test_230o() {
 
 	local mdts=$(comma_list $(mdts_nodes))
 	local timeout=100
-
 	local restripe_status
 	local delta
 	local i
-	local j
 
-	[[ $(facet_fstype mds1) == zfs ]] && timeout=300
+	[[ $mds1_FSTYPE == zfs ]] && timeout=300
 
 	# in case "crush" hash type is not set
 	do_nodes $mdts "$LCTL set_param lod.*.mdt_hash=crush"
@@ -18528,7 +18845,7 @@ test_230o() {
 		error "create dirs under remote dir failed $i"
 
 	for i in $(seq 2 $MDSCOUNT); do
-		do_nodes $mdts "$LCTL set_param mdt.*.md_stats=clear > /dev/null"
+		do_nodes $mdts "$LCTL set_param mdt.*.md_stats=clear >/dev/null"
 		$LFS setdirstripe -c $i $DIR/$tdir ||
 			error "split -c $i $tdir failed"
 		wait_update $HOSTNAME \
@@ -18536,10 +18853,10 @@ test_230o() {
 			error "dir split not finished"
 		delta=$(do_nodes $mdts "lctl get_param -n mdt.*MDT*.md_stats" |
 			awk '/migrate/ {sum += $2} END { print sum }')
-		echo "$delta files migrated when dir split from $((i - 1)) to $i stripes"
+		echo "$delta migrated when dir split $((i - 1)) to $i stripes"
 		# delta is around total_files/stripe_count
-		[ $delta -lt $((200 /(i - 1))) ] ||
-			error "$delta files migrated"
+		(( $delta < 200 / (i - 1) + 4 )) ||
+			error "$delta files migrated >= $((200 / (i - 1) + 4))"
 	done
 }
 run_test 230o "dir split"
@@ -18551,13 +18868,11 @@ test_230p() {
 
 	local mdts=$(comma_list $(mdts_nodes))
 	local timeout=100
-
 	local restripe_status
 	local delta
 	local i
-	local j
 
-	[[ $(facet_fstype mds1) == zfs ]] && timeout=300
+	[[ $mds1_FSTYPE == zfs ]] && timeout=300
 
 	do_nodes $mdts "$LCTL set_param lod.*.mdt_hash=crush"
 
@@ -18576,7 +18891,7 @@ test_230p() {
 	for i in $(seq $((MDSCOUNT - 1)) -1 1); do
 		local mdt_hash="crush"
 
-		do_nodes $mdts "$LCTL set_param mdt.*.md_stats=clear > /dev/null"
+		do_nodes $mdts "$LCTL set_param mdt.*.md_stats=clear >/dev/null"
 		$LFS setdirstripe -c $i $DIR/$tdir ||
 			error "split -c $i $tdir failed"
 		[ $i -eq 1 ] && mdt_hash="none"
@@ -18585,10 +18900,10 @@ test_230p() {
 			error "dir merge not finished"
 		delta=$(do_nodes $mdts "lctl get_param -n mdt.*MDT*.md_stats" |
 			awk '/migrate/ {sum += $2} END { print sum }')
-		echo "$delta files migrated when dir merge from $((i + 1)) to $i stripes"
+		echo "$delta migrated when dir merge $((i + 1)) to $i stripes"
 		# delta is around total_files/stripe_count
-		[ $delta -lt $((200 / i)) ] ||
-			error "$delta files migrated"
+		(( $delta < 200 / i + 4 )) ||
+			error "$delta files migrated >= $((200 / i + 4))"
 	done
 }
 run_test 230p "dir merge"
@@ -18609,6 +18924,7 @@ test_230q() {
 	local stripe_count=0
 	local stripe_index
 	local nr_files
+	local create
 
 	# test with fewer files on ZFS
 	[ "$mds1_FSTYPE" == "zfs" ] && threshold=40
@@ -18627,11 +18943,12 @@ test_230q() {
 	$LFS mkdir -i -1 -c 1 $DIR/$tdir || error "mkdir $tdir failed"
 	stripe_index=$($LFS getdirstripe -i $DIR/$tdir)
 
+	create=$((threshold * 3 / 2))
 	while [ $stripe_count -lt $MDSCOUNT ]; do
-		createmany -m $DIR/$tdir/f $total $((threshold * 3 / 2)) ||
+		createmany -m $DIR/$tdir/f $total $create ||
 			error "create sub files failed"
 		stat $DIR/$tdir > /dev/null
-		total=$((total + threshold * 3 / 2))
+		total=$((total + create))
 		stripe_count=$((stripe_count + delta))
 		[ $stripe_count -gt $MDSCOUNT ] && stripe_count=$MDSCOUNT
 
@@ -18643,13 +18960,13 @@ test_230q() {
 			"$LFS getdirstripe -H $DIR/$tdir" "crush" 200 ||
 			error "stripe hash $($LFS getdirstripe -H $DIR/$tdir) != crush"
 
-		nr_files=$($LFS getstripe -m $DIR/$tdir/* |
-			   grep -w $stripe_index | wc -l)
-		echo "$nr_files files on MDT$stripe_index after split"
-		[ $nr_files -lt $((total / (stripe_count - 1))) ] ||
+		nr_files=$($LFS find -m 1 $DIR/$tdir | grep -c -w $stripe_index)
+		echo "$nr_files/$total files on MDT$stripe_index after split"
+		# allow 10% margin of imbalance with crush hash
+		(( $nr_files <= $total / $stripe_count + $create / 10)) ||
 			error "$nr_files files on MDT$stripe_index after split"
 
-		nr_files=$(ls $DIR/$tdir | wc -w)
+		nr_files=$($LFS find -type f $DIR/$tdir | wc -l)
 		[ $nr_files -eq $total ] ||
 			error "total sub files $nr_files != $total"
 	done
@@ -19208,6 +19525,8 @@ test_247f() {
 	[ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs"
 	[ $MDS1_VERSION -lt $(version_code 2.13.52) ] &&
 		skip "Need at least version 2.13.52"
+	[ $CLIENT_VERSION -lt $(version_code 2.14.50) ] &&
+		skip "Need at least version 2.14.50"
 	lctl get_param -n mdc.$FSNAME-MDT0000*.import |
 		grep -q subtree ||
 		skip "Fileset feature is not supported"
@@ -19216,26 +19535,78 @@ test_247f() {
 	$LFS mkdir -i $((MDSCOUNT - 1)) $DIR/$tdir/remote ||
 		error "mkdir remote failed"
 	mkdir $DIR/$tdir/remote/subdir || error "mkdir remote/subdir failed"
-	$LFS mkdir -c $MDSCOUNT $DIR/$tdir/striped ||
+	$LFS mkdir -i 0 -c $MDSCOUNT $DIR/$tdir/striped ||
 		error "mkdir striped failed"
 	mkdir $DIR/$tdir/striped/subdir || error "mkdir striped/subdir failed"
 
 	local submount=${MOUNT}_$tdir
 
 	mkdir -p $submount || error "mkdir $submount failed"
+	stack_trap "rmdir $submount"
 
 	local dir
+	local stat
 	local fileset=$FILESET
+	local mdts=$(comma_list $(mdts_nodes))
+
+	stat=$(do_facet mds1 $LCTL get_param -n \
+		mdt.*MDT0000.enable_remote_subdir_mount)
+	stack_trap "do_nodes $mdts $LCTL set_param \
+		mdt.*.enable_remote_subdir_mount=$stat"
 
-	for dir in $tdir/remote $tdir/remote/subdir \
-		   $tdir/striped $tdir/striped/subdir $tdir/striped/. ; do
+	do_nodes $mdts "$LCTL set_param mdt.*.enable_remote_subdir_mount=0"
+	stack_trap "umount_client $submount"
+	FILESET="$fileset/$tdir/remote" mount_client $submount &&
+		error "mount remote dir $dir should fail"
+
+	for dir in $tdir/remote/subdir $tdir/striped $tdir/striped/subdir \
+		$tdir/striped/. ; do
 		FILESET="$fileset/$dir" mount_client $submount ||
 			error "mount $dir failed"
 		umount_client $submount
 	done
+
+	do_nodes $mdts "$LCTL set_param mdt.*.enable_remote_subdir_mount=1"
+	FILESET="$fileset/$tdir/remote" mount_client $submount ||
+		error "mount $tdir/remote failed"
 }
 run_test 247f "mount striped or remote directory as fileset"
 
+test_247g() {
+	[ $MDSCOUNT -lt 4 ] && skip_env "needs >= 4 MDTs"
+	[ $CLIENT_VERSION -lt $(version_code 2.14.50) ] &&
+		skip "Need at least version 2.14.50"
+
+	$LFS mkdir -i 0 -c 4 -H fnv_1a_64 $DIR/$tdir ||
+		error "mkdir $tdir failed"
+	touch $DIR/$tdir/$tfile || error "touch $tfile failed"
+
+	local submount=${MOUNT}_$tdir
+
+	mkdir -p $submount || error "mkdir $submount failed"
+	stack_trap "rmdir $submount"
+
+	FILESET="$fileset/$tdir" mount_client $submount ||
+		error "mount $dir failed"
+	stack_trap "umount $submount"
+
+	local mdts=$(comma_list $(mdts_nodes))
+
+	local nrpcs
+
+	stat $submount > /dev/null
+	cancel_lru_locks $MDC
+	stat $submount > /dev/null
+	stat $submount/$tfile > /dev/null
+	do_nodes $mdts "$LCTL set_param mdt.*.md_stats=clear > /dev/null"
+	stat $submount/$tfile > /dev/null
+	nrpcs=$(do_nodes $mdts "lctl get_param -n mdt.*.md_stats" |
+		awk '/getattr/ {sum += $2} END {print sum}')
+
+	[ -z "$nrpcs" ] || error "$nrpcs extra getattr sent"
+}
+run_test 247g "mount striped directory as fileset caches ROOT lookup lock"
+
 test_248a() {
 	local fast_read_sav=$($LCTL get_param -n llite.*.fast_read 2>/dev/null)
 	[ -z "$fast_read_sav" ] && skip "no fast read support"
@@ -19836,6 +20207,9 @@ test_255c() {
 	[ $OST1_VERSION -lt $(version_code 2.10.50) ] &&
 		skip "lustre < 2.10.50 does not support lockahead"
 
+	local ost1_imp=$(get_osc_import_name client ost1)
+	local imp_name=$($LCTL list_param osc.$ost1_imp | head -n1 |
+			 cut -d'.' -f2)
 	local count
 	local new_count
 	local difference
@@ -19883,7 +20257,7 @@ test_255c() {
 		cancel_lru_locks osc
 
 		count=$($LCTL get_param -n \
-		       ldlm.namespaces.$FSNAME-OST0000*osc-[-0-9a-f]*.lock_unused_count)
+		       ldlm.namespaces.$imp_name.lock_unused_count)
 
 		lockahead_test -d $DIR/$tdir -t $i -f $tfile
 		rc=$?
@@ -19892,7 +20266,7 @@ test_255c() {
 		fi
 
 		new_count=$($LCTL get_param -n \
-		       ldlm.namespaces.$FSNAME-OST0000*osc-[-0-9a-f]*.lock_unused_count)
+		       ldlm.namespaces.$imp_name.lock_unused_count)
 		difference="$((new_count - count))"
 
 		# Test 15 output is divided by 100 to map down to valid return
@@ -20976,6 +21350,17 @@ test_273a() {
 }
 run_test 273a "DoM: layout swapping should fail with DOM"
 
+test_273b() {
+	mkdir -p $DIR/$tdir
+	$LFS setstripe -E 1M -L mdt -E -1 -c -1 $DIR/$tdir
+
+#define OBD_FAIL_MDS_COMMITRW_DELAY      0x16b
+	do_facet mds1 $LCTL set_param fail_loc=0x8000016b fail_val=2
+
+	$MULTIOP $DIR/$tdir/$tfile Ouw2097152c
+}
+run_test 273b "DoM: race writeback and object destroy"
+
 test_275() {
 	remote_ost_nodsh && skip "remote OST with nodsh"
 	[ $OST1_VERSION -lt $(version_code 2.10.57) ] &&
@@ -22299,6 +22684,10 @@ test_319() {
 run_test 319 "lost lease lock on migrate error"
 
 test_398a() { # LU-4198
+	local ost1_imp=$(get_osc_import_name client ost1)
+	local imp_name=$($LCTL list_param osc.$ost1_imp | head -n1 |
+			 cut -d'.' -f2)
+
 	$LFS setstripe -c 1 -i 0 $DIR/$tfile
 	$LCTL set_param ldlm.namespaces.*.lru_size=clear
 
@@ -22307,7 +22696,7 @@ test_398a() { # LU-4198
 
 	dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 oflag=direct conv=notrunc
 	local lock_count=$($LCTL get_param -n \
-			   ldlm.namespaces.*-OST0000-osc-ffff*.lru_size)
+			   ldlm.namespaces.$imp_name.lru_size)
 	[[ $lock_count -eq 0 ]] || error "lock should be cancelled by direct IO"
 
 	$LCTL set_param ldlm.namespaces.*-OST0000-osc-ffff*.lru_size=clear
@@ -22315,7 +22704,7 @@ test_398a() { # LU-4198
 	# no lock cached, should use lockless IO and not enqueue new lock
 	dd if=/dev/zero of=$DIR/$tfile bs=1M count=1 oflag=direct conv=notrunc
 	lock_count=$($LCTL get_param -n \
-		     ldlm.namespaces.*-OST0000-osc-ffff*.lru_size)
+		     ldlm.namespaces.$imp_name.lru_size)
 	[[ $lock_count -eq 0 ]] || error "no lock should be held by direct IO"
 }
 run_test 398a "direct IO should cancel lock otherwise lockless"
@@ -22347,6 +22736,10 @@ test_398b() { # LU-4198
 run_test 398b "DIO and buffer IO race"
 
 test_398c() { # LU-4198
+	local ost1_imp=$(get_osc_import_name client ost1)
+	local imp_name=$($LCTL list_param osc.$ost1_imp | head -n1 |
+			 cut -d'.' -f2)
+
 	which fio || skip_env "no fio installed"
 
 	saved_debug=$($LCTL get_param -n debug)
@@ -22375,8 +22768,7 @@ test_398c() { # LU-4198
 		--filename=$DIR/$tfile
 	[ $? -eq 0 ] || error "fio write error"
 
-	[ $($LCTL get_param -n \
-	 ldlm.namespaces.${FSNAME}-OST0000-osc-ffff*.lock_count) -eq 0 ] ||
+	[ $($LCTL get_param -n ldlm.namespaces.$imp_name.lock_count) -eq 0 ] ||
 		error "Locks were requested while doing AIO"
 
 	# get the percentage of 1-page I/O
@@ -23809,6 +24201,38 @@ test_426() {
 }
 run_test 426 "splice test on Lustre"
 
+test_427() {
+	[ $MDSCOUNT -ge 2 ] || skip "needs >= 2 MDTs"
+	(( $MDS1_VERSION >= $(version_code 2.12.4) )) ||
+		skip "Need MDS version at least 2.12.4"
+	local log
+
+	mkdir $DIR/$tdir
+	mkdir $DIR/$tdir/1
+	mkdir $DIR/$tdir/2
+	test_mkdir -c $MDSCOUNT -i 1 $DIR/$tdir/1/dir
+	test_mkdir -c $MDSCOUNT -i 1 $DIR/$tdir/2/dir2
+
+	$LFS getdirstripe $DIR/$tdir/1/dir
+
+	#first setfattr for creating updatelog
+	setfattr -n user.attr0 -v "some text" $DIR/$tdir/1/dir
+
+#define OBD_FAIL_OUT_OBJECT_MISS        0x1708
+	do_nodes $(comma_list $(mdts_nodes)) $LCTL set_param fail_loc=0x80001708
+	setfattr -n user.attr1 -v "some text" $DIR/$tdir/1/dir &
+	setfattr -n user.attr2 -v "another attr"  $DIR/$tdir/2/dir2 &
+
+	sleep 2
+	fail mds2
+	wait_recovery_complete mds2 $((2*TIMEOUT))
+
+	log=$(do_facet mds1 dmesg | tac | sed "/${TESTNAME//_/ }/,$ d")
+	echo $log | grep "get update log failed" &&
+		error "update log corruption is detected" || true
+}
+run_test 427 "Failed DNE2 update request shouldn't corrupt updatelog"
+
 lseek_test_430() {
 	local offset
 	local file=$1
@@ -24037,6 +24461,25 @@ test_430c() {
 }
 run_test 430c "lseek: external tools check"
 
+test_431() { # LU-14187
+	local file=$DIR/$tdir/$tfile
+
+	mkdir -p $DIR/$tdir
+	$LFS setstripe -c 1 -i 0 $file || error "lfs setstripe failed"
+	dd if=/dev/urandom of=$file bs=4k count=1
+	dd if=/dev/urandom of=$file bs=4k count=1 seek=10 conv=notrunc
+	dd if=/dev/urandom of=$file bs=4k count=1 seek=12 conv=notrunc
+	#define OBD_FAIL_OST_RESTART_IO	0x251
+	do_facet ost1 "$LCTL set_param fail_loc=0x251"
+	$LFS setstripe -c 1 -i 0 $file.0 || error "lfs setstripe failed"
+	cp $file $file.0
+	cancel_lru_locks
+	sync_all_data
+	echo 3 > /proc/sys/vm/drop_caches
+	diff  $file $file.0 || error "data diff"
+}
+run_test 431 "Restart transaction for IO"
+
 prep_801() {
 	[[ $MDS1_VERSION -lt $(version_code 2.9.55) ]] ||
 	[[ $OST1_VERSION -lt $(version_code 2.9.55) ]] &&
@@ -25052,8 +25495,13 @@ test_815()
 run_test 815 "zero byte tiny write doesn't hang (LU-12382)"
 
 test_816() {
+	local ost1_imp=$(get_osc_import_name client ost1)
+	local imp_name=$($LCTL list_param osc.$ost1_imp | head -n1 |
+			 cut -d'.' -f2)
+
 	$LFS setstripe -c 1 -i 0 $DIR/$tfile
 	# ensure ost1 is connected
+
 	stat $DIR/$tfile >/dev/null || error "can't stat"
 	wait_osc_import_state client ost1 FULL
 	# no locks, no reqs to let the connection idle
@@ -25062,12 +25510,12 @@ test_816() {
 	local before
 	local now
 	before=$($LCTL get_param -n \
-		 ldlm.namespaces.$FSNAME-OST0000-osc-[^M]*.lru_size)
+		 ldlm.namespaces.$imp_name.lru_size)
 
 	wait_osc_import_state client ost1 IDLE
 	dd if=/dev/null of=$DIR/$tfile bs=1k count=1 conv=sync
 	now=$($LCTL get_param -n \
-	      ldlm.namespaces.$FSNAME-OST0000-osc-[^M]*.lru_size)
+	      ldlm.namespaces.$imp_name.lru_size)
 	[ $before == $now ] || error "lru_size changed $before != $now"
 }
 run_test 816 "do not reset lru_resize on idle reconnect"
@@ -25175,6 +25623,34 @@ test_820() {
 }
 run_test 820 "update max EA from open intent"
 
+test_822() {
+	local p="$TMP/$TESTSUITE-$TESTNAME.parameters"
+
+	save_lustre_params mds1 \
+		"osp.$FSNAME-OST*-osc-MDT0000.max_create_count" > $p
+	do_facet $SINGLEMDS "$LCTL set_param -n \
+			osp.$FSNAME-OST*MDT0000.max_create_count=0"
+	do_facet $SINGLEMDS "$LCTL set_param -n \
+			osp.$FSNAME-OST0000*MDT0000.max_create_count=20000"
+
+	# wait for statfs update to clear OS_STATFS_NOPRECREATE
+	local maxage=$(do_facet mds1 $LCTL get_param -n \
+		       osp.$FSNAME-OST0000*MDT0000.maxage)
+	sleep $((maxage + 1))
+
+	#define OBD_FAIL_NET_ERROR_RPC          0x532
+	do_facet mds1 "$LCTL set_param fail_loc=0x80000532 fail_val=5"
+
+	stack_trap "restore_lustre_params < $p; rm $p"
+
+	local count=$(do_facet $SINGLEMDS "lctl get_param -n \
+		      osp.$FSNAME-OST0000*MDT0000.create_count")
+	for i in $(seq 1 $count); do
+		touch $DIR/$tfile.${i} || error "touch failed"
+	done
+}
+run_test 822 "test precreate failure"
+
 #
 # tests that do cleanup/setup should be run at the end
 #