X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=23cd0dad9f005c448db15ea9fc2ebf2a628565ef;hp=b9989066c7e95872525b155d4896d0766d6ee738;hb=c2b82ef8a12e6c55f143fbd8986c094425ed667e;hpb=5d431d72458dabb6ad43993701de25dde08d3468

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index b998906..23cd0da 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -4,8 +4,8 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 
-# bug number for skipped test:
-ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT"
+# bug number for skipped test:     LU-7005
+ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT 50i"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 is_sles11()						# LU-2181
@@ -78,8 +78,8 @@ if [[ "$LDISKFS_MKFS_OPTS" != *lazy_itable_init* ]]; then
 fi
 
 [ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
-# bug number for skipped test:        LU-2778 LU-4444
-	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 57b     69"
+# bug number for skipped test:        LU-4444
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 69"
 
 init_logging
 
@@ -321,9 +321,9 @@ test_1() {
 run_test 1 "start up ost twice (should return errors)"
 
 test_2() {
-	start_mdt 1 || error "MDT0 start fail"
+	start_mds || error "MDT start failed"
 	echo "start mds second time.."
-	start_mdt 1 && error "2nd MDT start should fail"
+	start_mds && error "2nd MDT start should fail"
 	start_ost || error "OST start failed"
 	mount_client $MOUNT || error "mount_client failed to start client"
 	check_mount || error "check_mount failed"
@@ -1274,30 +1274,35 @@ run_test 30a "Big config llog and conf_param deletion"
 test_30b() {
 	setup
 
+	local orignids=$($LCTL get_param -n \
+		osc.$FSNAME-OST0000-osc-[^M]*.import | grep failover_nids)
+
+	local orignidcount=$(echo "$orignids" | wc -w)
+
 	# Make a fake nid.  Use the OST nid, and add 20 to the least significant
 	# numerical part of it. Hopefully that's not already a failover address
 	# for the server.
-	OSTNID=$(do_facet ost1 "$LCTL get_param nis" | tail -1 | awk '{print $1}')
-	ORIGVAL=$(echo $OSTNID | egrep -oi "[0-9]*@")
-	NEWVAL=$((($(echo $ORIGVAL | egrep -oi "[0-9]*") + 20) % 256))
-	NEW=$(echo $OSTNID | sed "s/$ORIGVAL/$NEWVAL@/")
+	local OSTNID=$(do_facet ost1 "$LCTL get_param nis" | tail -1 | \
+		awk '{print $1}')
+	local ORIGVAL=$(echo $OSTNID | egrep -oi "[0-9]*@")
+	local NEWVAL=$((($(echo $ORIGVAL | egrep -oi "[0-9]*") + 20) % 256))
+	local NEW=$(echo $OSTNID | sed "s/$ORIGVAL/$NEWVAL@/")
 	echo "Using fake nid $NEW"
 
-	TEST="$LCTL get_param -n osc.$FSNAME-OST0000-osc-[^M]*.import |
+	local TEST="$LCTL get_param -n osc.$FSNAME-OST0000-osc-[^M]*.import |
 		grep failover_nids | sed -n 's/.*\($NEW\).*/\1/p'"
 	set_conf_param_and_check client "$TEST" \
 		"$FSNAME-OST0000.failover.node" $NEW ||
 		error "didn't add failover nid $NEW"
-	NIDS=$($LCTL get_param -n osc.$FSNAME-OST0000-osc-[^M]*.import |
+	local NIDS=$($LCTL get_param -n osc.$FSNAME-OST0000-osc-[^M]*.import |
 		grep failover_nids)
 	echo $NIDS
-	# The NIDS value is the failover nid strings and "[" and "]". So
-	# we need to subtract the space taken by the delimiters. This has
-	# changed from earlier version of Lustre but this test is run only
-	# locally so this change will not break interop. See LU-3386
-	NIDCOUNT=$(($(echo "$NIDS" | wc -w) - 3))
-	echo "should have 2 failover nids: $NIDCOUNT"
-	[ $NIDCOUNT -eq 2 ] || error "Failover nid not added"
+	local NIDCOUNT=$(echo "$NIDS" | wc -w)
+	echo "should have $((orignidcount + 1)) entries \
+		in failover nids string, have $NIDCOUNT"
+	[ $NIDCOUNT -eq $((orignidcount + 1)) ] ||
+		error "Failover nid not added"
+
 	do_facet mgs "$LCTL conf_param -d $FSNAME-OST0000.failover.node" ||
 		error "conf_param delete failed"
 	umount_client $MOUNT
@@ -1306,9 +1311,10 @@ test_30b() {
 	NIDS=$($LCTL get_param -n osc.$FSNAME-OST0000-osc-[^M]*.import |
 		grep failover_nids)
 	echo $NIDS
-	NIDCOUNT=$(($(echo "$NIDS" | wc -w) - 3))
-	echo "only 1 final nid should remain: $NIDCOUNT"
-	[ $NIDCOUNT -eq 1 ] || error "Failover nids not removed"
+	NIDCOUNT=$(echo "$NIDS" | wc -w)
+	echo "only $orignidcount final entries should remain \
+		in failover nids string, have $NIDCOUNT"
+	[ $NIDCOUNT -eq $orignidcount ] || error "Failover nids not removed"
 
 	cleanup || error "cleanup failed with rc $?"
 }
@@ -1640,9 +1646,11 @@ t32_test() {
 	local fstype=$(facet_fstype $SINGLEMDS)
 	local mdt_dev=$tmp/mdt
 	local ost_dev=$tmp/ost
+	local dir
 
 	trap 'trap - RETURN; t32_test_cleanup' RETURN
 
+	load_modules
 	mkdir -p $tmp/mnt/lustre || error "mkdir $tmp/mnt/lustre failed"
 	$r mkdir -p $tmp/mnt/{mdt,ost}
 	$r tar xjvf $tarball -S -C $tmp || {
@@ -1893,11 +1901,16 @@ t32_test() {
 		}
 
 		if [ "$dne_upgrade" != "no" ]; then
-			$LFS mkdir -i 1 $tmp/mnt/lustre/remote_dir || {
+			$LFS mkdir -i 1 -c2 $tmp/mnt/lustre/remote_dir || {
 				error_noexit "set remote dir failed"
 				return 1
 			}
 
+			$LFS setdirstripe -D -c2 $tmp/mnt/lustre/remote_dir
+
+			$r $LCTL set_param -n	\
+				mdt.${fsname}*.enable_remote_dir=1 2>/dev/null
+
 			pushd $tmp/mnt/lustre
 			tar -cf - . --exclude=./remote_dir |
 				tar -xvf - -C remote_dir 1>/dev/null || {
@@ -1983,6 +1996,41 @@ t32_test() {
 			echo "list verification skipped"
 		fi
 
+		if [ $(lustre_version_code mds1) -ge $(version_code 2.7.50) -a \
+		     $dne_upgrade != "no" ]; then
+			$r $LCTL set_param -n	\
+				mdt.${fsname}*.enable_remote_dir=1 2>/dev/null
+
+			echo "test migration"
+			pushd $tmp/mnt/lustre
+			# migrate the files/directories to the remote MDT, then
+			# move it back
+			for dir in $(find ! -name .lustre ! -name . -type d); do
+				mdt_index=$($LFS getdirstripe -i $dir)
+				stripe_cnt=$($LFS getdirstripe -c $dir)
+				if [ $mdt_index = 0 -a $stripe_cnt -le 1 ]; then
+					$LFS mv -M 1 $dir || {
+					popd
+					error_noexit "migrate MDT1 failed"
+					return 1
+				}
+				fi
+			done
+
+			for dir in $(find ! -name . ! -name .lustre -type d); do
+				mdt_index=$($LFS getdirstripe -i $dir)
+				stripe_cnt=$($LFS getdirstripe -c $dir)
+				if [ $mdt_index = 1 -a $stripe_cnt -le 1 ]; then
+					$LFS mv -M 0 $dir || {
+					popd
+					error_noexit "migrate MDT0 failed"
+					return 1
+				}
+				fi
+			done
+			popd
+		fi
+
 		#
 		# When adding new data verification tests, please check for
 		# the presence of the required reference files first, like
@@ -2090,6 +2138,10 @@ test_32c() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	t32_check
 	for tarball in $tarballs; do
+		# Do not support 1_8 and 2_1 direct upgrade to DNE2 anymore */
+		echo $tarball | grep "1_8" && continue
+		echo $tarball | grep "2_1" && continue
+		load_modules
 		dne_upgrade=yes t32_test $tarball writeconf || rc=$?
 	done
 	return $rc
@@ -2567,9 +2619,14 @@ test_41a() { #bug 14134
 
 	local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})
 
-	start $SINGLEMDS $MDSDEV $MDS_MOUNT_OPTS -o nosvc -n
+	start_mdt 1 -o nosvc -n
+	if [ $MDSCOUNT -ge 2 ]; then
+		for num in $(seq 2 $MDSCOUNT); do
+			start_mdt $num || return
+		done
+	fi
 	start ost1 $(ostdevname 1) $OST_MOUNT_OPTS
-	start $SINGLEMDS $MDSDEV $MDS_MOUNT_OPTS -o nomgs,force
+	start_mdt 1 -o nomgs,force
 	mount_client $MOUNT || error "mount_client $MOUNT failed"
 	sleep 5
 
@@ -2597,9 +2654,14 @@ test_41b() {
 	reformat
 	local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})
 
-	start $SINGLEMDS $MDSDEV $MDS_MOUNT_OPTS -o nosvc -n
+	start_mdt 1 -o nosvc -n
+	if [ $MDSCOUNT -ge 2 ]; then
+		for num in $(seq 2 $MDSCOUNT); do
+			start_mdt $num || return
+		done
+	fi
 	start_ost || error "Unable to start OST1"
-	start $SINGLEMDS $MDSDEV $MDS_MOUNT_OPTS -o nomgs,force
+	start_mdt 1 -o nomgs,force
 	mount_client $MOUNT || error "mount_client $MOUNT failed"
 	sleep 5
 
@@ -2648,7 +2710,14 @@ test_41c() {
 		error "unexpected concurrent MDT mounts result, rc=$rc rc2=$rc2"
 	fi
 
+	if [ $MDSCOUNT -ge 2 ]; then
+		for num in $(seq 2 $MDSCOUNT); do
+			start_mdt $num || return
+		done
+	fi
+
 	# OST concurrent start
+
 	#define OBD_FAIL_TGT_DELAY_CONNECT 0x703
 	do_facet ost1 "$LCTL set_param fail_loc=0x703"
 	start ost1 $(ostdevname 1) $OST_MOUNT_OPTS &
@@ -2668,26 +2737,26 @@ test_41c() {
 		echo "1st OST start failed with EALREADY"
 		echo "2nd OST start succeed"
 	else
-		stop mds1 -f
+		stop_mds -f
 		stop ost1 -f
 		error "unexpected concurrent OST mounts result, rc=$rc rc2=$rc2"
 	fi
 	# cleanup
-	stop mds1 -f
+	stop_mds
 	stop ost1 -f
 
 	# verify everything ok
 	start_mds
 	if [ $? != 0 ]
 	then
-		stop mds1 -f
+		stop_mds
 		error "MDT(s) start failed"
 	fi
 
 	start_ost
 	if [ $? != 0 ]
 	then
-		stop mds1 -f
+		stop_mds
 		stop ost1 -f
 		error "OST(s) start failed"
 	fi
@@ -2695,14 +2764,14 @@ test_41c() {
 	mount_client $MOUNT
 	if [ $? != 0 ]
 	then
-		stop mds1 -f
+		stop_mds
 		stop ost1 -f
 		error "client start failed"
 	fi
 	check_mount
 	if [ $? != 0 ]
 	then
-		stop mds1 -f
+		stop_mds
 		stop ost1 -f
 		error "client mount failed"
 	fi
@@ -3362,6 +3431,52 @@ test_50h() {
 }
 run_test 50h "LU-642: activate deactivated OST"
 
+test_50i() {
+	# prepare MDT/OST, make OSC inactive for OST1
+	[ "$MDSCOUNT" -lt "2" ] && skip_env "$MDSCOUNT < 2, skipping" && return
+
+	[ $(facet_fstype ost1) == zfs ] && import_zpool ost1
+	load_modules
+	do_facet mds2 "$TUNEFS --param mdc.active=0 $(mdsdevname 2)" ||
+		error "tunefs MDT2 failed"
+	start_mds  || error "Unable to start MDT"
+	start_ost  || error "Unable to start OST1"
+	start_ost2 || error "Unable to start OST2"
+	mount_client $MOUNT || error "client start failed"
+
+	mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed"
+
+	$LCTL conf_param ${FSNAME}-MDT0000.mdc.active=0 &&
+		error "deactive MDC0 succeeds"
+	# activate MDC for MDT2
+	local TEST="$LCTL get_param -n mdc.${FSNAME}-MDT0001-mdc-[!M]*.active"
+	set_conf_param_and_check client					\
+		"$TEST" "${FSNAME}-MDT0001.mdc.active" 1 ||
+		error "Unable to activate MDT2"
+
+	$LFS mkdir -i1 $DIR/$tdir/2 || error "mkdir $DIR/$tdir/2 failed"
+	# create some file
+	createmany -o $DIR/$tdir/2/$tfile-%d 1 || error "create files failed"
+
+	rm -rf $DIR/$tdir/2 || error "unlink dir failed"
+
+	# deactivate MDC for MDT2
+	local TEST="$LCTL get_param -n mdc.${FSNAME}-MDT0001-mdc-[!M]*.active"
+	set_conf_param_and_check client					\
+		"$TEST" "${FSNAME}-MDT0001.mdc.active" 0 ||
+		error "Unable to deactivate MDT2"
+
+	$LFS mkdir -i1 $DIR/$tdir/2 &&
+		error "mkdir $DIR/$tdir/2 succeeds after deactive MDT"
+
+	# cleanup
+	umount_client $MOUNT || error "Unable to umount client"
+	stop_mds
+	stop_ost
+	stop_ost 2
+}
+run_test 50i "activate deactivated MDT"
+
 test_51() {
 	local LOCAL_TIMEOUT=20
 
@@ -3891,20 +4006,19 @@ test_60() { # LU-471
 run_test 60 "check mkfs.lustre --mkfsoptions -E -O options setting"
 
 test_61() { # LU-80
-	local reformat=false
+	local lxattr=false
 
 	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.1.53) ] ||
 		{ skip "Need MDS version at least 2.1.53"; return 0; }
 
 	if [ $(facet_fstype $SINGLEMDS) == ldiskfs ] &&
-	   ! large_xattr_enabled; then
-		reformat=true
-		LDISKFS_MKFS_OPTS+=" -O large_xattr"
+	     ! large_xattr_enabled; then
+		lxattr=true
 
 		for num in $(seq $MDSCOUNT); do
-			add mds${num} $(mkfs_opts mds$num $(mdsdevname $num)) \
-			--reformat $(mdsdevname $num) $(mdsvdevname $num) ||
-			error "add mds $num failed"
+			do_facet mds${num} $TUNE2FS -O large_xattr \
+				$(mdsdevname $num) ||
+				error "tune2fs on mds $num failed"
 		done
 	fi
 
@@ -3953,9 +4067,12 @@ test_61() { # LU-80
 
     rm -f $file
     stopall
-	if $reformat; then
-		LDISKFS_MKFS_OPTS=${LDISKFS_MKFS_OPTS% -O large_xattr}
-		reformat
+	if $lxattr; then
+		for num in $(seq $MDSCOUNT); do
+			do_facet mds${num} $TUNE2FS -O ^large_xattr \
+				$(mdsdevname $num) ||
+				error "tune2fs on mds $num failed"
+		done
 	fi
 }
 run_test 61 "large xattr"
@@ -3974,10 +4091,10 @@ test_62() {
 		{ skip "Need MDS version at least 2.2.51"; return 0; }
 
 	echo "disable journal for mds"
-	do_facet mds tune2fs -O ^has_journal $mdsdev || error "tune2fs failed"
+	do_facet mds $TUNE2FS -O ^has_journal $mdsdev || error "tune2fs failed"
 	start_mds && error "MDT start should fail"
 	echo "disable journal for ost"
-	do_facet ost1 tune2fs -O ^has_journal $ostdev || error "tune2fs failed"
+	do_facet ost1 $TUNE2FS -O ^has_journal $ostdev || error "tune2fs failed"
 	start_ost && error "OST start should fail"
 	cleanup || error "cleanup failed with rc $?"
 	reformat_and_config
@@ -4247,15 +4364,13 @@ test_69() {
 	# use OST0000 since it probably has the most creations
 	local OSTNAME=$(ostname_from_index 0)
 	local mdtosc_proc1=$(get_mdtosc_proc_path mds1 $OSTNAME)
-	local last_id=$(do_facet mds1 $LCTL get_param -n \
-			osc.$mdtosc_proc1.prealloc_last_id)
 
 	# Want to have OST LAST_ID over 1.5 * OST_MAX_PRECREATE to
 	# verify that the LAST_ID recovery is working properly.  If
 	# not, then the OST will refuse to allow the MDS connect
 	# because the LAST_ID value is too different from the MDS
 	#define OST_MAX_PRECREATE=20000
-	local num_create=$((20000 * 5))
+	local num_create=$((20000 * 3))
 
 	mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed"
 	$SETSTRIPE -i 0 $DIR/$tdir || error "$SETSTRIPE -i 0 $DIR/$tdir failed"
@@ -4265,6 +4380,7 @@ test_69() {
 	# filesystem is not inconsistent later on
 	$LFS find $MOUNT --ost 0 | xargs rm
 
+	umount_client $MOUNT || error "umount client failed"
 	stop_ost || error "OST0 stop failure"
 	add ost1 $(mkfs_opts ost1 $(ostdevname 1)) --reformat --replace \
 		$(ostdevname 1) $(ostvdevname 1) ||
@@ -4272,6 +4388,7 @@ test_69() {
 	start_ost || error "OST0 restart failure"
 	wait_osc_import_state mds ost FULL
 
+	mount_client $MOUNT || error "mount client failed"
 	touch $DIR/$tdir/$tfile-last || error "create file after reformat"
 	local idx=$($GETSTRIPE -i $DIR/$tdir/$tfile-last)
 	[ $idx -ne 0 ] && error "$DIR/$tdir/$tfile-last on $idx not 0" || true
@@ -4289,8 +4406,9 @@ test_70a() {
 	start_mdt 1 || error "MDT0 start fail"
 
 	start_ost || error "OST0 start fail"
-
-	start_mdt 2 || error "MDT1 start fail"
+	for num in $(seq 2 $MDSCOUNT); do
+		start_mdt $num || return
+	done
 
 	mount_client $MOUNT || error "mount client fails"
 
@@ -4310,8 +4428,7 @@ test_70b() {
 
 	start_ost || error "OST0 start fail"
 
-	start_mdt 1 || error "MDT0 start fail"
-	start_mdt 2 || error "MDT1 start fail"
+	start_mds || error "MDS start fail"
 
 	mount_client $MOUNT || error "mount client fails"
 
@@ -4330,8 +4447,7 @@ test_70c() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	local MDTIDX=1
 
-	start_mdt 1 || error "MDT0 start fail"
-	start_mdt 2 || error "MDT1 start fail"
+	start_mds || error "MDS start fail"
 	start_ost || error "OST0 start fail"
 
 	mount_client $MOUNT || error "mount client fails"
@@ -4355,8 +4471,7 @@ test_70d() {
 	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
 	local MDTIDX=1
 
-	start_mdt 1 || error "MDT0 start fail"
-	start_mdt 2 || error "MDT1 start fail"
+	start_mds || error "MDS start fail"
 	start_ost || error "OST0 start fail"
 
 	mount_client $MOUNT || error "mount client fails"
@@ -4388,7 +4503,10 @@ test_71a() {
 
 	start_mdt 1 || error "MDT0 start fail"
 	start_ost || error "OST0 start fail"
-	start_mdt 2 || error "MDT1 start fail"
+	for num in $(seq 2 $MDSCOUNT); do
+		start_mdt $num || return
+	done
+
 	start_ost2 || error "OST1 start fail"
 
 	mount_client $MOUNT || error "mount client fails"
@@ -4401,8 +4519,7 @@ test_71a() {
 	rm -rf $DIR/$tdir || error "delete dir fail"
 
 	umount_client $MOUNT || error "umount_client failed"
-	stop_mdt 1 || error "MDT0 stop fail"
-	stop_mdt 2 || error "MDT1 stop fail"
+	stop_mds || error "MDS stop fail"
 	stop_ost || error "OST0 stop fail"
 	stop_ost2 || error "OST1 stop fail"
 }
@@ -4415,7 +4532,9 @@ test_71b() {
 	fi
 	local MDTIDX=1
 
-	start_mdt 2 || error "MDT1 start fail"
+	for num in $(seq 2 $MDSCOUNT); do
+		start_mdt $num || return
+	done
 	start_ost || error "OST0 start fail"
 	start_mdt 1 || error "MDT0 start fail"
 	start_ost2 || error "OST1 start fail"
@@ -4430,8 +4549,7 @@ test_71b() {
 	rm -rf $DIR/$tdir || error "delete dir fail"
 
 	umount_client $MOUNT || error "umount_client failed"
-	stop_mdt 1 || error "MDT0 stop fail"
-	stop_mdt 2 || error "MDT1 stop fail"
+	stop_mds || error "MDT0 stop fail"
 	stop_ost || error "OST0 stop fail"
 	stop_ost2 || error "OST1 stop fail"
 }
@@ -4446,7 +4564,9 @@ test_71c() {
 
 	start_ost || error "OST0 start fail"
 	start_ost2 || error "OST1 start fail"
-	start_mdt 2 || error "MDT1 start fail"
+	for num in $(seq 2 $MDSCOUNT); do
+		start_mdt $num || return
+	done
 	start_mdt 1 || error "MDT0 start fail"
 
 	mount_client $MOUNT || error "mount client fails"
@@ -4459,8 +4579,7 @@ test_71c() {
 	rm -rf $DIR/$tdir || error "delete dir fail"
 
 	umount_client $MOUNT || error "umount_client failed"
-	stop_mdt 1 || error "MDT0 stop fail"
-	stop_mdt 2 || error "MDT1 stop fail"
+	stop_mds || error "MDS stop fail"
 	stop_ost || error "OST0 stop fail"
 	stop_ost2 || error "OST1 stop fail"
 
@@ -4475,7 +4594,9 @@ test_71d() {
 	local MDTIDX=1
 
 	start_ost || error "OST0 start fail"
-	start_mdt 2 || error "MDT0 start fail"
+	for num in $(seq 2 $MDSCOUNT); do
+		start_mdt $num || return
+	done
 	start_mdt 1 || error "MDT0 start fail"
 	start_ost2 || error "OST1 start fail"
 
@@ -4489,8 +4610,7 @@ test_71d() {
 	rm -rf $DIR/$tdir || error "delete dir fail"
 
 	umount_client $MOUNT || error "umount_client failed"
-	stop_mdt 1 || error "MDT0 stop fail"
-	stop_mdt 2 || error "MDT1 stop fail"
+	stop_mds || error "MDS stop fail"
 	stop_ost || error "OST0 stop fail"
 	stop_ost2 || error "OST1 stop fail"
 
@@ -4505,7 +4625,9 @@ test_71e() {
 	local MDTIDX=1
 
 	start_ost || error "OST0 start fail"
-	start_mdt 2 || error "MDT1 start fail"
+	for num in $(seq 2 $MDSCOUNT); do
+		start_mdt $num || return
+	done
 	start_ost2 || error "OST1 start fail"
 	start_mdt 1 || error "MDT0 start fail"
 
@@ -4519,8 +4641,7 @@ test_71e() {
 	rm -rf $DIR/$tdir || error "delete dir fail"
 
 	umount_client $MOUNT || error "umount_client failed"
-	stop_mdt 1 || error "MDT0 stop fail"
-	stop_mdt 2 || error "MDT1 stop fail"
+	stop_mds || error "MDS stop fail"
 	stop_ost || error "OST0 stop fail"
 	stop_ost2 || error "OST1 stop fail"
 
@@ -4929,7 +5050,7 @@ test_80() {
 }
 run_test 80 "mgc import reconnect race"
 
-# Save the original values of $OSTCOUNT and $OSTINDEX$i.
+#Save the original values of $OSTCOUNT and $OSTINDEX$i.
 save_ostindex() {
 	local new_ostcount=$1
 	saved_ostcount=$OSTCOUNT
@@ -5370,6 +5491,422 @@ test_84() {
 }
 run_test 84 "check recovery_hard_time"
 
+test_85() {
+	[[ $(lustre_version_code ost1) -ge $(version_code 2.7.55) ]] ||
+		{ skip "Need OST version at least 2.7.55" && return 0; }
+##define OBD_FAIL_OSD_OST_EA_FID_SET 0x197
+	do_facet ost1 "lctl set_param fail_loc=0x197"
+	start_ost
+	stop_ost
+}
+run_test 85 "osd_ost init: fail ea_fid_set"
+
+test_86() {
+	[ "$(facet_fstype ost1)" = "zfs" ] &&
+		skip "LU-6442: no such mkfs params for ZFS OSTs" && return
+
+	local OST_OPTS="$(mkfs_opts ost1 $(ostdevname 1)) \
+		--reformat $(ostdevname 1) $(ostvdevname 1)"
+
+	local NEWSIZE=1024
+	local OLDSIZE=$(do_facet ost1 "$DEBUGFS -c -R stats $(ostdevname 1)" |
+		awk '/Flex block group size: / { print $NF; exit; }')
+
+	local opts=OST_OPTS
+	if [[ ${!opts} != *mkfsoptions* ]]; then
+		eval opts=\"${!opts} \
+			--mkfsoptions='\\\"-O flex_bg -G $NEWSIZE\\\"'\"
+	else
+		val=${!opts//--mkfsoptions=\\\"/ \
+			--mkfsoptions=\\\"-O flex_bg -G $NEWSIZE }
+		eval opts='${val}'
+	fi
+
+	echo "params: $opts"
+
+	add ost1 $opts || error "add ost1 failed with new params"
+
+	local FOUNDSIZE=$(do_facet ost1 "$DEBUGFS -c -R stats $(ostdevname 1)" |
+		awk '/Flex block group size: / { print $NF; exit; }')
+
+	[[ $FOUNDSIZE == $NEWSIZE ]] ||
+		error "Flex block group size: $FOUNDSIZE, expected: $NEWSIZE"
+	return 0
+}
+run_test 86 "Replacing mkfs.lustre -G option"
+
+test_87() { #LU-6544
+	[[ $(lustre_version_code $SINGLEMDS1) -ge $(version_code 2.7.56) ]] ||
+		{ skip "Need MDS version at least 2.7.56" && return; }
+	[[ $(facet_fstype $SINGLEMDS) != ldiskfs ]] &&
+		{ skip "Only applicable to ldiskfs-based MDTs" && return; }
+	[[ $OSTCOUNT -gt 69 ]] &&
+		{ skip "Ignore wide striping situation" && return; }
+
+	local mdsdev=$(mdsdevname 1)
+	local mdsvdev=$(mdsvdevname 1)
+	local file=$DIR/$tfile
+	local mntpt=$(facet_mntpt $SINGLEMDS)
+	local used_xattr_blk=0
+	local inode_size=${1:-512}
+	local left_size=0
+	local xtest="trusted.test"
+	local value
+	local orig
+	local i
+
+	#Please see LU-6544 for MDT inode size calculation
+	if [ $OSTCOUNT -gt 26 ]; then
+		inode_size=2048
+	elif [ $OSTCOUNT -gt 5 ]; then
+		inode_size=1024
+	fi
+	left_size=$(expr $inode_size - \
+			156 - \
+			32 - \
+			32 - $OSTCOUNT \* 24 - 16 - 3 -  \
+			24 - 16 - 3 - \
+			24 - 18 - $(expr length $tfile) - 16 - 4)
+	if [ $left_size -le 0 ]; then
+		echo "No space($left_size) is expected in inode."
+		echo "Try 1-byte xattr instead to verify this."
+		left_size=1
+	else
+		echo "Estimate: at most $left_size-byte space left in inode."
+	fi
+
+	unload_modules
+	reformat
+
+	add mds1 $(mkfs_opts mds1 ${mdsdev}) --stripe-count-hint=$OSTCOUNT \
+		--reformat $mdsdev $mdsvdev || error "add mds1 failed"
+	start_mdt 1 > /dev/null || error "start mdt1 failed"
+	for i in $(seq $OSTCOUNT); do
+		start ost$i $(ostdevname $i) $OST_MOUNT_OPTS > /dev/null ||
+			error "start ost$i failed"
+	done
+	mount_client $MOUNT > /dev/null || error "mount client $MOUNT failed"
+	check_mount || error "check client $MOUNT failed"
+
+	#set xattr
+	$SETSTRIPE -c -1 $file || error "$SETSTRIPE -c -1 $file failed"
+	$GETSTRIPE $file || error "$GETSTRIPE $file failed"
+	i=$($GETSTRIPE -c $file)
+	if [ $i -ne $OSTCOUNT ]; then
+		left_size=$(expr $left_size + $(expr $OSTCOUNT - $i) \* 24)
+		echo -n "Since only $i out $OSTCOUNT OSTs are used, "
+		echo -n "the expected left space is changed to "
+		echo "$left_size bytes at most."
+	fi
+	value=$(generate_string $left_size)
+	setfattr -n $xtest -v $value $file
+	orig=$(get_xattr_value $xtest $file)
+	[[ "$orig" != "$value" ]] && error "$xtest changed"
+
+	#Verify if inode has some expected space left
+	umount $MOUNT > /dev/null || error "umount $MOUNT failed"
+	stop_mdt 1 > /dev/null || error "stop mdt1 failed"
+	mount_ldiskfs $SINGLEMDS || error "mount -t ldiskfs $SINGLEMDS failed"
+
+	do_facet $SINGLEMDS ls -sal $mntpt/ROOT/$tfile
+	used_xattr_blk=$(do_facet $SINGLEMDS ls -s $mntpt/ROOT/$tfile |
+			awk '{ print $1 }')
+	[[ $used_xattr_blk -eq 0 ]] &&
+		error "Please check MDS inode size calculation: \
+		       more than $left_size-byte space left in inode."
+	echo "Verified: at most $left_size-byte space left in inode."
+
+	stopall
+}
+run_test 87 "check if MDT inode can hold EAs with N stripes properly"
+
+# $1 test directory
+# $2 (optional) value of max_mod_rpcs_in_flight to set
+check_max_mod_rpcs_in_flight() {
+	local dir="$1"
+	local mmr="$2"
+	local idx
+	local facet
+	local tmp
+	local i
+
+	idx=$(printf "%04x" $($LFS getdirstripe -i $dir))
+	facet="mds$((0x$idx + 1))"
+
+	if [ -z "$mmr" ]; then
+		# get value of max_mod_rcps_in_flight
+		mmr=$($LCTL get_param -n \
+			mdc.$FSNAME-MDT$idx-mdc-*.max_mod_rpcs_in_flight) ||
+			error "Unable to get max_mod_rpcs_in_flight"
+		echo "max_mod_rcps_in_flight is $mmr"
+	else
+		# set value of max_mod_rpcs_in_flight
+		$LCTL set_param \
+		    mdc.$FSNAME-MDT$idx-mdc-*.max_mod_rpcs_in_flight=$mmr ||
+			error "Unable to set max_mod_rpcs_in_flight to $mmr"
+		echo "max_mod_rpcs_in_flight set to $mmr"
+	fi
+
+	# create mmr+1 files
+	echo "creating $((mmr + 1)) files ..."
+	umask 0022
+	for i in $(seq $((mmr + 1))); do
+		touch $dir/file-$i
+	done
+
+	### part 1 ###
+
+	# consumes mmr-1 modify RPC slots
+	#define OBD_FAIL_MDS_REINT_MULTI_NET     0x159
+	# drop requests on MDT so that RPC slots are consumed
+	# during all the request resend interval
+	do_facet $facet "$LCTL set_param fail_loc=0x159"
+	echo "launch $((mmr - 1)) chmod in parallel ..."
+	for i in $(seq $((mmr - 1))); do
+		chmod 0600 $dir/file-$i &
+	done
+
+	# send one additional modify RPC
+	do_facet $facet "$LCTL set_param fail_loc=0"
+	echo "launch 1 additional chmod in parallel ..."
+	chmod 0600 $dir/file-$mmr &
+	sleep 1
+
+	# check this additional modify RPC get a modify RPC slot
+	# and succeed its operation
+	checkstat -vp 0600 $dir/file-$mmr ||
+		error "Unable to send $mmr modify RPCs in parallel"
+	wait
+
+	### part 2 ###
+
+	# consumes mmr modify RPC slots
+	#define OBD_FAIL_MDS_REINT_MULTI_NET     0x159
+	# drop requests on MDT so that RPC slots are consumed
+	# during all the request resend interval
+	do_facet $facet "$LCTL set_param fail_loc=0x159"
+	echo "launch $mmr chmod in parallel ..."
+	for i in $(seq $mmr); do
+		chmod 0666 $dir/file-$i &
+	done
+
+	# send one additional modify RPC
+	do_facet $facet "$LCTL set_param fail_loc=0"
+	echo "launch 1 additional chmod in parallel ..."
+	chmod 0666 $dir/file-$((mmr + 1)) &
+	sleep 1
+
+	# check this additional modify RPC blocked getting a modify RPC slot
+	checkstat -vp 0644 $dir/file-$((mmr + 1)) ||
+		error "Unexpectedly send $mmr modify RPCs in parallel"
+	wait
+}
+
+test_90a() {
+	reformat
+	if ! combined_mgs_mds ; then
+		start_mgs
+	fi
+	setup
+
+	[[ $($LCTL get_param mdc.*.import |
+	     grep "connect_flags:.*multi_mod_rpc") ]] ||
+		{ skip "Need MDC with 'multi_mod_rpcs' feature"; return 0; }
+
+	# check default value
+	$LFS mkdir -c1 $DIR/$tdir || error "mkdir $DIR/$tdir failed"
+	check_max_mod_rpcs_in_flight $DIR/$tdir
+
+	cleanup
+}
+run_test 90a "check max_mod_rpcs_in_flight is enforced"
+
+test_90b() {
+	local idx
+	local facet
+	local tmp
+	local mmrpc
+
+	setup
+
+	[[ $($LCTL get_param mdc.*.import |
+	     grep "connect_flags:.*multi_mod_rpc") ]] ||
+		{ skip "Need MDC with 'multi_mod_rpcs' feature"; return 0; }
+
+	### test 1.
+	# update max_mod_rpcs_in_flight
+	$LFS mkdir -c1 $DIR/${tdir}1 || error "mkdir $DIR/${tdir}1 failed"
+	check_max_mod_rpcs_in_flight $DIR/${tdir}1 1
+
+	### test 2.
+	# check client is able to send multiple modify RPCs in paralell
+	tmp=$($LCTL get_param -n mdc.$FSNAME-MDT*-mdc-*.import |
+		grep -c "multi_mod_rpcs")
+	if [ "$tmp" -ne $MDSCOUNT ]; then
+		echo "Client not able to send multiple modify RPCs in parallel"
+		cleanup
+		return
+	fi
+
+	# update max_mod_rpcs_in_flight
+	$LFS mkdir -c1 $DIR/${tdir}2 || error "mkdir $DIR/${tdir}2 failed"
+	check_max_mod_rpcs_in_flight $DIR/${tdir}2 5
+
+	### test 3.
+	$LFS mkdir -c1 $DIR/${tdir}3 || error "mkdir $DIR/${tdir}3 failed"
+	idx=$(printf "%04x" $($LFS getdirstripe -i $DIR/${tdir}3))
+	facet="mds$((0x$idx + 1))"
+
+	# save MDT max_mod_rpcs_per_client
+	mmrpc=$(do_facet $facet \
+		    cat /sys/module/mdt/parameters/max_mod_rpcs_per_client)
+
+	# update max_mod_rpcs_in_flight
+	umount_client $MOUNT
+	do_facet $facet \
+		"echo 16 > /sys/module/mdt/parameters/max_mod_rpcs_per_client"
+	mount_client $MOUNT
+	$LCTL set_param mdc.$FSNAME-MDT$idx-mdc-*.max_rpcs_in_flight=17
+	check_max_mod_rpcs_in_flight $DIR/${tdir}3 16
+
+	# restore MDT max_mod_rpcs_per_client initial value
+	do_facet $facet \
+		"echo $mmrpc > /sys/module/mdt/parameters/max_mod_rpcs_per_client"
+
+	rm -rf $DIR/${tdir}?
+	cleanup
+}
+run_test 90b "check max_mod_rpcs_in_flight is enforced after update"
+
+test_90c() {
+	local tmp
+	local mrif
+	local mmrpc
+
+	setup
+
+	[[ $($LCTL get_param mdc.*.import |
+	     grep "connect_flags:.*multi_mod_rpc") ]] ||
+		{ skip "Need MDC with 'multi_mod_rpcs' feature"; return 0; }
+
+	# check client is able to send multiple modify RPCs in paralell
+	tmp=$($LCTL get_param -n mdc.$FSNAME-MDT*-mdc-*.import |
+		grep -c "multi_mod_rpcs")
+	if [ "$tmp" -ne $MDSCOUNT ]; then
+		skip "Client not able to send multiple modify RPCs in parallel"
+		cleanup
+		return
+	fi
+
+	# get max_rpcs_in_flight value
+	mrif=$($LCTL get_param -n mdc.$FSNAME-MDT0000-mdc-*.max_rpcs_in_flight)
+	echo "max_rpcs_in_flight is $mrif"
+
+	# get MDT max_mod_rpcs_per_client
+	mmrpc=$(do_facet mds1 \
+		    cat /sys/module/mdt/parameters/max_mod_rpcs_per_client)
+	echo "max_mod_rpcs_per_client is $mmrpc"
+
+	# testcase 1
+	# attempt to set max_mod_rpcs_in_flight to max_rpcs_in_flight value
+	# prerequisite: set max_mod_rpcs_per_client to max_rpcs_in_flight value
+	umount_client $MOUNT
+	do_facet mds1 \
+		"echo $mrif > /sys/module/mdt/parameters/max_mod_rpcs_per_client"
+	mount_client $MOUNT
+
+	$LCTL set_param \
+	    mdc.$FSNAME-MDT0000-mdc-*.max_mod_rpcs_in_flight=$mrif &&
+	    error "set max_mod_rpcs_in_flight to $mrif should fail"
+
+	umount_client $MOUNT
+	do_facet mds1 \
+		"echo $mmrpc > /sys/module/mdt/parameters/max_mod_rpcs_per_client"
+	mount_client $MOUNT
+
+	# testcase 2
+	# attempt to set max_mod_rpcs_in_flight to max_mod_rpcs_per_client+1
+	# prerequisite: set max_rpcs_in_flight to max_mod_rpcs_per_client+2
+	$LCTL set_param \
+	    mdc.$FSNAME-MDT0000-mdc-*.max_rpcs_in_flight=$((mmrpc + 2))
+
+	$LCTL set_param \
+	    mdc.$FSNAME-MDT0000-mdc-*.max_mod_rpcs_in_flight=$((mmrpc + 1)) &&
+	    error "set max_mod_rpcs_in_flight to $((mmrpc + 1)) should fail"
+
+	cleanup
+}
+run_test 90c "check max_mod_rpcs_in_flight update limits"
+
+test_90d() {
+	local idx
+	local facet
+	local mmr
+	local i
+	local pid
+
+	setup
+
+	[[ $($LCTL get_param mdc.*.import |
+	     grep "connect_flags:.*multi_mod_rpc") ]] ||
+		{ skip "Need MDC with 'multi_mod_rpcs' feature"; return 0; }
+
+	$LFS mkdir -c1 $DIR/$tdir || error "mkdir $DIR/$tdir failed"
+	idx=$(printf "%04x" $($LFS getdirstripe -i $DIR/$tdir))
+	facet="mds$((0x$idx + 1))"
+
+	# check client version supports multislots
+	tmp=$($LCTL get_param -N \
+		mdc.$FSNAME-MDT$idx-mdc-*.max_mod_rpcs_in_flight)
+	if [ -z "$tmp" ]; then
+		skip "Client does not support multiple modify RPCs in flight"
+		cleanup
+		return
+	fi
+
+	# get current value of max_mod_rcps_in_flight
+	mmr=$($LCTL get_param -n \
+		mdc.$FSNAME-MDT$idx-mdc-*.max_mod_rpcs_in_flight)
+	echo "max_mod_rcps_in_flight is $mmr"
+
+	# create mmr files
+	echo "creating $mmr files ..."
+	umask 0022
+	for i in $(seq $mmr); do
+		touch $DIR/$tdir/file-$i
+	done
+
+	# prepare for close RPC
+	multiop_bg_pause $DIR/$tdir/file-close O_c
+	pid=$!
+
+	# consumes mmr modify RPC slots
+	#define OBD_FAIL_MDS_REINT_MULTI_NET     0x159
+	# drop requests on MDT so that RPC slots are consumed
+	# during all the request resend interval
+	do_facet $facet "$LCTL set_param fail_loc=0x159"
+	echo "launch $mmr chmod in parallel ..."
+	for i in $(seq $mmr); do
+		chmod 0600 $DIR/$tdir/file-$i &
+	done
+
+	# send one additional close RPC
+	do_facet $facet "$LCTL set_param fail_loc=0"
+	echo "launch 1 additional close in parallel ..."
+	kill -USR1 $pid
+	cancel_lru_locks mdc
+	sleep 1
+
+	# check this additional close RPC get a modify RPC slot
+	# and multiop process completed
+	[ -d /proc/$pid ] &&
+		error "Unable to send the additional close RPC in parallel"
+	wait
+	rm -rf $DIR/$tdir
+	cleanup
+}
+run_test 90d "check one close RPC is allowed above max_mod_rpcs_in_flight"
+
 if ! combined_mgs_mds ; then
 	stop mgs
 fi