X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=d9012f136c9bdaff3e15acd2cdd63e0f15ddce59;hp=1fde0e9156d6450765115be453d59d863669d9fa;hb=3e2c28437404b0ccbd7bbfb8f77788678975b63d;hpb=15057a17ca1e2a0e796cfada6abeb28aa77679cf

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 1fde0e9..d9012f1 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -41,8 +41,8 @@ init_logging
 ALWAYS_EXCEPT="$SANITY_EXCEPT "
 # bug number for skipped test: LU-9693 LU-6493 LU-9693
 ALWAYS_EXCEPT+="               42a     42b     42c "
-# bug number:    LU-8411 LU-9054 LU-13314
-ALWAYS_EXCEPT+=" 407     312	56ob"
+# bug number:    LU-8411 LU-9054
+ALWAYS_EXCEPT+=" 407     312"
 
 if $SHARED_KEY; then
 	# bug number:    LU-9795 LU-9795 LU-9795 LU-9795
@@ -63,8 +63,8 @@ if [[ $(uname -m) = aarch64 ]]; then
 	ALWAYS_EXCEPT+=" 45	  317"
 fi
 
-# skip nfs tests on kernels >= 4.14.0 until they are fixed
-if [ $LINUX_VERSION_CODE -ge $(version_code 4.14.0) ]; then
+# skip nfs tests on kernels >= 4.12.0 until they are fixed
+if [ $LINUX_VERSION_CODE -ge $(version_code 4.12.0) ]; then
 	# bug number:	LU-12661
 	ALWAYS_EXCEPT+=" 817"
 fi
@@ -144,6 +144,13 @@ check_swap_layouts_support()
 		skip "Does not support layout lock."
 }
 
+check_swap_layout_no_dom()
+{
+	local FOLDER=$1
+	local SUPP=$(lfs getstripe $FOLDER | grep "pattern:       mdt" | wc -l)
+	[ $SUPP -eq 0 ] || skip "layout swap does not support DOM files so far"
+}
+
 check_and_setup_lustre
 DIR=${DIR:-$MOUNT}
 assert_DIR
@@ -2612,6 +2619,7 @@ test_27G() { #LU-10629
 	local ostrange="0 0 1"
 
 	test_mkdir $DIR/$tdir
+	touch $DIR/$tdir/$tfile.nopool
 	pool_add $POOL || error "pool_add failed"
 	pool_add_targets $POOL $ostrange || error "pool_add_targets failed"
 	$LFS setstripe -p $POOL $DIR/$tdir
@@ -2619,14 +2627,18 @@ test_27G() { #LU-10629
 	local pool=$($LFS getstripe -p $DIR/$tdir)
 
 	[ "$pool" = "$POOL" ] || error "Striping failed got '$pool' not '$POOL'"
+	touch $DIR/$tdir/$tfile.default
+	$LFS setstripe -E 1M --pool $POOL -c 1 -E eof -c 1 $DIR/$tdir/$tfile.pfl
+	$LFS find $DIR/$tdir -type f --pool $POOL
+	local found=$($LFS find $DIR/$tdir -type f --pool $POOL | wc -l)
+	[[ "$found" == "2" ]] ||
+		error "found $found != 2 files in '$DIR/$tdir' in '$POOL'"
 
 	$LFS setstripe -d $DIR/$tdir
 
-	pool=$($LFS getstripe -p $DIR/$tdir)
-
-	rmdir $DIR/$tdir
+	pool=$($LFS getstripe -p -d $DIR/$tdir)
 
-	[ -z "$pool" ] || error "'$pool' is not empty"
+	[[ "$pool" != "$POOL" ]] || error "$DIR/$tdir is still '$pool'"
 }
 run_test 27G "Clear OST pool from stripe"
 
@@ -3822,7 +3834,7 @@ test_33h() {
 	done
 
 	local failed=0
-	for i in {1..50}; do
+	for i in {1..250}; do
 		for fname in $(mktemp -u $DIR/$tdir/.$tfile.XXXXXX) \
 			     $(mktemp $DIR/$tdir/$tfile.XXXXXXXX); do
 			touch $fname  || error "touch $fname failed"
@@ -3834,7 +3846,7 @@ test_33h() {
 		done
 	done
 	echo "$failed MDT index mismatches"
-	(( failed < 4 )) || error "MDT index mismatch $failed times"
+	(( failed < 20 )) || error "MDT index mismatch $failed times"
 
 }
 run_test 33h "temp file is located on the same MDT as target"
@@ -4868,6 +4880,8 @@ test_43A() { # was test_43
 
 	$DIR/$tdir/$tfile && error "execute $DIR/$tdir/$tfile succeeded" || true
 	kill -USR1 $pid
+	# Wait for multiop to exit
+	wait $pid
 }
 run_test 43A "execution of file opened for write should return -ETXTBSY"
 
@@ -5907,7 +5921,7 @@ test_56ob() {
 	cmd="$LFS find $dir -ctime +1s -type f"
 	nums=$($cmd | wc -l)
 	(( $nums == $count * 2 + 1)) ||
-		error "'$cmd' wrong: found $nums, expected $((expected*2+1))"
+		error "'$cmd' wrong: found $nums, expected $((count * 2 + 1))"
 }
 run_test 56ob "check lfs find -atime -mtime -ctime with units"
 
@@ -6263,14 +6277,15 @@ test_56rb() {
 	test_mkdir -p $dir || error "failed to mkdir $dir"
 	$LFS setstripe -c 1 -i 0 $dir/$tfile ||
 		error "failed to setstripe $dir/$tfile"
+	mdt_idx=$($LFS getdirstripe -i $dir)
 	dd if=/dev/zero of=$dir/$tfile bs=1M count=1
 
 	stack_trap "rm -f $tmp" EXIT
-	$LFS find --size +100K --ost 0 $dir 2>&1 | tee $tmp
-	[ -z "$(cat $tmp | grep "obd_uuid: ")" ] ||
+	$LFS find --size +100K --ost 0 $dir |& tee $tmp
+	! grep -q obd_uuid $tmp ||
 		error "failed to find --size +100K --ost 0 $dir"
-	$LFS find --size +100K --mdt $mdt_idx $dir 2>&1 | tee $tmp
-	[ -z "$(cat $tmp | grep "obd_uuid: ")" ] ||
+	$LFS find --size +100K --mdt $mdt_idx $dir |& tee $tmp
+	! grep -q obd_uuid $tmp ||
 		error "failed to find --size +100K --mdt $mdt_idx $dir"
 }
 run_test 56rb "check lfs find --size --ost/--mdt works"
@@ -6796,6 +6811,24 @@ test_56wd() {
 }
 run_test 56wd "check lfs_migrate --rsync and --no-rsync work"
 
+test_56we() {
+	local td=$DIR/$tdir
+	local tf=$td/$tfile
+
+	test_mkdir $td || error "cannot create $td"
+	touch $tf || error "cannot touch $tf"
+
+	echo -n "Make sure --non-direct|-D works..."
+	$LFS_MIGRATE -y --non-direct -v $tf 2>&1 |
+		grep -q "lfs migrate --non-direct" ||
+		error "--non-direct option cannot work correctly"
+	$LFS_MIGRATE -y -D -v $tf 2>&1 |
+		grep -q "lfs migrate -D" ||
+		error "-D option cannot work correctly"
+	echo "done."
+}
+run_test 56we "check lfs_migrate --non-direct|-D support"
+
 test_56x() {
 	[[ $OSTCOUNT -lt 2 ]] && skip_env "needs >= 2 OSTs"
 	check_swap_layouts_support
@@ -7816,18 +7849,25 @@ test_64c() {
 }
 run_test 64c "verify grant shrink"
 
+import_param() {
+	local tgt=$1
+	local param=$2
+
+	$LCTL get_param osc.$tgt.import | awk "/$param/ { print \$2 }"
+}
+
 # this does exactly what osc_request.c:osc_announce_cached() does in
 # order to calculate max amount of grants to ask from server
 want_grant() {
 	local tgt=$1
 
-	local nrpages=$($LCTL get_param -n osc.${tgt}.max_pages_per_rpc)
-	local rpc_in_flight=$($LCTL get_param -n osc.${tgt}.max_rpcs_in_flight)
+	local nrpages=$($LCTL get_param -n osc.$tgt.max_pages_per_rpc)
+	local rpc_in_flight=$($LCTL get_param -n osc.$tgt.max_rpcs_in_flight)
 
-	((rpc_in_flight ++));
+	((rpc_in_flight++));
 	nrpages=$((nrpages * rpc_in_flight))
 
-	local dirty_max_pages=$($LCTL get_param -n osc.${tgt}.max_dirty_mb)
+	local dirty_max_pages=$($LCTL get_param -n osc.$tgt.max_dirty_mb)
 
 	dirty_max_pages=$((dirty_max_pages * 1024 * 1024 / PAGE_SIZE))
 
@@ -7835,13 +7875,11 @@ want_grant() {
 	local undirty=$((nrpages * PAGE_SIZE))
 
 	local max_extent_pages
-	max_extent_pages=$($LCTL get_param osc.${tgt}.import |
-	    grep grant_max_extent_size | awk '{print $2}')
+	max_extent_pages=$(import_param $tgt grant_max_extent_size)
 	max_extent_pages=$((max_extent_pages / PAGE_SIZE))
 	local nrextents=$(((nrpages + max_extent_pages - 1) / max_extent_pages))
 	local grant_extent_tax
-	grant_extent_tax=$($LCTL get_param osc.${tgt}.import |
-	    grep grant_extent_tax | awk '{print $2}')
+	grant_extent_tax=$(import_param $tgt grant_extent_tax)
 
 	undirty=$((undirty + nrextents * grant_extent_tax))
 
@@ -7855,56 +7893,171 @@ grant_chunk() {
 	local max_brw_size
 	local grant_extent_tax
 
-	max_brw_size=$($LCTL get_param osc.${tgt}.import |
-	    grep max_brw_size | awk '{print $2}')
+	max_brw_size=$(import_param $tgt max_brw_size)
 
-	grant_extent_tax=$($LCTL get_param osc.${tgt}.import |
-	    grep grant_extent_tax | awk '{print $2}')
+	grant_extent_tax=$(import_param $tgt grant_extent_tax)
 
 	echo $(((max_brw_size + grant_extent_tax) * 2))
 }
 
 test_64d() {
-	[ $OST1_VERSION -lt $(version_code 2.10.56) ] &&
+	[ $OST1_VERSION -ge $(version_code 2.10.56) ] ||
 		skip "OST < 2.10.55 doesn't limit grants enough"
 
-	local tgt=$($LCTL dl | grep "0000-osc-[^mM]" | awk '{print $4}')
-	local file=$DIR/$tfile
+	local tgt=$($LCTL dl | awk '/OST0000-osc-[^mM]/ { print $4 }')
 
-	[[ $($LCTL get_param osc.${tgt}.import |
-	     grep "connect_flags:.*grant_param") ]] ||
+	[[ "$($LCTL get_param osc.${tgt}.import)" =~ "grant_param" ]] ||
 		skip "no grant_param connect flag"
 
-	local olddebug=$($LCTL get_param -n debug 2> /dev/null)
+	local olddebug="$($LCTL get_param -n debug 2> /dev/null)"
+
+	$LCTL set_param -n -n debug="$OLDDEBUG" || true
+	stack_trap "$LCTL set_param -n debug='$olddebug'" EXIT
 
-	$LCTL set_param debug="$OLDDEBUG" 2> /dev/null || true
 
 	local max_cur_granted=$(($(want_grant $tgt) + $(grant_chunk $tgt)))
-	stack_trap "rm -f $file" EXIT
+	stack_trap "rm -f $DIR/$tfile && wait_delete_completed" EXIT
 
-	$LFS setstripe $file -i 0 -c 1
-	dd if=/dev/zero of=$file bs=1M count=1000 &
+	$LFS setstripe $DIR/$tfile -i 0 -c 1
+	dd if=/dev/zero of=$DIR/$tfile bs=1M count=1000 &
 	ddpid=$!
 
-	while true
-	do
-		local cur_grant=$($LCTL get_param -n osc.${tgt}.cur_grant_bytes)
-		if [[ $cur_grant -gt $max_cur_granted ]]
-		then
+	while kill -0 $ddpid; do
+		local cur_grant=$($LCTL get_param -n osc.$tgt.cur_grant_bytes)
+
+		if [[ $cur_grant -gt $max_cur_granted ]]; then
 			kill $ddpid
 			error "cur_grant $cur_grant > $max_cur_granted"
 		fi
-		kill -0 $ddpid
-		[[ $? -ne 0 ]] && break;
-		sleep 2
-	done
 
-	rm -f $DIR/$tfile
-	wait_delete_completed
-	$LCTL set_param debug="$olddebug" 2> /dev/null || true
+		sleep 1
+	done
 }
 run_test 64d "check grant limit exceed"
 
+check_grants() {
+	local tgt=$1
+	local expected=$2
+	local msg=$3
+	local cur_grants=$($LCTL get_param -n osc.$tgt.cur_grant_bytes)
+
+	((cur_grants == expected)) ||
+		error "$msg: grants mismatch: $cur_grants, expected $expected"
+}
+
+round_up_p2() {
+	echo $((($1 + $2 - 1) & ~($2 - 1)))
+}
+
+test_64e() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run"
+	[ $OST1_VERSION -ge $(version_code 2.11.56) ] ||
+		skip "Need OSS version at least 2.11.56"
+
+	# Remount client to reset grant
+	remount_client $MOUNT || error "failed to remount client"
+	local osc_tgt="$FSNAME-OST0000-osc-$($LFS getname -i $DIR)"
+
+	local init_grants=$(import_param $osc_tgt initial_grant)
+
+	check_grants $osc_tgt $init_grants "init grants"
+
+	local extent_tax=$(import_param $osc_tgt grant_extent_tax)
+	local max_brw_size=$(import_param $osc_tgt max_brw_size)
+	local gbs=$(import_param $osc_tgt grant_block_size)
+
+	# write random number of bytes from max_brw_size / 4 to max_brw_size
+	local write_bytes=$(shuf -i $((max_brw_size / 4))-$max_brw_size -n 1)
+	# align for direct io
+	write_bytes=$(round_up_p2 $write_bytes PAGE_SIZE)
+	# round to grant consumption unit
+	local wb_round_up=$(round_up_p2 $write_bytes gbs)
+
+	local grants=$((wb_round_up + extent_tax))
+
+	$LFS setstripe -c 1 -i 0 $DIR/$tfile  || error "lfs setstripe failed"
+
+	# define OBD_FAIL_TGT_NO_GRANT 0x725
+	# make the server not grant more back
+	do_facet ost1 $LCTL set_param fail_loc=0x725
+	dd if=/dev/zero of=$DIR/$tfile bs=$write_bytes count=1 oflag=direct
+
+	do_facet ost1 $LCTL set_param fail_loc=0
+
+	check_grants $osc_tgt $((init_grants - grants)) "dio w/o grant alloc"
+
+	rm -f $DIR/$tfile || error "rm failed"
+
+	# Remount client to reset grant
+	remount_client $MOUNT || error "failed to remount client"
+	osc_tgt="$FSNAME-OST0000-osc-$($LFS getname -i $DIR)"
+
+	$LFS setstripe -c 1 -i 0 $DIR/$tfile || error "lfs setstripe failed"
+
+	# define OBD_FAIL_TGT_NO_GRANT 0x725
+	# make the server not grant more back
+	do_facet ost1 $LCTL set_param fail_loc=0x725
+	$MULTIOP $DIR/$tfile "oO_WRONLY:w${write_bytes}yc"
+	do_facet ost1 $LCTL set_param fail_loc=0
+
+	check_grants $osc_tgt $((init_grants - grants)) "buf io w/o grant alloc"
+}
+run_test 64e "check grant consumption (no grant allocation)"
+
+test_64f() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run"
+
+	# Remount client to reset grant
+	remount_client $MOUNT || error "failed to remount client"
+	local osc_tgt="$FSNAME-OST0000-osc-$($LFS getname -i $DIR)"
+
+	local init_grants=$(import_param $osc_tgt initial_grant)
+	local extent_tax=$(import_param $osc_tgt grant_extent_tax)
+	local max_brw_size=$(import_param $osc_tgt max_brw_size)
+	local gbs=$(import_param $osc_tgt grant_block_size)
+	local chunk=$(grant_chunk $osc_tgt)
+
+	# write random number of bytes from max_brw_size / 4 to max_brw_size
+	local write_bytes=$(shuf -i $((max_brw_size / 4))-$max_brw_size -n 1)
+	# align for direct io
+	write_bytes=$(round_up_p2 $write_bytes PAGE_SIZE)
+	# round to grant consumption unit
+	local wb_round_up=$(round_up_p2 $write_bytes gbs)
+
+	local grants=$((wb_round_up + extent_tax))
+
+	$LFS setstripe -c 1 -i 0 $DIR/$tfile || error "lfs setstripe failed"
+	dd if=/dev/zero of=$DIR/$tfile bs=$write_bytes count=1 oflag=direct ||
+		error "error writing to $DIR/$tfile"
+
+	check_grants $osc_tgt $((init_grants - grants + chunk)) \
+		"direct io with grant allocation"
+
+	rm -f $DIR/$tfile || error "rm failed"
+
+	# Remount client to reset grant
+	remount_client $MOUNT || error "failed to remount client"
+	osc_tgt="$FSNAME-OST0000-osc-$($LFS getname -i $DIR)"
+
+	$LFS setstripe -c 1 -i 0 $DIR/$tfile || error "lfs setstripe failed"
+
+	local cmd="oO_WRONLY:w${write_bytes}_yc"
+
+	$MULTIOP $DIR/$tfile $cmd &
+	MULTIPID=$!
+	sleep 1
+
+	check_grants $osc_tgt $((init_grants - grants)) \
+		"buffered io, not write rpc"
+
+	kill -USR1 $MULTIPID
+	wait
+
+	check_grants $osc_tgt $((init_grants - grants + chunk)) \
+		"buffered io, one RPC"
+}
+run_test 64f "check grant consumption (with grant allocation)"
+
 # bug 1414 - set/get directories' stripe info
 test_65a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run"
@@ -8457,6 +8610,8 @@ test_74c() {
 run_test 74c "ldlm_lock_create error path, (shouldn't LBUG)"
 
 num_inodes() {
+	[ -f /sys/kernel/slab/lustre_inode_cache/shrink ] &&
+		echo 1 > /sys/kernel/slab/lustre_inode_cache/shrink
 	awk '/lustre_inode_cache/ {print $2; exit}' /proc/slabinfo
 }
 
@@ -8746,9 +8901,8 @@ test_77k() { # LU-10906
 	local i
 
 	[ "$ORIG_CSUM" ] || ORIG_CSUM=$(eval $get_checksum)
-	stack_trap "wait_update $HOSTNAME '$get_checksum' $ORIG_CSUM" EXIT
-	stack_trap "do_facet mgs $LCTL set_param -P $cksum_param=$ORIG_CSUM" \
-		EXIT
+	stack_trap "wait_update $HOSTNAME '$get_checksum' $ORIG_CSUM || true"
+	stack_trap "do_facet mgs $LCTL set_param -P $cksum_param=$ORIG_CSUM"
 
 	for i in 0 1; do
 		do_facet mgs $LCTL set_param -P $cksum_param=$i ||
@@ -8971,28 +9125,6 @@ test_81b() { # LU-456
 }
 run_test 81b "OST should return -ENOSPC when retry still fails ======="
 
-test_82() { # LU-1031
-	dd if=/dev/zero of=$DIR/$tfile bs=1M count=10
-	local gid1=14091995
-	local gid2=16022000
-
-	multiop_bg_pause $DIR/$tfile OG${gid1}_g${gid1}c || return 1
-	local MULTIPID1=$!
-	multiop_bg_pause $DIR/$tfile O_G${gid2}r10g${gid2}c || return 2
-	local MULTIPID2=$!
-	kill -USR1 $MULTIPID2
-	sleep 2
-	if [[ `ps h -o comm -p $MULTIPID2` == "" ]]; then
-		error "First grouplock does not block second one"
-	else
-		echo "Second grouplock blocks first one"
-	fi
-	kill -USR1 $MULTIPID1
-	wait $MULTIPID1
-	wait $MULTIPID2
-}
-run_test 82 "Basic grouplock test"
-
 test_99() {
 	[ -z "$(which cvs 2>/dev/null)" ] && skip_env "could not find cvs"
 
@@ -13499,10 +13631,19 @@ test_154A() {
 	[ -z "$fid" ] && error "path2fid unable to get $tf FID"
 
 	# check that we get the same pathname back
-	local found=$($LFS fid2path $MOUNT "$fid")
-	[ -z "$found" ] && error "fid2path unable to get '$fid' path"
-	[ "$found" == "$tf" ] ||
-		error "fid2path($fid=path2fid($tf)) = $found != $tf"
+	local rootpath
+	local found
+	for rootpath in "$MOUNT" "$MOUNT///" "$MOUNT/$tfile"; do
+		echo "$rootpath $fid"
+		found=$($LFS fid2path $rootpath "$fid")
+		[ -z "$found" ] && error "fid2path unable to get '$fid' path"
+		[ "$found" == "$tf" ] || error "fid2path $found != $tf"
+	done
+
+	# check wrong root path format
+	rootpath=$MOUNT"_wrong"
+	found=$($LFS fid2path $rootpath "$fid")
+	[ -z "$found" ] || error "should fail ($rootpath != $MOUNT)"
 }
 run_test 154A "lfs path2fid and fid2path basic checks"
 
@@ -14842,6 +14983,71 @@ test_160k() {
 }
 run_test 160k "Verify that changelog records are not lost"
 
+# Verifies that a file passed as a parameter has recently had an operation
+# performed on it that has generated an MTIME changelog which contains the
+# correct parent FID. As files might reside on a different MDT from the
+# parent directory in DNE configurations, the FIDs are translated to paths
+# before being compared, which should be identical
+compare_mtime_changelog() {
+	local file="${1}"
+	local mdtidx
+	local mtime
+	local cl_fid
+	local pdir
+	local dir
+
+	mdtidx=$($LFS getstripe --mdt-index $file)
+	mdtidx=$(printf "%04x" $mdtidx)
+
+	# Obtain the parent FID from the MTIME changelog
+	mtime=$($LFS changelog $FSNAME-MDT$mdtidx | tail -n 1 | grep MTIME)
+	[ -z "$mtime" ] && error "MTIME changelog not recorded"
+
+	cl_fid=$(sed -e 's/.* p=//' -e 's/ .*//' <<<$mtime)
+	[ -z "$cl_fid" ] && error "parent FID not present"
+
+	# Verify that the path for the parent FID is the same as the path for
+	# the test directory
+	pdir=$($LFS fid2path $MOUNT "$cl_fid")
+
+	dir=$(dirname $1)
+
+	[[ "${pdir%/}" == "$dir" ]] ||
+		error "MTIME changelog parent FID is wrong, expected $dir, got $pdir"
+}
+
+test_160l() {
+	[ $PARALLEL == "yes" ] && skip "skip parallel run"
+
+	remote_mds_nodsh && skip "remote MDS with nodsh"
+	[[ $MDS1_VERSION -ge $(version_code 2.13.55) ]] ||
+		skip "Need MDS version at least 2.13.55"
+
+	local cl_user
+
+	changelog_register || error "changelog_register failed"
+	cl_user="${CL_USERS[$SINGLEMDS]%% *}"
+
+	changelog_users $SINGLEMDS | grep -q $cl_user ||
+		error "User '$cl_user' not found in changelog_users"
+
+	# Clear some types so that MTIME changelogs are generated
+	changelog_chmask "-CREAT"
+	changelog_chmask "-CLOSE"
+
+	test_mkdir $DIR/$tdir || error "failed to mkdir $DIR/$tdir"
+
+	# Test CL_MTIME during setattr
+	touch $DIR/$tdir/$tfile
+	compare_mtime_changelog $DIR/$tdir/$tfile
+
+	# Test CL_MTIME during close
+	dd if=/dev/urandom of=$DIR/$tdir/${tfile}_2 bs=1M count=64 ||
+		error "cannot create file $DIR/$tdir/${tfile}_2"
+	compare_mtime_changelog $DIR/$tdir/${tfile}_2
+}
+run_test 160l "Verify that MTIME changelog records contain the parent FID"
+
 test_161a() {
 	[ $PARALLEL == "yes" ] && skip "skip parallel run"
 
@@ -15762,6 +15968,7 @@ test_184c() {
 	local cmpn_arg=$(cmp -n 2>&1 | grep "invalid option")
 	[ -n "$cmpn_arg" ] && skip_env "cmp does not support -n"
 	check_swap_layouts_support
+	check_swap_layout_no_dom $DIR
 
 	local dir0=$DIR/$tdir/$testnum
 	mkdir -p $dir0 || error "creating dir $dir0"
@@ -15809,6 +16016,7 @@ run_test 184c "Concurrent write and layout swap"
 
 test_184d() {
 	check_swap_layouts_support
+	check_swap_layout_no_dom $DIR
 	[ -z "$(which getfattr 2>/dev/null)" ] &&
 		skip_env "no getfattr command"
 
@@ -15845,6 +16053,7 @@ test_184e() {
 	[[ $MDS1_VERSION -ge $(version_code 2.6.94) ]] ||
 		skip "Need MDS version at least 2.6.94"
 	check_swap_layouts_support
+	check_swap_layout_no_dom $DIR
 	[ -z "$(which getfattr 2>/dev/null)" ] &&
 		skip_env "no getfattr command"
 
@@ -16335,16 +16544,31 @@ test_205a() { # Job stats
 }
 run_test 205a "Verify job stats"
 
-# LU-13117
+# LU-13117, LU-13597
 test_205b() {
+	job_stats="mdt.*.job_stats"
+	$LCTL set_param $job_stats=clear
 	$LCTL set_param jobid_var=USER jobid_name="%e.%u"
 	env -i USERTESTJOBSTATS=foolish touch $DIR/$tfile.1
-	do_facet $SINGLEMDS $LCTL get_param mdt.*.job_stats |
-		grep job_id: | grep foolish &&
+	do_facet $SINGLEMDS $LCTL get_param $job_stats |
+		grep "job_id:.*foolish" &&
 			error "Unexpected jobid found"
-	true
+	do_facet $SINGLEMDS $LCTL get_param $job_stats |
+		grep "open:.*min.*max.*sum" ||
+			error "wrong job_stats format found"
 }
-run_test 205b "Verify job stats jobid parsing"
+run_test 205b "Verify job stats jobid and output format"
+
+# LU-13733
+test_205c() {
+	$LCTL set_param llite.*.stats=0
+	dd if=/dev/zero of=$DIR/$tfile.1 bs=4k count=1
+	$LCTL get_param llite.*.stats
+	$LCTL get_param llite.*.stats | grep \
+		"write_bytes *1 samples \[bytes\] 4096 4096 4096 16777216" ||
+			error "wrong client stats format found"
+}
+run_test 205c "Verify client stats format"
 
 # LU-1480, LU-1773 and LU-1657
 test_206() {
@@ -16452,6 +16676,8 @@ test_209() {
 	sync; sleep 5; sync;
 
 	echo 3 > /proc/sys/vm/drop_caches
+	[ -f /sys/kernel/slab/ptlrpc_cache/shrink ] &&
+		echo 1 > /sys/kernel/slab/ptlrpc_cache/shrink
 	req_before=$(awk '/ptlrpc_cache / { print $2 }' /proc/slabinfo)
 
 	# open/close 500 times
@@ -16460,6 +16686,8 @@ test_209() {
 	done
 
 	echo 3 > /proc/sys/vm/drop_caches
+	[ -f /sys/kernel/slab/ptlrpc_cache/shrink ] &&
+		echo 1 > /sys/kernel/slab/ptlrpc_cache/shrink
 	req_after=$(awk '/ptlrpc_cache / { print $2 }' /proc/slabinfo)
 
 	echo "before: $req_before, after: $req_after"
@@ -16469,6 +16697,27 @@ test_209() {
 }
 run_test 209 "read-only open/close requests should be freed promptly"
 
+test_210() {
+	local pid
+
+	$MULTIOP $DIR/$tfile oO_CREAT:O_RDWR:eW_E+eUc &
+	pid=$!
+	sleep 1
+
+	$LFS getstripe $DIR/$tfile
+	kill -USR1 $pid
+	wait $pid || error "multiop failed"
+
+	$MULTIOP $DIR/$tfile oO_RDONLY:eR_E+eUc &
+	pid=$!
+	sleep 1
+
+	$LFS getstripe $DIR/$tfile
+	kill -USR1 $pid
+	wait $pid || error "multiop failed"
+}
+run_test 210 "lfs getstripe does not break leases"
+
 test_212() {
 	size=`date +%s`
 	size=$((size % 8192 + 1))
@@ -17032,6 +17281,34 @@ test_226b () {
 }
 run_test 226b "call path2fid and fid2path on files of all type under remote dir"
 
+test_226c () {
+	[ $MDSCOUNT -lt 2 ] && skip_env "needs >= 2 MDTs"
+	[[ $MDS1_VERSION -ge $(version_code 2.13.55) ]] ||
+		skip "Need MDS version at least 2.13.55"
+
+	local submnt=/mnt/submnt
+	local srcfile=/etc/passwd
+	local dstfile=$submnt/passwd
+	local path
+	local fid
+
+	rm -rf $DIR/$tdir
+	rm -rf $submnt
+	$LFS setdirstripe -c -1 -i 1 $DIR/$tdir ||
+		error "create remote directory failed"
+	mkdir -p $submnt || error "create $submnt failed"
+	$MOUNT_CMD $MGSNID:/$FSNAME/$tdir $submnt ||
+		error "mount $submnt failed"
+	stack_trap "umount $submnt" EXIT
+
+	cp $srcfile $dstfile
+	fid=$($LFS path2fid $dstfile)
+	path=$($LFS fid2path $submnt "$fid")
+	[ "$path" = "$dstfile" ] ||
+		error "fid2path $submnt $fid failed ($path != $dstfile)"
+}
+run_test 226c "call path2fid and fid2path under remote dir with subdir mount"
+
 # LU-1299 Executing or running ldd on a truncated executable does not
 # cause an out-of-memory condition.
 test_227() {
@@ -17729,7 +18006,7 @@ run_test 230i "lfs migrate -m tolerates trailing slashes"
 
 test_230j() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"
-	[ $MDS1_VERSION -lt $(version_code 2.11.52) ] &&
+	[ $MDS1_VERSION -lt $(version_code 2.13.52) ] &&
 		skip "Need MDS version at least 2.11.52"
 
 	$LFS mkdir -m 0 -c 1 $DIR/$tdir || error "mkdir $tdir failed"
@@ -17737,7 +18014,7 @@ test_230j() {
 		error "create $tfile failed"
 	cat /etc/passwd > $DIR/$tdir/$tfile
 
-	$LFS migrate -m 1 $DIR/$tdir
+	$LFS migrate -m 1 $DIR/$tdir || error "migrate failed"
 
 	cmp /etc/passwd $DIR/$tdir/$tfile ||
 		error "DoM file mismatch after migration"
@@ -17876,6 +18153,197 @@ test_230n() {
 }
 run_test 230n "Dir migration with mirrored file"
 
+test_230o() {
+	[ $MDSCOUNT -ge 2 ] || skip "needs >= 2 MDTs"
+	[ $MDS1_VERSION -ge $(version_code 2.13.52) ] ||
+		skip "Need MDS version at least 2.13.52"
+
+	local mdts=$(comma_list $(mdts_nodes))
+	local timeout=100
+
+	local restripe_status
+	local delta
+	local i
+	local j
+
+	[[ $(facet_fstype mds1) == zfs ]] && timeout=300
+
+	# in case "crush" hash type is not set
+	do_nodes $mdts "$LCTL set_param lod.*.mdt_hash=crush"
+
+	restripe_status=$(do_facet mds1 $LCTL get_param -n \
+			   mdt.*MDT0000.enable_dir_restripe)
+	do_nodes $mdts "$LCTL set_param mdt.*.enable_dir_restripe=1"
+	stack_trap "do_nodes $mdts $LCTL set_param \
+		    mdt.*.enable_dir_restripe=$restripe_status"
+
+	mkdir $DIR/$tdir
+	createmany -m $DIR/$tdir/f 100 ||
+		error "create files under remote dir failed $i"
+	createmany -d $DIR/$tdir/d 100 ||
+		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"
+		$LFS setdirstripe -c $i $DIR/$tdir ||
+			error "split -c $i $tdir failed"
+		wait_update $HOSTNAME \
+			"$LFS getdirstripe -H $DIR/$tdir" "crush" $timeout ||
+			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"
+		# delta is around total_files/stripe_count
+		[ $delta -lt $((200 /(i - 1))) ] ||
+			error "$delta files migrated"
+	done
+}
+run_test 230o "dir split"
+
+test_230p() {
+	[ $MDSCOUNT -ge 2 ] || skip "needs >= 2 MDTs"
+	[ $MDS1_VERSION -ge $(version_code 2.13.52) ] ||
+		skip "Need MDS version at least 2.13.52"
+
+	local mdts=$(comma_list $(mdts_nodes))
+	local timeout=100
+
+	local restripe_status
+	local delta
+	local i
+	local j
+
+	[[ $(facet_fstype mds1) == zfs ]] && timeout=300
+
+	do_nodes $mdts "$LCTL set_param lod.*.mdt_hash=crush"
+
+	restripe_status=$(do_facet mds1 $LCTL get_param -n \
+			   mdt.*MDT0000.enable_dir_restripe)
+	do_nodes $mdts "$LCTL set_param mdt.*.enable_dir_restripe=1"
+	stack_trap "do_nodes $mdts $LCTL set_param \
+		    mdt.*.enable_dir_restripe=$restripe_status"
+
+	test_mkdir -c $MDSCOUNT -H crush $DIR/$tdir
+	createmany -m $DIR/$tdir/f 100 ||
+		error "create files under remote dir failed $i"
+	createmany -d $DIR/$tdir/d 100 ||
+		error "create dirs under remote dir failed $i"
+
+	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"
+		$LFS setdirstripe -c $i $DIR/$tdir ||
+			error "split -c $i $tdir failed"
+		[ $i -eq 1 ] && mdt_hash="none"
+		wait_update $HOSTNAME \
+			"$LFS getdirstripe -H $DIR/$tdir" $mdt_hash $timeout ||
+			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"
+		# delta is around total_files/stripe_count
+		[ $delta -lt $((200 / i)) ] ||
+			error "$delta files migrated"
+	done
+}
+run_test 230p "dir merge"
+
+test_230q() {
+	[ $MDSCOUNT -ge 2 ] || skip "needs >= 2 MDTs"
+	[ $MDS1_VERSION -ge $(version_code 2.13.52) ] ||
+		skip "Need MDS version at least 2.13.52"
+
+	local mdts=$(comma_list $(mdts_nodes))
+	local saved_threshold=$(do_facet mds1 \
+			$LCTL get_param -n mdt.*-MDT0000.dir_split_count)
+	local saved_delta=$(do_facet mds1 \
+			$LCTL get_param -n mdt.*-MDT0000.dir_split_delta)
+	local threshold=100
+	local delta=2
+	local total=0
+	local stripe_count=0
+	local stripe_index
+	local nr_files
+
+	stack_trap "do_nodes $mdts $LCTL set_param \
+		    mdt.*.dir_split_count=$saved_threshold"
+	stack_trap "do_nodes $mdts $LCTL set_param \
+		    mdt.*.dir_split_delta=$saved_delta"
+	stack_trap "do_nodes $mdts $LCTL set_param mdt.*.dir_restripe_nsonly=1"
+	do_nodes $mdts "$LCTL set_param mdt.*.enable_dir_auto_split=1"
+	do_nodes $mdts "$LCTL set_param mdt.*.dir_split_count=$threshold"
+	do_nodes $mdts "$LCTL set_param mdt.*.dir_split_delta=$delta"
+	do_nodes $mdts "$LCTL set_param mdt.*.dir_restripe_nsonly=0"
+	do_nodes $mdts "$LCTL set_param lod.*.mdt_hash=crush"
+
+	$LFS mkdir -i -1 -c 1 $DIR/$tdir || error "mkdir $tdir failed"
+	stripe_index=$($LFS getdirstripe -i $DIR/$tdir)
+
+	while [ $stripe_count -lt $MDSCOUNT ]; do
+		createmany -m $DIR/$tdir/f $total $((threshold * 3 / 2)) ||
+			error "create sub files failed"
+		stat $DIR/$tdir > /dev/null
+		total=$((total + threshold * 3 / 2))
+		stripe_count=$((stripe_count + delta))
+		[ $stripe_count -gt $MDSCOUNT ] && stripe_count=$MDSCOUNT
+
+		wait_update $HOSTNAME \
+			"$LFS getdirstripe -c $DIR/$tdir" "$stripe_count" 40 ||
+			error "stripe count $($LFS getdirstripe -c $DIR/$tdir) != $stripe_count"
+
+		wait_update $HOSTNAME \
+			"$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))) ] ||
+			error "$nr_files files on MDT$stripe_index after split"
+
+		nr_files=$(ls $DIR/$tdir | wc -w)
+		[ $nr_files -eq $total ] ||
+			error "total sub files $nr_files != $total"
+	done
+}
+run_test 230q "dir auto split"
+
+test_230r() {
+	[[ $PARALLEL != "yes" ]] || skip "skip parallel run"
+	[[ $MDSCOUNT -ge 2 ]] || skip_env "needs >= 2 MDTs"
+	[[ $MDS1_VERSION -ge $(version_code 2.13.54) ]] ||
+		skip "Need MDS version at least 2.13.54"
+
+	# maximum amount of local locks:
+	# parent striped dir - 2 locks
+	# new stripe in parent to migrate to - 1 lock
+	# source and target - 2 locks
+	# Total 5 locks for regular file
+	mkdir -p $DIR/$tdir
+	$LFS mkdir -i1 -c2 $DIR/$tdir/dir1
+	touch $DIR/$tdir/dir1/eee
+
+	# create 4 hardlink for 4 more locks
+	# Total: 9 locks > RS_MAX_LOCKS (8)
+	$LFS mkdir -i1 -c1 $DIR/$tdir/dir2
+	$LFS mkdir -i1 -c1 $DIR/$tdir/dir3
+	$LFS mkdir -i1 -c1 $DIR/$tdir/dir4
+	$LFS mkdir -i1 -c1 $DIR/$tdir/dir5
+	ln $DIR/$tdir/dir1/eee $DIR/$tdir/dir2/eee
+	ln $DIR/$tdir/dir1/eee $DIR/$tdir/dir3/eee
+	ln $DIR/$tdir/dir1/eee $DIR/$tdir/dir4/eee
+	ln $DIR/$tdir/dir1/eee $DIR/$tdir/dir5/eee
+
+	cancel_lru_locks mdc
+
+	$LFS migrate -m1 -c1 $DIR/$tdir/dir1 ||
+		error "migrate dir fails"
+
+	rm -rf $DIR/$tdir || error "rm dir failed after migration"
+}
+run_test 230r "migrate with too many local locks"
+
 test_231a()
 {
 	# For simplicity this test assumes that max_pages_per_rpc
@@ -18337,7 +18805,7 @@ test_247c() {
 	$LFS fid2path $submount $fid && error "fid2path should fail"
 	cleanup_247 $submount
 }
-run_test 247c "running fid2path outside root"
+run_test 247c "running fid2path outside subdirectory root"
 
 test_247d() {
 	lctl get_param -n mdc.$FSNAME-MDT0000*.import | grep -q subtree ||
@@ -18350,11 +18818,28 @@ test_247d() {
 	FILESET="$FILESET/$tdir" mount_client $submount ||
 		error "mount $submount failed"
 	trap "cleanup_247 $submount" EXIT
-	local fid=$($LFS path2fid $submount/dir1)
-	$LFS fid2path $submount $fid || error "fid2path should succeed"
+
+	local td=$submount/dir1
+	local fid=$($LFS path2fid $td)
+	[ -z "$fid" ] && error "path2fid unable to get $td FID"
+
+	# check that we get the same pathname back
+	local rootpath
+	local found
+	for rootpath in "$submount" "$submount///" "$submount/dir1"; do
+		echo "$rootpath $fid"
+		found=$($LFS fid2path $rootpath "$fid")
+		[ -n "found" ] || error "fid2path should succeed"
+		[ "$found" == "$td" ] || error "fid2path $found != $td"
+	done
+	# check wrong root path format
+	rootpath=$submount"_wrong"
+	found=$($LFS fid2path $rootpath "$fid")
+	[ -z "$found" ] || error "fid2path should fail ($rootpath != $submount)"
+
 	cleanup_247 $submount
 }
-run_test 247d "running fid2path inside root"
+run_test 247d "running fid2path inside subdirectory root"
 
 # LU-8037
 test_247e() {
@@ -19623,6 +20108,36 @@ test_270g() {
 }
 run_test 270g "DoM: default DoM stripe size depends on free space"
 
+test_270h() {
+	[[ $MDS1_VERSION -ge $(version_code 2.13.53) ]] ||
+		skip "Need MDS version at least 2.13.53"
+
+	local mdtname=${FSNAME}-MDT0000-mdtlov
+	local dom=$DIR/$tdir/$tfile
+	local save="$TMP/$TESTSUITE-$TESTNAME.parameters"
+
+	save_lustre_params mds1 "lod.*.dom_stripesize" > $save
+	stack_trap "restore_lustre_params < $save; rm -f $save" EXIT
+
+	$LFS mkdir -i 0 -c 1 $DIR/$tdir
+	$LFS setstripe -E 1M -c1  -E -1 -c2 ${dom}_1 ||
+		error "can't create OST file"
+	# mirrored file with DOM entry in the second mirror
+	$LFS mirror extend -N -E 1M -L mdt -E eof -c2 ${dom}_1 ||
+		error "can't create mirror with DoM component"
+
+	do_facet mds1 $LCTL set_param -n lod.$mdtname.dom_stripesize=0
+
+	# DOM component in the middle and has other enries in the same mirror,
+	# should succeed but lost DoM component
+	$LFS setstripe --copy=${dom}_1 $dom ||
+		error "Can't create file from OST|DOM mirror layout"
+	# check new file has no DoM layout after all
+	[[ $($LFS getstripe -L $dom) != "mdt" ]] ||
+		error "File has DoM component while DoM is disabled"
+}
+run_test 270h "DoM: DoM stripe removal when disabled on server"
+
 test_271a() {
 	[ $MDS1_VERSION -lt $(version_code 2.10.55) ] &&
 		skip "Need MDS version at least 2.10.55"
@@ -21480,11 +21995,32 @@ test_398c() { # LU-4198
 		--filename=$DIR/$tfile
 	[ $? -eq 0 ] || error "fio mixed read write error"
 
+	echo "AIO with large block size ${size}M"
+	fio --name=rand-rw --rw=randrw --bs=${size}M --direct=1 \
+		--numjobs=1 --fallocate=none --ioengine=libaio \
+		--iodepth=16 --allow_file_create=0 --size=${size}M \
+		--filename=$DIR/$tfile
+	[ $? -eq 0 ] || error "fio large block size failed"
+
 	rm -rf $DIR/$tfile
 	$LCTL set_param debug="$saved_debug"
 }
 run_test 398c "run fio to test AIO"
 
+test_398d() { #  LU-13846
+	test -f aiocp || skip_env "no aiocp installed"
+	local aio_file=$DIR/aio_file
+
+	$LFS setstripe -c -1 -S 1M $DIR/$tfile $aio_file
+
+	dd if=/dev/urandom of=$DIR/$tfile bs=1M count=64
+	aiocp -a $PAGE_SIZE -b 64M -s 64M -f O_DIRECT $DIR/$tfile $aio_file
+
+	diff $DIR/$tfile $aio_file || "file diff after aiocp"
+	rm -rf $DIR/$tfile $aio_file
+}
+run_test 398d "run aiocp to verify block size > stripe size"
+
 test_fake_rw() {
 	local read_write=$1
 	if [ "$read_write" = "write" ]; then
@@ -21799,6 +22335,7 @@ test_405() {
 			skip "Layout swap lock is not supported"
 
 	check_swap_layouts_support
+	check_swap_layout_no_dom $DIR
 
 	test_mkdir $DIR/$tdir
 	swap_lock_test -d $DIR/$tdir ||
@@ -21949,6 +22486,8 @@ test_410()
 {
 	[[ $CLIENT_VERSION -lt $(version_code 2.9.59) ]] &&
 		skip "Need client version at least 2.9.59"
+	[ -f $LUSTRE/tests/kernel/kinode.ko ] ||
+		skip "Need MODULES build"
 
 	# Create a file, and stat it from the kernel
 	local testfile=$DIR/$tfile