X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=251b9775a5bbbee478341e176621561b24dea65c;hp=49d0aa18d7507873e6567227cf219b3ecccb79c1;hb=e789a35352c78efca8c6ce0d7a4d0a84429072ce;hpb=dee5f24114531ec34fc56ce2826ada9e5690aabc

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 49d0aa1..251b977 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -9,10 +9,29 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 
-# bug number for skipped test:
-ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT"
+# bug number for skipped test:     LU-2828
+ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT 59 64"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
+is_sles11()						# LU-2181
+{
+	if [ -r /etc/SuSE-release ]
+	then
+		local vers=`grep VERSION /etc/SuSE-release | awk '{print $3}'`
+		local patchlev=`grep PATCHLEVEL /etc/SuSE-release \
+			| awk '{print $3}'`
+		if [ $vers -eq 11 ] && [ $patchlev -eq 2 ]
+		then
+			return 0
+		fi
+	fi
+	return 1
+}
+
+if is_sles11; then					# LU-2181
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 23a 34b"
+fi
+
 if [ "$FAILURE_MODE" = "HARD" ]; then
 	CONFIG_EXCEPTIONS="24a " && \
 	echo "Except the tests: $CONFIG_EXCEPTIONS for FAILURE_MODE=$FAILURE_MODE, bug 23573" && \
@@ -30,6 +49,7 @@ PTLDEBUG=${PTLDEBUG:--1}
 SAVE_PWD=$PWD
 LUSTRE=${LUSTRE:-`dirname $0`/..}
 RLUSTRE=${RLUSTRE:-$LUSTRE}
+LUSTRE_TESTS_API_DIR=${LUSTRE_TESTS_API_DIR:-${LUSTRE}/tests/clientapi}
 export MULTIOP=${MULTIOP:-multiop}
 
 . $LUSTRE/tests/test-framework.sh
@@ -56,6 +76,10 @@ if [[ "$LDISKFS_MKFS_OPTS" != *lazy_itable_init* ]]; then
 	LDISKFS_MKFS_OPTS=$(csa_add "$LDISKFS_MKFS_OPTS" -E lazy_itable_init)
 fi
 
+[ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
+# bug number for skipped test:        LU-2778 LU-2059
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 57b     50h"
+
 init_logging
 
 #
@@ -67,31 +91,6 @@ require_dsh_ost || exit 0
 
 assert_DIR
 
-reformat() {
-        formatall
-}
-
-writeconf1() {
-	local facet=$1
-	local dev=$2
-
-	stop ${facet} -f
-	rm -f ${facet}active
-	# who knows if/where $TUNEFS is installed?  Better reformat if it fails...
-	do_facet ${facet} "$TUNEFS --quiet --writeconf $dev" ||
-		{ echo "tunefs failed, reformatting instead" && reformat_and_config && return 1; }
-	return 0
-}
-
-writeconf() {
-	# we need ldiskfs
-	load_modules
-	# if writeconf fails anywhere, we reformat everything
-	writeconf1 mds `mdsdevname 1` || return 0
-	writeconf1 ost1 `ostdevname 1` || return 0
-	writeconf1 ost2 `ostdevname 2` || return 0
-}
-
 gen_config() {
 	# The MGS must be started before the OSTs for a new fs, so start
 	# and stop to generate the startup logs.
@@ -110,20 +109,54 @@ reformat_and_config() {
 	gen_config
 }
 
+writeconf_or_reformat() {
+	# There are at most 2 OSTs for write_conf test
+	# who knows if/where $TUNEFS is installed?
+	# Better reformat if it fails...
+	writeconf_all $MDSCOUNT 2 ||
+		{ echo "tunefs failed, reformatting instead" &&
+		  reformat_and_config && return 0; }
+	return 0
+}
+
+reformat() {
+        formatall
+}
+
 start_mgs () {
 	echo "start mgs"
 	start mgs $MGSDEV $MGS_MOUNT_OPTS
 }
 
-start_mds() {
-	local facet=$SINGLEMDS
-	# we can not use MDSDEV1 here because SINGLEMDS could be set not to mds1 only
-	local num=$(echo $facet | tr -d "mds")
+start_mdt() {
+	local num=$1
+	local facet=mds$num
 	local dev=$(mdsdevname $num)
+	shift 1
+
 	echo "start mds service on `facet_active_host $facet`"
 	start $facet ${dev} $MDS_MOUNT_OPTS $@ || return 94
 }
 
+stop_mdt() {
+	local num=$1
+	local facet=mds$num
+	local dev=$(mdsdevname $num)
+	shift 1
+
+	echo "stop mds service on `facet_active_host $facet`"
+	# These tests all use non-failover stop
+	stop $facet -f  || return 97
+}
+
+start_mds() {
+	local num
+
+	for num in $(seq $MDSCOUNT); do
+		start_mdt $num $@ || return 94
+	done
+}
+
 start_mgsmds() {
 	if ! combined_mgs_mds ; then
 		start_mgs
@@ -132,9 +165,10 @@ start_mgsmds() {
 }
 
 stop_mds() {
-	echo "stop mds service on `facet_active_host $SINGLEMDS`"
-	# These tests all use non-failover stop
-	stop $SINGLEMDS -f  || return 97
+	local num
+	for num in $(seq $MDSCOUNT); do
+		stop_mdt $num || return 97
+	done
 }
 
 stop_mgs() {
@@ -281,9 +315,9 @@ test_1() {
 run_test 1 "start up ost twice (should return errors)"
 
 test_2() {
-	start_mds
+	start_mdt 1
 	echo "start mds second time.."
-	start_mds && error "2nd MDT start should fail"
+	start_mdt 1 && error "2nd MDT start should fail"
 	start_ost
 	mount_client $MOUNT
 	check_mount || return 43
@@ -570,24 +604,25 @@ test_17() {
 		return
 	fi
 
-        setup
-        check_mount || return 41
-        cleanup || return $?
+	setup
+	check_mount || return 41
+	cleanup || return $?
 
-        echo "Remove mds config log"
-        if ! combined_mgs_mds ; then
-                stop mgs
-        fi
+	echo "Remove mds config log"
+	if ! combined_mgs_mds ; then
+		stop mgs
+	fi
 
-        do_facet mgs "$DEBUGFS -w -R 'unlink CONFIGS/$FSNAME-MDT0000' $MGSDEV || return \$?" || return $?
+	do_facet mgs "$DEBUGFS -w -R 'unlink CONFIGS/$FSNAME-MDT0000' \
+		$(mgsdevname) || return \$?" || return $?
 
-        if ! combined_mgs_mds ; then
-                start_mgs
-        fi
+	if ! combined_mgs_mds ; then
+		start_mgs
+	fi
 
-        start_ost
-        start_mds && return 42
-        reformat_and_config
+	start_ost
+	start_mds && return 42
+	reformat_and_config
 }
 run_test 17 "Verify failed mds_postsetup won't fail assertion (2936) (should return errs)"
 
@@ -612,8 +647,14 @@ test_18() {
                 log "use STORED_MDSSIZE=$STORED_MDSSIZE"
 
         # check if the block device is large enough
-        [ -z "$OK" ] && $(is_blkdev $SINGLEMDS $MDSDEV $MIN) && OK=1 &&
-                myMDSSIZE=$MIN && log "use device $MDSDEV with MIN=$MIN"
+	is_blkdev $SINGLEMDS $MDSDEV $MIN
+	local large_enough=$?
+	if [ -n "$OK" ]; then
+		[ $large_enough -ne 0 ] && OK=""
+	else
+		[ $large_enough -eq 0 ] && OK=1 && myMDSSIZE=$MIN &&
+			log "use device $MDSDEV with MIN=$MIN"
+	fi
 
         # check if a loopback device has enough space for fs metadata (5%)
 
@@ -719,7 +760,7 @@ test_21c() {
 	stop_ost2
 	stop_mds
 	#writeconf to remove all ost2 traces for subsequent tests
-	writeconf
+	writeconf_or_reformat
 }
 run_test 21c "start mds between two osts, stop mds last"
 
@@ -742,7 +783,7 @@ test_21d() {
         stop_mds
         stop_mgs
         #writeconf to remove all ost2 traces for subsequent tests
-        writeconf
+	writeconf_or_reformat
         start_mgs
 }
 run_test 21d "start mgs then ost and then mds"
@@ -753,7 +794,7 @@ test_22() {
 	echo Client mount with ost in logs, but none running
 	start_ost
 	# wait until mds connected to ost and open client connection
-        wait_osc_import_state mds ost FULL
+	wait_osc_import_state mds ost FULL
 	stop_ost
 	mount_client $MOUNT
 	# check_mount will block trying to contact ost
@@ -773,8 +814,8 @@ test_22() {
 		sleep $((TIMEOUT + TIMEOUT + TIMEOUT))
 	fi
 	mount_client $MOUNT
-        wait_osc_import_state mds ost FULL
-        wait_osc_import_state client ost FULL
+	wait_osc_import_state mds ost FULL
+	wait_osc_import_state client ost FULL
 	check_mount || return 41
 	pass
 
@@ -830,8 +871,8 @@ test_23a() {	# was test_23
 		"MOUNT_LUSTRE_PID $MOUNT_LUSTRE_PID still not killed in $WAIT secs"
 		ps -ef | grep mount
 	fi
-	stop_mds || error
-	stop_ost || error
+	stop_mds || error "stopping MDSes failed"
+	stop_ost || error "stopping OSSes failed"
 }
 run_test 23a "interrupt client during recovery mount delay"
 
@@ -882,11 +923,12 @@ test_24a() {
 
 	# test 8-char fsname as well
 	local FSNAME2=test1234
-	add fs2mds $(mkfs_opts mds1) --nomgs --mgsnode=$MGSNID \
+
+	add fs2mds $(mkfs_opts mds1 ${fs2mdsdev} ) --nomgs --mgsnode=$MGSNID \
 		--fsname=${FSNAME2} --reformat $fs2mdsdev $fs2mdsvdev || exit 10
 
-	add fs2ost $(mkfs_opts ost1) --fsname=${FSNAME2} --reformat \
-		$fs2ostdev $fs2ostvdev || exit 10
+	add fs2ost $(mkfs_opts ost1 ${fs2ostdev}) --fsname=${FSNAME2} \
+		--reformat $fs2ostdev $fs2ostvdev || exit 10
 
 	setup
 	start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS && trap cleanup_24a EXIT INT
@@ -932,8 +974,8 @@ test_24b() {
 	local fs2mdsdev=$(mdsdevname 1_2)
 	local fs2mdsvdev=$(mdsvdevname 1_2)
 
-	add fs2mds $(mkfs_opts mds1) --mgs --fsname=${FSNAME}2 --reformat \
-		$fs2mdsdev $fs2mdsvdev || exit 10
+	add fs2mds $(mkfs_opts mds1 ${fs2mdsdev} ) --mgs --fsname=${FSNAME}2 \
+		--reformat $fs2mdsdev $fs2mdsvdev || exit 10
 	setup
 	start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS && return 2
 	cleanup || return 6
@@ -983,8 +1025,9 @@ run_test 27a "Reacquire MGS lock if OST started first"
 
 test_27b() {
 	# FIXME. ~grev
-        setup
-        local device=$(do_facet $SINGLEMDS "lctl get_param -n devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }')
+	setup
+	local device=$(do_facet $SINGLEMDS "lctl get_param -n devices" |
+			awk '($3 ~ "mdt" && $4 ~ "MDT0000") { print $4 }')
 
 	facet_failover $SINGLEMDS
 	set_conf_param_and_check $SINGLEMDS				\
@@ -1044,28 +1087,30 @@ test_29() {
 	    echo "Live client success: got $RESULT"
 	fi
 
-	# check MDT too
-	local mdtosc=$(get_mdtosc_proc_path $SINGLEMDS $FSNAME-OST0001)
-	mdtosc=${mdtosc/-MDT*/-MDT\*}
-	local MPROC="osc.$mdtosc.active"
-	local MAX=30
-	local WAIT=0
-	while [ 1 ]; do
-	    sleep 5
-	    RESULT=`do_facet $SINGLEMDS " lctl get_param -n $MPROC"`
-	    [ ${PIPESTATUS[0]} = 0 ] || error "Can't read $MPROC"
-	    if [ $RESULT -eq $DEAC ]; then
-		echo "MDT deactivated also after $WAIT sec (got $RESULT)"
-		break
-	    fi
-	    WAIT=$((WAIT + 5))
-	    if [ $WAIT -eq $MAX ]; then
-		echo "MDT not deactivated: wanted $DEAC got $RESULT"
-		return 4
-	    fi
-	    echo "Waiting $(($MAX - $WAIT)) secs for MDT deactivated"
+	# check MDTs too
+	for num in $(seq $MDSCOUNT); do
+		local mdtosc=$(get_mdtosc_proc_path mds${num} $FSNAME-OST0001)
+		local MPROC="osc.$mdtosc.active"
+		local MAX=30
+		local WAIT=0
+		while [ 1 ]; do
+			sleep 5
+			RESULT=$(do_facet mds${num} " lctl get_param -n $MPROC")
+			[ ${PIPESTATUS[0]} = 0 ] || error "Can't read $MPROC"
+			if [ $RESULT -eq $DEAC ]; then
+				echo -n "MDT deactivated also after"
+				echo "$WAIT sec (got $RESULT)"
+				break
+			fi
+			WAIT=$((WAIT + 5))
+			if [ $WAIT -eq $MAX ]; then
+				echo -n "MDT not deactivated: wanted $DEAC"
+				echo  "got $RESULT"
+				return 4
+			fi
+			echo "Waiting $(($MAX - $WAIT))secs for MDT deactivated"
+		done
 	done
-
         # test new client starts deactivated
 	umount_client $MOUNT || return 200
 	mount_client $MOUNT
@@ -1085,7 +1130,7 @@ test_29() {
 	stop_ost2
 	cleanup_nocli
 	#writeconf to remove all ost2 traces for subsequent tests
-	writeconf
+	writeconf_or_reformat
 }
 run_test 29 "permanently remove an OST"
 
@@ -1161,6 +1206,11 @@ test_31() { # bug 10734
 }
 run_test 31 "Connect to non-existent node (shouldn't crash)"
 
+
+T32_QID=60000
+T32_BLIMIT=20480 # Kbytes
+T32_ILIMIT=2
+
 #
 # This is not really a test but a tool to create new disk
 # image tarballs for the upgrade tests.
@@ -1191,10 +1241,19 @@ test_32newtarball() {
 
 	mkdir $tmp/src
 	tar cf - -C $src . | tar xf - -C $tmp/src
+	dd if=/dev/zero of=$tmp/src/t32_qf_old bs=1M \
+		count=$(($T32_BLIMIT / 1024 / 2))
+	chown $T32_QID.$T32_QID $tmp/src/t32_qf_old
 
 	formatall
 
 	setupall
+
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.50) ] &&
+		$LFS quotacheck -ug /mnt/$FSNAME
+	$LFS setquota -u $T32_QID -b 0 -B $T32_BLIMIT -i 0 -I $T32_ILIMIT \
+		/mnt/$FSNAME
+
 	tar cf - -C $tmp/src . | tar xf - -C /mnt/$FSNAME
 	stopall
 
@@ -1208,6 +1267,19 @@ test_32newtarball() {
 	popd
 	$LCTL get_param -n version | head -n 1 |
 		sed -e 's/^lustre: *//' >$tmp/img/commit
+
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.50) ] &&
+		$LFS quotaon -ug /mnt/$FSNAME
+	$LFS quota -u $T32_QID -v /mnt/$FSNAME
+	$LFS quota -v -u $T32_QID /mnt/$FSNAME |
+		awk 'BEGIN { num='1' } { if ($1 == "'/mnt/$FSNAME'") \
+		{ if (NF == 1) { getline } else { num++ } ; print $num;} }' \
+		| tr -d "*" > $tmp/img/bspace
+	$LFS quota -v -u $T32_QID /mnt/$FSNAME |
+		awk 'BEGIN { num='5' } { if ($1 == "'/mnt/$FSNAME'") \
+		{ if (NF == 1) { getline } else { num++ } ; print $num;} }' \
+		| tr -d "*" > $tmp/img/ispace
+
 	stopall
 
 	pushd $tmp/src
@@ -1228,7 +1300,7 @@ test_32newtarball() {
 			  sed -e 's/\./_/g')	# E.g., "1.8.7" -> "1_8"
 	dst=$(cd $dst; pwd)
 	pushd $tmp/img
-	tar cjvf $dst/disk$version-$FSTYPE.tar.bz2 -S *
+	tar cjvf $dst/disk$version-$(facet_fstype $SINGLEMDS).tar.bz2 -S *
 	popd
 
 	rm -r $tmp
@@ -1253,9 +1325,8 @@ t32_check() {
 		exit 0
 	fi
 
-	local IMGTYPE=$FSTYPE
+	local IMGTYPE=$(facet_fstype $SINGLEMDS)
 
-	[ ! -z "$MDSFSTYPE" ] && IMGTYPE=$MDSFSTYPE
 	tarballs=$($r find $RLUSTRE/tests -maxdepth 1 -name \'disk*-$IMGTYPE.tar.bz2\')
 
 	if [ -z "$tarballs" ]; then
@@ -1265,8 +1336,6 @@ t32_check() {
 }
 
 t32_test_cleanup() {
-	local node=$(facet_active_host $SINGLEMDS)
-	local r="do_node $node"
 	local tmp=$TMP/t32
 	local rc=$?
 
@@ -1276,11 +1345,15 @@ t32_test_cleanup() {
 	if $shall_cleanup_mdt; then
 		$r umount -d $tmp/mnt/mdt || rc=$?
 	fi
+	if $shall_cleanup_mdt1; then
+		$r umount -d $tmp/mnt/mdt1 || rc=$?
+	fi
 	if $shall_cleanup_ost; then
 		$r umount -d $tmp/mnt/ost || rc=$?
 	fi
-	$r rm -rf $tmp || rc=$?
-	rm -rf $tmp || rc=$?
+
+	$r rm -rf $tmp
+	rm -rf $tmp
 	return $rc
 }
 
@@ -1303,10 +1376,11 @@ t32_reload_modules() {
 
 	while ((i < 20)); do
 		echo "Unloading modules on $node: Attempt $i"
-		do_rpc_nodes $node $LUSTRE_RMMOD $FSTYPE && all_removed=true
+		do_rpc_nodes $node $LUSTRE_RMMOD $(facet_fstype $SINGLEMDS) &&
+			all_removed=true
 		do_rpc_nodes $node check_mem_leak || return 1
 		if $all_removed; then
-			load_modules
+			do_rpc_nodes $node load_modules
 			return 0
 		fi
 		sleep 5
@@ -1324,8 +1398,7 @@ t32_wait_til_devices_gone() {
 	echo wait for devices to go
 	while ((i < 20)); do
 		devices=$(do_rpc_nodes $node $LCTL device_list | wc -l)
-		echo $device
-		((devices == 0)) && return 1
+		((devices == 0)) && return 0
 		sleep 5
 		i=$((i + 1))
 	done
@@ -1333,18 +1406,104 @@ t32_wait_til_devices_gone() {
 	return 1
 }
 
+t32_verify_quota() {
+	local node=$1
+	local fsname=$2
+	local mnt=$3
+	local fstype=$(facet_fstype $SINGLEMDS)
+	local qval
+	local cmd
+
+	$LFS quota -u $T32_QID -v $mnt
+
+	qval=$($LFS quota -v -u $T32_QID $mnt |
+		awk 'BEGIN { num='1' } { if ($1 == "'$mnt'") \
+		{ if (NF == 1) { getline } else { num++ } ; print $num;} }' \
+		| tr -d "*")
+	[ $qval -eq $img_bspace ] || {
+		echo "bspace, act:$qval, exp:$img_bspace"
+		return 1
+	}
+
+	qval=$($LFS quota -v -u $T32_QID $mnt |
+		awk 'BEGIN { num='5' } { if ($1 == "'$mnt'") \
+		{ if (NF == 1) { getline } else { num++ } ; print $num;} }' \
+		| tr -d "*")
+	[ $qval -eq $img_ispace ] || {
+		echo "ispace, act:$qval, exp:$img_ispace"
+		return 1
+	}
+
+	qval=$($LFS quota -v -u $T32_QID $mnt |
+		awk 'BEGIN { num='3' } { if ($1 == "'$mnt'") \
+		{ if (NF == 1) { getline } else { num++ } ; print $num;} }' \
+		| tr -d "*")
+	[ $qval -eq $T32_BLIMIT ] || {
+		echo "blimit, act:$qval, exp:$T32_BLIMIT"
+		return 1
+	}
+
+	qval=$($LFS quota -v -u $T32_QID $mnt |
+		awk 'BEGIN { num='7' } { if ($1 == "'$mnt'") \
+		{ if (NF == 1) { getline } else { num++ } ; print $num;} }' \
+		| tr -d "*")
+	[ $qval -eq $T32_ILIMIT ] || {
+		echo "ilimit, act:$qval, exp:$T32_ILIMIT"
+		return 1
+	}
+
+	do_node $node $LCTL conf_param $fsname.quota.mdt=ug
+	cmd="$LCTL get_param -n osd-$fstype.$fsname-MDT0000"
+	cmd=$cmd.quota_slave.enabled
+	wait_update $node "$cmd" "ug" || {
+		echo "Enable mdt quota failed"
+		return 1
+	}
+
+	do_node $node $LCTL conf_param $fsname.quota.ost=ug
+	cmd="$LCTL get_param -n osd-$fstype.$fsname-OST0000"
+	cmd=$cmd.quota_slave.enabled
+	wait_update $node "$cmd" "ug" || {
+		echo "Enable ost quota failed"
+		return 1
+	}
+
+	chmod 0777 $mnt
+	runas -u $T32_QID -g $T32_QID dd if=/dev/zero of=$mnt/t32_qf_new \
+		bs=1M count=$(($T32_BLIMIT / 1024)) oflag=sync && {
+		echo "Write succeed, but expect -EDQUOT"
+		return 1
+	}
+	rm -f $mnt/t32_qf_new
+
+	runas -u $T32_QID -g $T32_QID createmany -m $mnt/t32_qf_ \
+		$T32_ILIMIT && {
+		echo "Create succeed, but expect -EDQUOT"
+		return 1
+	}
+	unlinkmany $mnt/t32_qf_ $T32_ILIMIT
+
+	return 0
+}
+
 t32_test() {
 	local tarball=$1
 	local writeconf=$2
+	local dne_upgrade=${dne_upgrade:-"no"}
+	local ff_convert=${ff_convert:-"no"}
 	local shall_cleanup_mdt=false
+	local shall_cleanup_mdt1=false
 	local shall_cleanup_ost=false
 	local shall_cleanup_lustre=false
 	local node=$(facet_active_host $SINGLEMDS)
 	local r="do_node $node"
+	local node2=$(facet_active_host mds2)
 	local tmp=$TMP/t32
 	local img_commit
 	local img_kernel
 	local img_arch
+	local img_bspace
+	local img_ispace
 	local fsname=t32fs
 	local nid=$($r $LCTL list_nids | head -1)
 	local mopts
@@ -1352,6 +1511,7 @@ t32_test() {
 	local nrpcs_orig
 	local nrpcs
 	local list
+	local fstype=$(facet_fstype $SINGLEMDS)
 
 	trap 'trap - RETURN; t32_test_cleanup' RETURN
 
@@ -1364,11 +1524,16 @@ t32_test() {
 	img_commit=$($r cat $tmp/commit)
 	img_kernel=$($r cat $tmp/kernel)
 	img_arch=$($r cat $tmp/arch)
+	img_bspace=$($r cat $tmp/bspace)
+	img_ispace=$($r cat $tmp/ispace)
 	echo "Upgrading from $(basename $tarball), created with:"
 	echo "  Commit: $img_commit"
 	echo "  Kernel: $img_kernel"
 	echo "    Arch: $img_arch"
 
+	local version=$(version_code $img_commit)
+	[[ $version -gt $(version_code 2.4.0) ]] && ff_convert="no"
+
 	$r $LCTL set_param debug="$PTLDEBUG"
 
 	$r $TUNEFS --dryrun $tmp/mdt || {
@@ -1377,7 +1542,27 @@ t32_test() {
 	}
 	if [ "$writeconf" ]; then
 		mopts=loop,writeconf
+		if [ $fstype == "ldiskfs" ]; then
+			$r $TUNEFS --quota $tmp/mdt || {
+				error_noexit "Enable mdt quota feature"
+				return 1
+			}
+		fi
 	else
+		if [ -n "$($LCTL list_nids | grep -v '\(tcp\|lo\)[[:digit:]]*$')" ]; then
+			[[ $(lustre_version_code mgs) -ge $(version_code 2.3.59) ]] ||
+			{ skip "LU-2200: Cannot run over Inifiniband w/o lctl replace_nids "
+				"(Need MGS version at least 2.3.59)"; return 0; }
+
+			local osthost=$(facet_active_host ost1)
+			local ostnid=$(do_node $osthost $LCTL list_nids | head -1)
+
+			$r mount -t lustre -o loop,nosvc $tmp/mdt $tmp/mnt/mdt
+			$r lctl replace_nids $fsname-OST0000 $ostnid
+			$r lctl replace_nids $fsname-MDT0000 $nid
+			$r umount $tmp/mnt/mdt
+		fi
+
 		mopts=loop,exclude=$fsname-OST0000
 	fi
 
@@ -1389,6 +1574,35 @@ t32_test() {
 	}
 	shall_cleanup_mdt=true
 
+	if [ "$dne_upgrade" != "no" ]; then
+		local fs2mdsdev=$(mdsdevname 1_2)
+		local fs2mdsvdev=$(mdsvdevname 1_2)
+
+		echo "mkfs new MDT on ${fs2mdsdev}...."
+		if [ $(facet_fstype mds1) == ldiskfs ]; then
+			mkfsoptions="--mkfsoptions=\\\"-J size=8\\\""
+		fi
+
+		add fs2mds $(mkfs_opts mds2 $fs2mdsdev $fsname) --reformat \
+			   $mkfsoptions $fs2mdsdev $fs2mdsvdev > /dev/null || {
+			error_noexit "Mkfs new MDT failed"
+			return 1
+		}
+
+		$r $TUNEFS --dryrun $fs2mdsdev || {
+			error_noexit "tunefs.lustre before mounting the MDT"
+			return 1
+		}
+
+		echo "mount new MDT....$fs2mdsdev"
+		$r mkdir -p $tmp/mnt/mdt1
+		$r mount -t lustre -o $mopts $fs2mdsdev $tmp/mnt/mdt1 || {
+			error_noexit "mount mdt1 failed"
+			return 1
+		}
+		shall_cleanup_mdt1=true
+	fi
+
 	uuid=$($r $LCTL get_param -n mdt.$fsname-MDT0000.uuid) || {
 		error_noexit "Getting MDT UUID"
 		return 1
@@ -1404,6 +1618,12 @@ t32_test() {
 	}
 	if [ "$writeconf" ]; then
 		mopts=loop,mgsnode=$nid,$writeconf
+		if [ $fstype == "ldiskfs" ]; then
+			$r $TUNEFS --quota $tmp/ost || {
+				error_noexit "Enable ost quota feature"
+				return 1
+			}
+		fi
 	else
 		mopts=loop,mgsnode=$nid
 	fi
@@ -1447,6 +1667,47 @@ t32_test() {
 		return 1
 	}
 
+	if [ "$ff_convert" != "no" -a $(facet_fstype ost1) == "ldiskfs" ]; then
+		$r $LCTL lfsck_start -M $fsname-OST0000 || {
+			error_noexit "Start OI scrub on OST0"
+			return 1
+		}
+
+		# The oi_scrub should be on ost1, but for test_32(),
+		# all on the SINGLEMDS.
+		wait_update_facet $SINGLEMDS "$LCTL get_param -n \
+			osd-ldiskfs.$fsname-OST0000.oi_scrub |
+			awk '/^status/ { print \\\$2 }'" "completed" 30 || {
+			error_noexit "Failed to get the expected 'completed'"
+			return 1
+		}
+
+		local UPDATED=$($r $LCTL get_param -n \
+				osd-ldiskfs.$fsname-OST0000.oi_scrub |
+				awk '/^updated/ { print $2 }')
+		[ $UPDATED -ge 1 ] || {
+			error_noexit "Only $UPDATED objects have been converted"
+			return 1
+		}
+	fi
+
+	if [ "$dne_upgrade" != "no" ]; then
+		$r $LCTL conf_param \
+				$fsname-MDT0001.mdc.max_rpcs_in_flight=9 || {
+			error_noexit "Setting MDT1 \"max_rpcs_in_flight\""
+			return 1
+		}
+		$r $LCTL conf_param $fsname-MDT0001.failover.node=$nid || {
+			error_noexit "Setting MDT1 \"failover.node\""
+			return 1
+		}
+		$r $LCTL conf_param $fsname-MDT0001.lov.stripesize=4M || {
+			error_noexit "Setting MDT1 \"lov.stripesize\""
+			return 1
+		}
+
+	fi
+
 	if [ "$writeconf" ]; then
 		mount -t lustre $nid:/$fsname $tmp/mnt/lustre || {
 			error_noexit "Mounting the client"
@@ -1455,9 +1716,45 @@ t32_test() {
 		shall_cleanup_lustre=true
 		$LCTL set_param debug="$PTLDEBUG"
 
-		if $r test -f $tmp/sha1sums; then
-			$r sort -k 2 $tmp/sha1sums >$tmp/sha1sums.orig
+		t32_verify_quota $node $fsname $tmp/mnt/lustre || {
+			error_noexit "verify quota failed"
+			return 1
+		}
+
+		if [ "$dne_upgrade" != "no" ]; then
+			$LFS mkdir -i 1 $tmp/mnt/lustre/remote_dir || {
+				error_noexit "set remote dir failed"
+				return 1
+			}
+
 			pushd $tmp/mnt/lustre
+			tar -cf - . --exclude=./remote_dir |
+				tar -xvf - -C remote_dir 1>/dev/null || {
+				error_noexit "cp to remote dir failed"
+				return 1
+			}
+			popd
+		fi
+
+		dd if=/dev/zero of=$tmp/mnt/lustre/tmp_file bs=10k count=10 || {
+			error_noexit "dd failed"
+			return 1
+		}
+		rm -rf $tmp/mnt/lustre/tmp_file || {
+			error_noexit "rm failed"
+			return 1
+		}
+
+		if $r test -f $tmp/sha1sums; then
+			# LU-2393 - do both sorts on same node to ensure locale
+			# is identical
+			$r cat $tmp/sha1sums | sort -k 2 >$tmp/sha1sums.orig
+			if [ "$dne_upgrade" != "no" ]; then
+				pushd $tmp/mnt/lustre/remote_dir
+			else
+				pushd $tmp/mnt/lustre
+			fi
+
 			find ! -name .lustre -type f -exec sha1sum {} \; |
 				sort -k 2 >$tmp/sha1sums || {
 				error_noexit "sha1sum"
@@ -1472,12 +1769,21 @@ t32_test() {
 			echo "sha1sum verification skipped"
 		fi
 
+		if [ "$dne_upgrade" != "no" ]; then
+			rm -rf $tmp/mnt/lustre/remote_dir || {
+				error_noexit "remove remote dir failed"
+				return 1
+			}
+		fi
+
 		if $r test -f $tmp/list; then
 			#
 			# There is not a Test Framework API to copy files to or
 			# from a remote node.
 			#
-			$r sort -k 6 $tmp/list >$tmp/list.orig
+			# LU-2393 - do both sorts on same node to ensure locale
+			# is identical
+			$r cat $tmp/list | sort -k 6 >$tmp/list.orig
 			pushd $tmp/mnt/lustre
 			ls -Rni --time-style=+%s | sort -k 6 >$tmp/list || {
 				error_noexit "ls"
@@ -1491,8 +1797,8 @@ t32_test() {
 			# on an architecture with different number of bits per
 			# "long".
 			#
-			if [ $(t32_bits_per_long $(uname -m)) !=						\
-				 $(t32_bits_per_long $img_arch) ]; then
+			if [ $(t32_bits_per_long $(uname -m)) != \
+				$(t32_bits_per_long $img_arch) ]; then
 				echo "Different number of bits per \"long\" from the disk image"
 				for list in list.orig list; do
 					sed -i -e 's/^[0-9]\+[ \t]\+//' $tmp/$list
@@ -1513,7 +1819,8 @@ t32_test() {
 		# regenerate every image for each test addition.
 		#
 
-		nrpcs_orig=$($LCTL get_param -n mdc.*.max_rpcs_in_flight) || {
+		nrpcs_orig=$($LCTL get_param \
+				-n mdc.*MDT0000*.max_rpcs_in_flight) || {
 			error_noexit "Getting \"max_rpcs_in_flight\""
 			return 1
 		}
@@ -1522,8 +1829,8 @@ t32_test() {
 			error_noexit "Changing \"max_rpcs_in_flight\""
 			return 1
 		}
-		wait_update $HOSTNAME "$LCTL get_param -n mdc.*.max_rpcs_in_flight"	\
-		            $nrpcs || {
+		wait_update $HOSTNAME "$LCTL get_param \
+			-n mdc.*MDT0000*.max_rpcs_in_flight" $nrpcs || {
 			error_noexit "Verifying \"max_rpcs_in_flight\""
 			return 1
 		}
@@ -1534,11 +1841,20 @@ t32_test() {
 		}
 		shall_cleanup_lustre=false
 	else
+		if [ "$dne_upgrade" != "no" ]; then
+			$r umount -d $tmp/mnt/mdt1 || {
+				error_noexit "Unmounting the MDT2"
+				return 1
+			}
+			shall_cleanup_mdt1=false
+		fi
+
 		$r umount -d $tmp/mnt/mdt || {
 			error_noexit "Unmounting the MDT"
 			return 1
 		}
 		shall_cleanup_mdt=false
+
 		$r umount -d $tmp/mnt/ost || {
 			error_noexit "Unmounting the OST"
 			return 1
@@ -1555,7 +1871,7 @@ t32_test() {
 			error_noexit "tunefs.lustre before remounting the MDT"
 			return 1
 		}
-		$r mount -t lustre -o loop,exclude=$fsname-OST0000 $tmp/mdt			\
+		$r mount -t lustre -o loop,exclude=$fsname-OST0000 $tmp/mdt \
 				 $tmp/mnt/mdt || {
 			error_noexit "Remounting the MDT"
 			return 1
@@ -1571,7 +1887,7 @@ test_32a() {
 
 	t32_check
 	for tarball in $tarballs; do
-		t32_test $tarball || rc=$?
+		t32_test $tarball || let "rc += $?"
 	done
 	return $rc
 }
@@ -1584,12 +1900,39 @@ test_32b() {
 
 	t32_check
 	for tarball in $tarballs; do
-		t32_test $tarball writeconf || rc=$?
+		t32_test $tarball writeconf || let "rc += $?"
 	done
 	return $rc
 }
 run_test 32b "Upgrade with writeconf"
 
+test_32c() {
+	local tarballs
+	local tarball
+	local rc=0
+
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	t32_check
+	for tarball in $tarballs; do
+		dne_upgrade=yes t32_test $tarball writeconf || rc=$?
+	done
+	return $rc
+}
+run_test 32c "dne upgrade test"
+
+test_32d() {
+	local tarballs
+	local tarball
+	local rc=0
+
+	t32_check
+	for tarball in $tarballs; do
+		ff_convert=yes t32_test $tarball || rc=$?
+	done
+	return $rc
+}
+run_test 32d "convert ff test"
+
 test_33a() { # bug 12333, was test_33
         local rc=0
         local FSNAME2=test-123
@@ -1614,10 +1957,11 @@ test_33a() { # bug 12333, was test_33
 		mkfsoptions="--mkfsoptions=\\\"-J size=8\\\"" # See bug 17931.
 	fi
 
-	add fs2mds $(mkfs_opts mds1) --fsname=${FSNAME2} --reformat \
-		$mkfsoptions $fs2mdsdev $fs2mdsvdev || exit 10
-	add fs2ost $(mkfs_opts ost1) --mgsnode=$MGSNID --fsname=${FSNAME2} \
-		--index=8191 --reformat $fs2ostdev $fs2ostvdev || exit 10
+	add fs2mds $(mkfs_opts mds1 ${fs2mdsdev}) --mgs --fsname=${FSNAME2} \
+		--reformat $mkfsoptions $fs2mdsdev $fs2mdsvdev || exit 10
+	add fs2ost $(mkfs_opts ost1 ${fs2ostdev}) --mgsnode=$MGSNID \
+		--fsname=${FSNAME2} --index=8191 --reformat $fs2ostdev \
+		$fs2ostvdev || exit 10
 
         start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS && trap cleanup_24a EXIT INT
         start fs2ost $fs2ostdev $OST_MOUNT_OPTS
@@ -1705,9 +2049,10 @@ test_35a() { # bug 12459
 
 	log "Set up a fake failnode for the MDS"
 	FAKENID="127.0.0.2"
-	local device=$(do_facet $SINGLEMDS "lctl get_param -n devices" | awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)
-	do_facet mgs "$LCTL conf_param ${device}.failover.node=" \
-		"$(h2$NETTYPE $FAKENID)" || return 4
+	local device=$(do_facet $SINGLEMDS "lctl get_param -n devices" |
+		awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)
+	do_facet mgs "$LCTL conf_param \
+		${device}.failover.node=$(h2$NETTYPE $FAKENID)" || return 4
 
 	log "Wait for RECONNECT_INTERVAL seconds (10s)"
 	sleep 10
@@ -1715,13 +2060,13 @@ test_35a() { # bug 12459
 	MSG="conf-sanity.sh test_35a `date +%F%kh%Mm%Ss`"
 	$LCTL clear
 	log "$MSG"
-	log "Stopping the MDT:"
-	stop_mds || return 5
+	log "Stopping the MDT: $device"
+	stop_mdt 1 || return 5
 
 	df $MOUNT > /dev/null 2>&1 &
 	DFPID=$!
-	log "Restarting the MDT:"
-	start_mds || return 6
+	log "Restarting the MDT: $device"
+	start_mdt 1 || return 6
 	log "Wait for df ($DFPID) ... "
 	wait $DFPID
 	log "done"
@@ -1743,7 +2088,7 @@ test_35a() { # bug 12459
 	[ "$NEXTCONN" != "0" ] && log "The client didn't try to reconnect to the last active server (tried ${NEXTCONN} instead)" && return 7
 	cleanup
 	# remove nid settings
-	writeconf
+	writeconf_or_reformat
 }
 run_test 35a "Reconnect to the last active server first"
 
@@ -1759,10 +2104,10 @@ test_35b() { # bug 18674
 
 	log "Set up a fake failnode for the MDS"
 	FAKENID="127.0.0.2"
-	local device=$(do_facet $SINGLEMDS "$LCTL get_param -n devices" | \
-			awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)
-	do_facet mgs "$LCTL conf_param ${device}.failover.node=" \
-		"$(h2$NETTYPE $FAKENID)" || return 1
+	local device=$(do_facet $SINGLEMDS "$LCTL get_param -n devices" |
+		awk '($3 ~ "mdt" && $4 ~ "MDT") { print $4 }' | head -1)
+	do_facet mgs "$LCTL conf_param \
+		${device}.failover.node=$(h2$NETTYPE $FAKENID)" || return 1
 
 	local at_max_saved=0
 	# adaptive timeouts may prevent seeing the issue
@@ -1823,7 +2168,7 @@ test_35b() { # bug 18674
 
 	cleanup
 	# remove nid settings
-	writeconf
+	writeconf_or_reformat
 }
 run_test 35b "Continue reconnection retries, if the active server is busy"
 
@@ -1852,14 +2197,14 @@ test_36() { # 12743
 	local fs2ostvdev=$(ostvdevname 1_2)
 	local fs3ostvdev=$(ostvdevname 2_2)
 
-	add fs2mds $(mkfs_opts mds1) --fsname=${FSNAME2} --reformat \
-		$fs2mdsdev $fs2mdsvdev || exit 10
+	add fs2mds $(mkfs_opts mds1 ${fs2mdsdev}) --mgs --fsname=${FSNAME2} \
+		--reformat $fs2mdsdev $fs2mdsvdev || exit 10
 	# XXX after we support non 4K disk blocksize in ldiskfs, specify a
 	#     different one than the default value here.
-	add fs2ost $(mkfs_opts ost1) --mgsnode=$MGSNID --fsname=${FSNAME2} \
-		--reformat $fs2ostdev $fs2ostvdev || exit 10
-	add fs3ost $(mkfs_opts ost1) --mgsnode=$MGSNID --fsname=${FSNAME2} \
-		--reformat $fs3ostdev $fs3ostvdev || exit 10
+	add fs2ost $(mkfs_opts ost1 ${fs2ostdev}) --mgsnode=$MGSNID \
+		--fsname=${FSNAME2} --reformat $fs2ostdev $fs2ostvdev || exit 10
+	add fs3ost $(mkfs_opts ost1 ${fs3ostdev}) --mgsnode=$MGSNID \
+		--fsname=${FSNAME2} --reformat $fs3ostdev $fs3ostvdev || exit 10
 
         start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS
         start fs2ost $fs2ostdev $OST_MOUNT_OPTS
@@ -2089,15 +2434,24 @@ test_41b() {
 run_test 41b "mount mds with --nosvc and --nomgs on first mount"
 
 test_42() { #bug 14693
-        setup
-        check_mount || return 2
-        do_facet mgs $LCTL conf_param lustre.llite.some_wrong_param=10
-        umount_client $MOUNT
-        mount_client $MOUNT || return 1
-        cleanup
-        return 0
+	setup
+	check_mount || error "client was not mounted"
+
+	do_facet mgs $LCTL conf_param $FSNAME.llite.some_wrong_param=10
+	umount_client $MOUNT ||
+		error "unmounting client failed with invalid llite param"
+	mount_client $MOUNT ||
+		error "mounting client failed with invalid llite param"
+
+	do_facet mgs $LCTL conf_param $FSNAME.sys.some_wrong_param=20
+	cleanup || error "stopping $FSNAME failed with invalid sys param"
+	load_modules
+	setup
+	check_mount || "client was not mounted with invalid sys param"
+	cleanup || error "stopping $FSNAME failed with invalid sys param"
+	return 0
 }
-run_test 42 "invalid config param should not prevent client from mounting"
+run_test 42 "allow client/server mount/unmount with invalid config param"
 
 test_43() {
 	[ $UID -ne 0 -o $RUNAS_ID -eq 0 ] && skip_env "run as root"
@@ -2254,7 +2608,7 @@ cleanup_46a() {
 	stop_mds || rc=$?
 	cleanup_nocli || rc=$?
 	#writeconf to remove all ost2 traces for subsequent tests
-	writeconf
+	writeconf_or_reformat
 	return $rc
 }
 
@@ -2496,7 +2850,7 @@ test_50c() {
 	stop_ost2 || error "Unable to stop OST2"
 	stop_mds || error "Unable to stop MDS"
 	#writeconf to remove all ost2 traces for subsequent tests
-	writeconf
+	writeconf_or_reformat
 }
 run_test 50c "lazystatfs one server down =========================="
 
@@ -2518,7 +2872,7 @@ test_50d() {
 	stop_ost2 || error "Unable to stop OST2"
 	stop_mds || error "Unable to stop MDS"
 	#writeconf to remove all ost2 traces for subsequent tests
-	writeconf
+	writeconf_or_reformat
 }
 run_test 50d "lazystatfs client/server conn race =========================="
 
@@ -2600,7 +2954,7 @@ test_50f() {
 	stop_ost || error "Unable to stop OST1"
 	stop_mds || error "Unable to stop MDS"
 	#writeconf to remove all ost2 traces for subsequent tests
-	writeconf
+	writeconf_or_reformat
 }
 run_test 50f "normal statfs one server in down =========================="
 
@@ -2628,10 +2982,46 @@ test_50g() {
 	stop_ost || error "Unable to stop OST1"
 	stop_mds || error "Unable to stop MDS"
 	#writeconf to remove all ost2 traces for subsequent tests
-	writeconf
+	writeconf_or_reformat
 }
 run_test 50g "deactivated OST should not cause panic====================="
 
+# LU-642
+test_50h() {
+	# prepare MDT/OST, make OSC inactive for OST1
+	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2, skipping" && return
+	do_facet ost1 "$TUNEFS --param osc.active=0 `ostdevname 1`" ||
+		error "tunefs OST1 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 -p $DIR/$tdir
+
+	# activatate OSC for OST1
+	local TEST="$LCTL get_param -n osc.${FSNAME}-OST0000-osc-[!M]*.active"
+	set_conf_param_and_check client					\
+		"$TEST" "${FSNAME}-OST0000.osc.active" 1 ||
+		error "Unable to activate OST1"
+
+	mkdir -p $DIR/$tdir/2
+	$LFS setstripe -c -1 -i 0 $DIR/$tdir/2
+	sleep 1 && echo "create a file after OST1 is activated"
+	# create some file
+	createmany -o $DIR/$tdir/2/$tfile-%d 1
+
+	# check OSC import is working
+	stat $DIR/$tdir/2/* >/dev/null 2>&1 ||
+		error "some OSC imports are still not connected"
+
+	# cleanup
+	umount_client $MOUNT || error "Unable to umount client"
+	stop_ost2 || error "Unable to stop OST2"
+	cleanup_nocli
+}
+run_test 50h "LU-642: activate deactivated OST  ==="
+
 test_51() {
 	local LOCAL_TIMEOUT=20
 
@@ -2651,7 +3041,7 @@ test_51() {
 	stop_ost2 || return 3
 	cleanup
 	#writeconf to remove all ost2 traces for subsequent tests
-	writeconf
+	writeconf_or_reformat
 }
 run_test 51 "Verify that mdt_reint handles RMF_MDT_MD correctly when an OST is added"
 
@@ -2765,9 +3155,10 @@ test_52() {
 
 	# backup objects
 	echo backup objects to $ost1tmp/objects
-	local objects=$(do_node $ost1node 'find '$ost1mnt'/O/0 -type f -size +0'\
-			'-newer '$ost1tmp'/modified_first -regex ".*\/[0-9]+"')
-	copy_files_xattrs $ost1node $ost1tmp/objects $ost1tmp/object_xattrs $objects
+	local objects=$(do_node $ost1node 'find '$ost1mnt'/O/[0-9]* -type f'\
+		'-size +0 -newer '$ost1tmp'/modified_first -regex ".*\/[0-9]+"')
+	copy_files_xattrs $ost1node $ost1tmp/objects $ost1tmp/object_xattrs \
+			$objects
 	[ $? -eq 0 ] || { error "Unable to copy objects"; return 13; }
 
 	# move objects to lost+found
@@ -2823,7 +3214,6 @@ thread_sanity() {
 	local nthrs
         shift 4
 
-        setup
         check_mount || return 41
 
         # We need to expand $parampat, but it may match multiple parameters, so
@@ -2892,23 +3282,33 @@ thread_sanity() {
         tmin=$(do_facet $facet "lctl get_param -n ${paramp}.threads_min")
         tmax=$(do_facet $facet "lctl get_param -n ${paramp}.threads_max")
         tstarted=$(do_facet $facet "lctl get_param -n ${paramp}.threads_started")
-        lassert 28 "$msg" '(($tstarted == $tmin && $tstarted == $tmax ))' || return $?
+        lassert 28 "$msg" '(($tstarted >= $tmin && $tstarted <= $tmax ))' || return $?
         cleanup
 
         load_modules
         setup
-        cleanup
 }
 
 test_53a() {
+	setup
 	thread_sanity OST ost1 'ost.*.ost' 'oss_num_threads' '16'
+	cleanup
 }
 run_test 53a "check OSS thread count params"
 
 test_53b() {
-	thread_sanity MDT $SINGLEMDS 'mdt.*.*.' 'mdt_num_threads' '16'
+	setup
+	local mds=$(do_facet $SINGLEMDS "lctl get_param -N mds.*.*.threads_max \
+		    2>/dev/null")
+	if [ -z "$mds" ]; then
+		#running this on an old MDT
+		thread_sanity MDT $SINGLEMDS 'mdt.*.*.' 'mdt_num_threads' 16
+	else
+		thread_sanity MDT $SINGLEMDS 'mds.*.*.' 'mds_num_threads' 16
+	fi
+	cleanup
 }
-run_test 53b "check MDT thread count params"
+run_test 53b "check MDS thread count params"
 
 test_54a() {
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
@@ -2952,10 +3352,10 @@ test_55() {
 
 	for i in 1023 2048
 	do
-		add mds1 $(mkfs_opts mds1) --reformat $mdsdev $mdsvdev ||
-			exit 10
-		add ost1 $(mkfs_opts ost1) --index=$i --reformat \
-			$(ostdevname 1) $(ostvdevname 1)
+		add mds1 $(mkfs_opts mds1 ${mdsdev}) --reformat $mdsdev \
+			$mdsvdev || exit 10
+		add ost1 $(mkfs_opts ost1 $(ostdevname 1)) --index=$i \
+			--reformat $(ostdevname 1) $(ostvdevname 1)
 		setup_noconfig
 		stopall
 		setup_noconfig
@@ -2979,10 +3379,14 @@ test_56() {
 	local mds_journal_size_orig=$MDSJOURNALSIZE
 
 	MDSJOURNALSIZE=16
-	add mds1 $(mkfs_opts mds1) --reformat $(mdsdevname 1) $(mdsvdevname 1)
-	add ost1 $(mkfs_opts ost1) --index=1000 --reformat \
+
+	for num in $(seq 1 $MDSCOUNT); do
+		add mds${num} $(mkfs_opts mds${num} $(mdsdevname $num)) \
+			--reformat $(mdsdevname $num) $(mdsvdevname $num)
+	done
+	add ost1 $(mkfs_opts ost1 $(ostdevname 1)) --index=1000 --reformat \
 		$(ostdevname 1) $(ostvdevname 1)
-	add ost2 $(mkfs_opts ost2) --index=10000 --reformat \
+	add ost2 $(mkfs_opts ost2 $(ostdevname 2)) --index=10000 --reformat \
 		$(ostdevname 2) $(ostvdevname 2)
 
 	start_mgsmds
@@ -2999,7 +3403,8 @@ run_test 56 "check big indexes"
 
 test_57a() { # bug 22656
 	local NID=$(do_facet ost1 "$LCTL get_param nis" | tail -1 | awk '{print $1}')
-	writeconf
+	writeconf_or_reformat
+	[ $(facet_fstype ost1) == zfs ] && import_zpool ost1
 	do_facet ost1 "$TUNEFS --failnode=$NID `ostdevname 1`" || error "tunefs failed"
 	start_mgsmds
 	start_ost && error "OST registration from failnode should fail"
@@ -3009,7 +3414,8 @@ run_test 57a "initial registration from failnode should fail (should return errs
 
 test_57b() {
 	local NID=$(do_facet ost1 "$LCTL get_param nis" | tail -1 | awk '{print $1}')
-	writeconf
+	writeconf_or_reformat
+	[ $(facet_fstype ost1) == zfs ] && import_zpool ost1
 	do_facet ost1 "$TUNEFS --servicenode=$NID `ostdevname 1`" || error "tunefs failed"
 	start_mgsmds
 	start_ost || error "OST registration from servicenode should not fail"
@@ -3031,14 +3437,21 @@ test_58() { # bug 22658
 	createmany -o $DIR/$tdir/$tfile-%d 100
 	# make sure that OSTs do not cancel llog cookies before we unmount the MDS
 #define OBD_FAIL_OBD_LOG_CANCEL_NET      0x601
-	do_facet mds "lctl set_param fail_loc=0x601"
+	do_facet $SINGLEMDS "lctl set_param fail_loc=0x601"
 	unlinkmany $DIR/$tdir/$tfile-%d 100
-	stop mds
-	local MNTDIR=$(facet_mntpt mds)
+	stop_mds
+
+	local MNTDIR=$(facet_mntpt $SINGLEMDS)
+	local devname=$(mdsdevname ${SINGLEMDS//mds/})
+	local opts=""
+	if ! do_facet $SINGLEMDS "test -b $devname"; then
+		opts="-o loop"
+	fi
+
 	# remove all files from the OBJECTS dir
-	do_facet mds "mount -t ldiskfs $MDSDEV $MNTDIR"
-	do_facet mds "find $MNTDIR/OBJECTS -type f -delete"
-	do_facet mds "umount $MNTDIR"
+	do_facet $SINGLEMDS "mount -t ldiskfs $opts $devname $MNTDIR"
+	do_facet $SINGLEMDS "find $MNTDIR/O/1/d* -type f -delete"
+	do_facet $SINGLEMDS "umount $MNTDIR"
 	# restart MDS with missing llog files
 	start_mds
 	do_facet mds "lctl set_param fail_loc=0"
@@ -3074,19 +3487,24 @@ test_59() {
 	stop_ost2 >> /dev/null
 	cleanup_nocli >> /dev/null
 	#writeconf to remove all ost2 traces for subsequent tests
-	writeconf
+	writeconf_or_reformat
 }
 run_test 59 "writeconf mount option"
 
 test_60() { # LU-471
+	local num
+
 	if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
 		skip "Only applicable to ldiskfs-based MDTs"
 		return
 	fi
 
-	add mds1 $(mkfs_opts mds1) \
-		--mkfsoptions='\" -E stride=64 -O ^uninit_bg\"' --reformat \
-		$(mdsdevname 1) $(mdsvdevname 1) || exit 10
+	for num in $(seq $MDSCOUNT); do
+		add mds${num} $(mkfs_opts mds${num} $(mdsdevname $num)) \
+			--mkfsoptions='\" -E stride=64 -O ^uninit_bg\"' \
+			--reformat $(mdsdevname $num) $(mdsvdevname $num) ||
+			exit 10
+	done
 
 	dump=$(do_facet $SINGLEMDS dumpe2fs $(mdsdevname 1))
 	rc=${PIPESTATUS[0]}
@@ -3111,10 +3529,13 @@ test_61() { # LU-80
 	if [ $(facet_fstype $SINGLEMDS) == ldiskfs ] &&
 	   ! large_xattr_enabled; then
 		reformat=true
-		local mds_dev=$(mdsdevname ${SINGLEMDS//mds/})
 		LDISKFS_MKFS_OPTS+=" -O large_xattr"
-		add $SINGLEMDS $(mkfs_opts $SINGLEMDS) --reformat $mds_dev ||
-			error "reformatting $mds_dev failed"
+
+		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"
+		done
 	fi
 
     setup_noconfig || error "setting up the filesystem failed"
@@ -3222,9 +3643,704 @@ test_64() {
 	echo "$LFS df"
 	$LFS df --lazy || error "lfs df failed"
 	cleanup || return $?
+	#writeconf to remove all ost2 traces for subsequent tests
+	writeconf_or_reformat
 }
 run_test 64 "check lfs df --lazy "
 
+test_65() { # LU-2237
+	# Currently, the test is only valid for ldiskfs backend
+	[ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] &&
+		skip "non-ldiskfs backend" && return
+
+	local devname=$(mdsdevname ${SINGLEMDS//mds/})
+	local brpt=$(facet_mntpt brpt)
+	local opts=""
+
+	if ! do_facet $SINGLEMDS "test -b $devname"; then
+		opts="-o loop"
+	fi
+
+	stop_mds
+	local obj=$(do_facet $SINGLEMDS \
+		    "$DEBUGFS -c -R \\\"stat last_rcvd\\\" $devname" |
+		    grep Inode)
+	if [ -z "$obj" ]; then
+		# The MDT may be just re-formatted, mount the MDT for the
+		# first time to guarantee the "last_rcvd" file is there.
+		start_mds || error "fail to mount the MDS for the first time"
+		stop_mds
+	fi
+
+	# remove the "last_rcvd" file
+	do_facet $SINGLEMDS "mkdir -p $brpt"
+	do_facet $SINGLEMDS \
+		"mount -t $(facet_fstype $SINGLEMDS) $opts $devname $brpt"
+	do_facet $SINGLEMDS "rm -f ${brpt}/last_rcvd"
+	do_facet $SINGLEMDS "umount $brpt"
+
+	# restart MDS, the "last_rcvd" file should be recreated.
+	start_mds || error "fail to restart the MDS"
+	stop_mds
+	obj=$(do_facet $SINGLEMDS \
+	      "$DEBUGFS -c -R \\\"stat last_rcvd\\\" $devname" | grep Inode)
+	[ -n "$obj" ] || error "fail to re-create the last_rcvd"
+}
+run_test 65 "re-create the lost last_rcvd file when server mount"
+
+test_66() {
+	[[ $(lustre_version_code mgs) -ge $(version_code 2.3.59) ]] ||
+		{ skip "Need MGS version at least 2.3.59"; return 0; }
+
+	setup
+	local OST1_NID=$(do_facet ost1 $LCTL list_nids | head -1)
+	local MDS_NID=$(do_facet $SINGLEMDS $LCTL list_nids | head -1)
+
+	echo "replace_nids should fail if MDS, OSTs and clients are UP"
+	do_facet mgs $LCTL replace_nids $FSNAME-OST0000 $OST1_NID &&
+		error "replace_nids fail"
+
+	umount_client $MOUNT || error "unmounting client failed"
+	echo "replace_nids should fail if MDS and OSTs are UP"
+	do_facet mgs $LCTL replace_nids $FSNAME-OST0000 $OST1_NID &&
+		error "replace_nids fail"
+
+	stop_ost
+	echo "replace_nids should fail if MDS is UP"
+	do_facet mgs $LCTL replace_nids $FSNAME-OST0000 $OST1_NID &&
+		error "replace_nids fail"
+
+	stop_mds || error "stopping mds failed"
+
+	if combined_mgs_mds; then
+		start_mdt 1 "-o nosvc" ||
+			error "starting mds with nosvc option failed"
+	fi
+
+	echo "command should accept two parameters"
+	do_facet mgs $LCTL replace_nids $FSNAME-OST0000 &&
+		error "command should accept two params"
+
+	echo "correct device name should be passed"
+	do_facet mgs $LCTL replace_nids $FSNAME-WRONG0000 $OST1_NID &&
+		error "wrong devname"
+
+	echo "wrong nids list should not destroy the system"
+	do_facet mgs $LCTL replace_nids $FSNAME-OST0000 "wrong nids list" &&
+		error "wrong parse"
+
+	echo "replace OST nid"
+	do_facet mgs $LCTL replace_nids $FSNAME-OST0000 $OST1_NID ||
+		error "replace nids failed"
+
+	echo "command should accept two parameters"
+	do_facet mgs $LCTL replace_nids $FSNAME-MDT0000 &&
+		error "command should accept two params"
+
+	echo "wrong nids list should not destroy the system"
+	do_facet mgs $LCTL replace_nids $FSNAME-MDT0000 "wrong nids list" &&
+		error "wrong parse"
+
+	echo "replace MDS nid"
+	do_facet mgs $LCTL replace_nids $FSNAME-MDT0000 $MDS_NID ||
+		error "replace nids failed"
+
+	if ! combined_mgs_mds ; then
+		stop_mgs
+	else
+		stop_mds
+	fi
+
+	setup_noconfig
+	check_mount || error "error after nid replace"
+	cleanup || error "cleanup failed"
+	reformat
+}
+run_test 66 "replace nids"
+
+test_67() { #LU-2950
+	local legacy="$TMP/legacy_lnet_config"
+	local new="$TMP/new_routes_test"
+	local out="$TMP/config_out_file"
+	local verify="$TMP/conv_verify"
+	local verify_conf="$TMP/conf_verify"
+
+	# Create the legacy file that will be run through the
+	# lustre_routes_conversion script
+	cat <<- LEGACY_LNET_CONFIG > $legacy
+		tcp1 23 192.168.213.1@tcp:1; tcp5 34 193.30.4.3@tcp:4;
+		tcp2 54 10.1.3.2@tcp;
+		tcp3 10.3.4.3@tcp:3;
+		tcp4 10.3.3.4@tcp;
+	LEGACY_LNET_CONFIG
+
+	# Create the verification file to verify the output of
+	# lustre_routes_conversion script against.
+	cat <<- VERIFY_LNET_CONFIG > $verify
+		tcp1: { gateway: 192.168.213.1@tcp, hop: 23, priority: 1 }
+		tcp5: { gateway: 193.30.4.3@tcp, hop: 34, priority: 4 }
+		tcp2: { gateway: 10.1.3.2@tcp, hop: 54 }
+		tcp3: { gateway: 10.3.4.3@tcp, priority: 3 }
+		tcp4: { gateway: 10.3.3.4@tcp }
+	VERIFY_LNET_CONFIG
+
+	# Create the verification file to verify the output of
+	# lustre_routes_config script against
+	cat <<- VERIFY_LNET_CONFIG > $verify_conf
+		lctl --net tcp1 add_route 192.168.213.1@tcp 23 1
+		lctl --net tcp5 add_route 193.30.4.3@tcp 34 4
+		lctl --net tcp2 add_route 10.1.3.2@tcp 54 4
+		lctl --net tcp3 add_route 10.3.4.3@tcp 1 3
+		lctl --net tcp4 add_route 10.3.3.4@tcp 1 3
+	VERIFY_LNET_CONFIG
+
+	lustre_routes_conversion $legacy $new > /dev/null
+	if [ -f $new ]; then
+		# verify the conversion output
+		cmp -s $new $verify > /dev/null
+		if [ $? -eq 1 ]; then
+			error "routes conversion failed"
+		fi
+
+		lustre_routes_config --dry-run --verbose $new > $out
+		# check that the script succeeded
+		cmp -s $out $verify_conf > /dev/null
+		if [ $? -eq 1 ]; then
+			error "routes config failed"
+		fi
+	else
+		error "routes conversion test failed"
+	fi
+	# remove generated files
+	rm -f $new $legacy $verify $verify_conf $out
+}
+run_test 67 "test routes conversion and configuration"
+
+test_68() {
+	local fid
+	local seq
+	local START
+	local END
+
+	[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.4.53) ] ||
+		{ skip "Need MDS version at least 2.4.53"; return 0; }
+
+	umount_client $MOUNT || error "umount client failed"
+
+	start_mdt 1 || error "MDT start failed"
+	start_ost
+
+	# START-END - the sequences we'll be reserving
+	START=$(do_facet $SINGLEMDS \
+		lctl get_param -n seq.ctl*.space | awk -F'[[ ]' '{print $2}')
+	END=$((START + (1 << 30)))
+	do_facet $SINGLEMDS \
+		lctl set_param seq.ctl*.fldb="[$START-$END\):0:mdt"
+
+	# reset the sequences MDT0000 has already assigned
+	do_facet $SINGLEMDS \
+		lctl set_param seq.srv*MDT0000.space=clear
+
+	# remount to let the client allocate new sequence
+	mount_client $MOUNT || error "mount client failed"
+
+	touch $DIR/$tfile
+	do_facet $SINGLEMDS \
+		lctl get_param seq.srv*MDT0000.space
+	$LFS path2fid $DIR/$tfile
+
+	local old_ifs="$IFS"
+	IFS='[:]'
+	fid=($($LFS path2fid $DIR/$tfile))
+	IFS="$old_ifs"
+	let seq=${fid[1]}
+
+	if [[ $seq < $END ]]; then
+		error "used reserved sequence $seq?"
+	fi
+	cleanup || return $?
+}
+run_test 68 "be able to reserve specific sequences in FLDB"
+
+test_69() {
+	setup
+
+	# 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 * 3/2 - $last_id + 100))
+
+	mkdir $DIR/$tdir
+	$LFS setstripe -i 0 $DIR/$tdir
+	createmany $DIR/$tdir/$tfile- $num_create
+	# delete all of the files with objects on OST0 so the
+	# filesystem is not inconsistent later on
+	$LFS find $MOUNT --index 0 -print0 | xargs -0 unlink
+
+	stop_ost || error "OST0 stop failure"
+	add ost1 $(mkfs_opts ost1 $ostdev) --reformat --replace $ostdev ||
+		error "reformat and replace $ostdev failed"
+	start_ost || error "OST0 restart failure"
+
+	touch $DIR/$tdir/$tfile-last || error "create file after reformat"
+	local idx=$($LFS getstripe -c $DIR/$tdir/$tfile-last)
+	[ $idx -ne 0 ] && error "$DIR/$tdir/$tfile-last on $idx not 0" || true
+
+	cleanup
+}
+run_test 68 "replace an OST with the same index"
+
+test_70a() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	local MDTIDX=1
+
+	cleanup
+
+	start_mdt 1 || error "MDT0 start fail"
+
+	start_ost || error "OST0 start fail"
+
+	start_mdt 2 || error "MDT1 start fail"
+
+	mount_client $MOUNT || error "mount client fails"
+
+	mkdir -p $DIR/$tdir || error "create dir fail"
+
+	$LFS mkdir -i $MDTIDX $DIR/$tdir/remote_dir ||
+					error "create remote dir fail"
+
+	rm -rf $DIR/$tdir || error "delete dir fail"
+	cleanup || return $?
+}
+run_test 70a "start MDT0, then OST, then MDT1"
+
+test_70b() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	local MDTIDX=1
+
+	start_ost || error "OST0 start fail"
+
+	start_mdt 1 || error "MDT0 start fail"
+	start_mdt 2 || error "MDT1 start fail"
+
+	mount_client $MOUNT || error "mount client fails"
+
+	mkdir -p $DIR/$tdir || error "create dir fail"
+
+	$LFS mkdir -i $MDTIDX $DIR/$tdir/remote_dir ||
+					error "create remote dir fail"
+
+	rm -rf $DIR/$tdir || error "delete dir fail"
+
+	cleanup || return $?
+}
+run_test 70b "start OST, MDT1, MDT0"
+
+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_ost || error "OST0 start fail"
+
+	mount_client $MOUNT || error "mount client fails"
+	stop_mdt 1 || error "MDT1 start fail"
+
+	local mdc_for_mdt1=$($LCTL dl | grep MDT0000-mdc | awk '{print $4}')
+	echo "deactivate $mdc_for_mdt1"
+        $LCTL --device $mdc_for_mdt1 deactivate || return 1
+
+	mkdir -p $DIR/$tdir && error "mkdir succeed"
+
+	$LFS mkdir -i $MDTIDX $DIR/$tdir/remote_dir &&
+					error "create remote dir succeed"
+
+	cleanup || return $?
+}
+run_test 70c "stop MDT0, mkdir fail, create remote dir fail"
+
+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_ost || error "OST0 start fail"
+
+	mount_client $MOUNT || error "mount client fails"
+
+	stop_mdt 2 || error "MDT1 start fail"
+
+	local mdc_for_mdt2=$($LCTL dl | grep MDT0001-mdc |
+			     awk '{print $4}')
+	echo "deactivate $mdc_for_mdt2"
+        $LCTL --device $mdc_for_mdt2 deactivate ||
+			error "set $mdc_for_mdt2 deactivate failed"
+
+	mkdir -p $DIR/$tdir || error "mkdir fail"
+	$LFS mkdir -i $MDTIDX $DIR/$tdir/remote_dir &&
+			error "create remote dir succeed"
+
+	rm -rf $DIR/$tdir || error "delete dir fail"
+
+	cleanup || return $?
+}
+run_test 70d "stop MDT1, mkdir succeed, create remote dir fail"
+
+test_71a() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	if combined_mgs_mds; then
+		skip "needs separate MGS/MDT" && return
+	fi
+	local MDTIDX=1
+
+	start_mdt 1 || error "MDT0 start fail"
+	start_ost || error "OST0 start fail"
+	start_mdt 2 || error "MDT1 start fail"
+	start_ost2 || error "OST1 start fail"
+
+	mount_client $MOUNT || error "mount client fails"
+
+	mkdir -p $DIR/$tdir || error "mkdir fail"
+	$LFS mkdir -i $MDTIDX $DIR/$tdir/remote_dir ||
+			error "create remote dir succeed"
+
+	mcreate $DIR/$tdir/remote_dir/$tfile || error "create file failed"
+	rm -rf $DIR/$tdir || error "delete dir fail"
+
+	umount_client $MOUNT
+	stop_mdt 1 || error "MDT0 stop fail"
+	stop_mdt 2 || error "MDT1 stop fail"
+	stop_ost || error "OST0 stop fail"
+	stop_ost2 || error "OST1 stop fail"
+}
+run_test 71a "start MDT0 OST0, MDT1, OST1"
+
+test_71b() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	if combined_mgs_mds; then
+		skip "needs separate MGS/MDT" && return
+	fi
+	local MDTIDX=1
+
+	start_mdt 2 || error "MDT1 start fail"
+	start_ost || error "OST0 start fail"
+	start_mdt 1 || error "MDT0 start fail"
+	start_ost2 || error "OST1 start fail"
+
+	mount_client $MOUNT || error "mount client fails"
+
+	mkdir -p $DIR/$tdir || error "mkdir fail"
+	$LFS mkdir -i $MDTIDX $DIR/$tdir/remote_dir ||
+			error "create remote dir succeed"
+
+	mcreate $DIR/$tdir/remote_dir/$tfile || error "create file failed"
+	rm -rf $DIR/$tdir || error "delete dir fail"
+
+	umount_client $MOUNT
+	stop_mdt 1 || error "MDT0 stop fail"
+	stop_mdt 2 || error "MDT1 stop fail"
+	stop_ost || error "OST0 stop fail"
+	stop_ost2 || error "OST1 stop fail"
+}
+run_test 71b "start MDT1, OST0, MDT0, OST1"
+
+test_71c() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	if combined_mgs_mds; then
+		skip "needs separate MGS/MDT" && return
+	fi
+	local MDTIDX=1
+
+	start_ost || error "OST0 start fail"
+	start_ost2 || error "OST1 start fail"
+	start_mdt 2 || error "MDT1 start fail"
+	start_mdt 1 || error "MDT0 start fail"
+
+	mount_client $MOUNT || error "mount client fails"
+
+	mkdir -p $DIR/$tdir || error "mkdir fail"
+	$LFS mkdir -i $MDTIDX $DIR/$tdir/remote_dir ||
+			error "create remote dir succeed"
+
+	mcreate $DIR/$tdir/remote_dir/$tfile || error "create file failed"
+	rm -rf $DIR/$tdir || error "delete dir fail"
+
+	umount_client $MOUNT
+	stop_mdt 1 || error "MDT0 stop fail"
+	stop_mdt 2 || error "MDT1 stop fail"
+	stop_ost || error "OST0 stop fail"
+	stop_ost2 || error "OST1 stop fail"
+
+}
+run_test 71c "start OST0, OST1, MDT1, MDT0"
+
+test_71d() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	if combined_mgs_mds; then
+		skip "needs separate MGS/MDT" && return
+	fi
+	local MDTIDX=1
+
+	start_ost || error "OST0 start fail"
+	start_mdt 2 || error "MDT0 start fail"
+	start_mdt 1 || error "MDT0 start fail"
+	start_ost2 || error "OST1 start fail"
+
+	mount_client $MOUNT || error "mount client fails"
+
+	mkdir -p $DIR/$tdir || error "mkdir fail"
+	$LFS mkdir -i $MDTIDX $DIR/$tdir/remote_dir ||
+			error "create remote dir succeed"
+
+	mcreate $DIR/$tdir/remote_dir/$tfile || error "create file failed"
+	rm -rf $DIR/$tdir || error "delete dir fail"
+
+	umount_client $MOUNT
+	stop_mdt 1 || error "MDT0 stop fail"
+	stop_mdt 2 || error "MDT1 stop fail"
+	stop_ost || error "OST0 stop fail"
+	stop_ost2 || error "OST1 stop fail"
+
+}
+run_test 71d "start OST0, MDT1, MDT0, OST1"
+
+test_71e() {
+	[ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+	if combined_mgs_mds; then
+		skip "needs separate MGS/MDT" && return
+	fi
+	local MDTIDX=1
+
+	start_ost || error "OST0 start fail"
+	start_mdt 2 || error "MDT1 start fail"
+	start_ost2 || error "OST1 start fail"
+	start_mdt 1 || error "MDT0 start fail"
+
+	mount_client $MOUNT || error "mount client fails"
+
+	mkdir -p $DIR/$tdir || error "mkdir fail"
+	$LFS mkdir -i $MDTIDX $DIR/$tdir/remote_dir ||
+			error "create remote dir succeed"
+
+	mcreate $DIR/$tdir/remote_dir/$tfile || error "create file failed"
+	rm -rf $DIR/$tdir || error "delete dir fail"
+
+	umount_client $MOUNT
+	stop_mdt 1 || error "MDT0 stop fail"
+	stop_mdt 2 || error "MDT1 stop fail"
+	stop_ost || error "OST0 stop fail"
+	stop_ost2 || error "OST1 stop fail"
+
+}
+run_test 71e "start OST0, MDT1, OST1, MDT0"
+
+test_72() { #LU-2634
+	local mdsdev=$(mdsdevname 1)
+	local ostdev=$(ostdevname 1)
+	local cmd="$E2FSCK -fnvd $mdsdev"
+	local fn=3
+
+	[ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] &&
+		skip "ldiskfs only test" && return
+
+	#tune MDT with "-O extents"
+
+	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"
+		$TUNE2FS -O extents $(mdsdevname $num)
+	done
+
+	add ost1 $(mkfs_opts ost1 $ostdev) --reformat $ostdev ||
+		error "add $ostdev failed"
+	start_mgsmds || error "start mds failed"
+	start_ost || error "start ost failed"
+	mount_client $MOUNT || error "mount client failed"
+
+	#create some short symlinks
+	mkdir -p $DIR/$tdir
+	createmany -o $DIR/$tdir/$tfile-%d $fn
+	echo "create $fn short symlinks"
+	for i in $(seq -w 1 $fn); do
+		ln -s $DIR/$tdir/$tfile-$i $MOUNT/$tfile-$i
+	done
+	ls -al $MOUNT
+
+	#umount
+	umount_client $MOUNT || error "umount client failed"
+	stop_mds || error "stop mds failed"
+	stop_ost || error "stop ost failed"
+
+	#run e2fsck
+	run_e2fsck $(facet_active_host $SINGLEMDS) $mdsdev "-n"
+}
+run_test 72 "test fast symlink with extents flag enabled"
+
+test_73() { #LU-3006
+	load_modules
+	[ $(facet_fstype ost1) == zfs ] && import_zpool ost1
+	do_facet ost1 "$TUNEFS --failnode=1.2.3.4@$NETTYPE $(ostdevname 1)" ||
+		error "1st tunefs failed"
+	start_mgsmds || error "start mds failed"
+	start_ost || error "start ost failed"
+	mount_client $MOUNT || error "mount client failed"
+	lctl get_param -n osc.*OST0000-osc-[^M]*.import | grep failover_nids |
+		grep 1.2.3.4@$NETTYPE || error "failover nids haven't changed"
+	umount_client $MOUNT || error "umount client failed"
+	stopall
+	reformat
+}
+run_test 73 "failnode to update from mountdata properly"
+
+test_74() { # LU-1606
+	for TESTPROG in $LUSTRE_TESTS_API_DIR/*.c; do
+		gcc -Wall -Werror $LUSTRE_TESTS_API_DIR/simple_test.c \
+			-I$LUSTRE/include \
+			-L$LUSTRE/utils -llustreapi ||
+				error "client api broken"
+	done
+	cleanup || return $?
+}
+run_test 74 "Lustre client api program can compile and link"
+
+test_75() { # LU-2374
+	[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.1) ]] &&
+	                skip "Need MDS version at least 2.4.1" && return
+
+	local index=0
+	local opts_mds="$(mkfs_opts mds1 $(mdsdevname 1)) \
+		--reformat $(mdsdevname 1) $(mdsvdevname 1)"
+	local opts_ost="$(mkfs_opts ost1 $(ostdevname 1)) \
+		--reformat $(ostdevname 1) $(ostvdevname 1)"
+
+	#check with default parameters
+	add mds1 $opts_mds || error "add mds1 failed for default params"
+	add ost1 $opts_ost || error "add ost1 failed for default params"
+
+	opts_mds=$(echo $opts_mds | sed -e "s/--mdt//")
+	opts_mds=$(echo $opts_mds |
+		   sed -e "s/--index=$index/--index=$index --mdt/")
+	opts_ost=$(echo $opts_ost | sed -e "s/--ost//")
+	opts_ost=$(echo $opts_ost |
+		   sed -e "s/--index=$index/--index=$index --ost/")
+
+	add mds1 $opts_mds || error "add mds1 failed for new params"
+	add ost1 $opts_ost || error "add ost1 failed for new params"
+	return 0
+}
+run_test 75 "The order of --index should be irrelevant"
+
+test_76() {
+	[[ $(lustre_version_code mgs) -ge $(version_code 2.4.52) ]] ||
+		{ skip "Need MDS version at least 2.4.52" && return 0; }
+	setup
+	local MDMB_PARAM="osc.*.max_dirty_mb"
+	echo "Change MGS params"
+	local MAX_DIRTY_MB=$($LCTL get_param -n $MDMB_PARAM |
+		head -1)
+	echo "max_dirty_mb: $MAX_DIRTY_MB"
+	local NEW_MAX_DIRTY_MB=$((MAX_DIRTY_MB + MAX_DIRTY_MB))
+	echo "new_max_dirty_mb: $NEW_MAX_DIRTY_MB"
+	do_facet mgs $LCTL set_param -P $MDMB_PARAM=$NEW_MAX_DIRTY_MB
+	wait_update $HOSTNAME "lctl get_param -n $MDMB_PARAM |
+		head -1" $NEW_MAX_DIRTY_MB
+	MAX_DIRTY_MB=$($LCTL get_param -n $MDMB_PARAM | head -1)
+	echo "$MAX_DIRTY_MB"
+	[ $MAX_DIRTY_MB = $NEW_MAX_DIRTY_MB ] ||
+		error "error while apply max_dirty_mb"
+
+	echo "Check the value is stored after remount"
+	stopall
+	setupall
+	wait_update $HOSTNAME "lctl get_param -n $MDMB_PARAM |
+		head -1" $NEW_MAX_DIRTY_MB
+	MAX_DIRTY_MB=$($LCTL get_param -n $MDMB_PARAM | head -1)
+	[ $MAX_DIRTY_MB = $NEW_MAX_DIRTY_MB ] ||
+		error "max_dirty_mb is not saved after remount"
+
+	echo "Change OST params"
+	CLIENT_PARAM="obdfilter.*.client_cache_count"
+	local CLIENT_CACHE_COUNT
+	CLIENT_CACHE_COUNT=$(do_facet ost1 $LCTL get_param -n $CLIENT_PARAM |
+		head -1)
+	echo "client_cache_count: $CLIENT_CACHE_COUNT"
+	NEW_CLIENT_CACHE_COUNT=$((CLIENT_CACHE_COUNT+CLIENT_CACHE_COUNT))
+	echo "new_client_cache_count: $NEW_CLIENT_CACHE_COUNT"
+	do_facet mgs $LCTL set_param -P $CLIENT_PARAM=$NEW_CLIENT_CACHE_COUNT
+	wait_update $(facet_host ost1) "lctl get_param -n $CLIENT_PARAM |
+		head -1" $NEW_CLIENT_CACHE_COUNT
+	CLIENT_CACHE_COUNT=$(do_facet ost1 $LCTL get_param -n $CLIENT_PARAM |
+		head -1)
+	echo "$CLIENT_CACHE_COUNT"
+	[ $CLIENT_CACHE_COUNT = $NEW_CLIENT_CACHE_COUNT ] ||
+		error "error while apply client_cache_count"
+
+	echo "Check the value is stored after remount"
+	stopall
+	setupall
+	wait_update $(facet_host ost1) "lctl get_param -n $CLIENT_PARAM |
+		head -1" $NEW_CLIENT_CACHE_COUNT
+	CLIENT_CACHE_COUNT=$(do_facet ost1 $LCTL get_param -n $CLIENT_PARAM |
+		head -1)
+	echo "$CLIENT_CACHE_COUNT"
+	[ $CLIENT_CACHE_COUNT = $NEW_CLIENT_CACHE_COUNT ] ||
+		error "client_cache_count is not saved after remount"
+	stopall
+}
+run_test 76 "set permanent params set_param -P"
+
+test_77() { # LU-3445
+	local server_version=$(lustre_version_code $SINGLEMDS)
+
+	[[ $server_version -ge $(version_code 2.2.60) ]] &&
+	[[ $server_version -le $(version_code 2.4.0) ]] &&
+		skip "Need MDS version < 2.2.60 or > 2.4.0" && return
+
+	if [[ -z "$fs2ost_DEV" || -z "$fs2mds_DEV" ]]; then
+		is_blkdev $SINGLEMDS $(mdsdevname ${SINGLEMDS//mds/}) &&
+		skip_env "mixed loopback and real device not working" && return
+	fi
+
+	local fs2mdsdev=$(mdsdevname 1_2)
+	local fs2ostdev=$(ostdevname 1_2)
+	local fs2mdsvdev=$(mdsvdevname 1_2)
+	local fs2ostvdev=$(ostvdevname 1_2)
+	local fsname=test1234
+	local mgsnid
+	local failnid="$(h2$NETTYPE 1.2.3.4),$(h2$NETTYPE 4.3.2.1)"
+
+	add fs2mds $(mkfs_opts mds1 $fs2mdsdev) --mgs --fsname=$fsname \
+		--reformat $fs2mdsdev $fs2mdsvdev || error "add fs2mds failed"
+	start fs2mds $fs2mdsdev $MDS_MOUNT_OPTS && trap cleanup_24a EXIT INT ||
+		error "start fs2mds failed"
+
+	mgsnid=$(do_facet fs2mds $LCTL list_nids | xargs | tr ' ' ,)
+	[[ $mgsnid = *,* ]] || mgsnid+=",$mgsnid"
+
+	add fs2ost $(mkfs_opts ost1 $fs2ostdev) --mgsnode=$mgsnid \
+		--failnode=$failnid --fsname=$fsname \
+		--reformat $fs2ostdev $fs2ostvdev ||
+			error "add fs2ost failed"
+	start fs2ost $fs2ostdev $OST_MOUNT_OPTS || error "start fs2ost failed"
+
+	mkdir -p $MOUNT2
+	mount -t lustre $mgsnid:/$fsname $MOUNT2 || error "mount $MOUNT2 failed"
+	DIR=$MOUNT2 MOUNT=$MOUNT2 check_mount || error "check $MOUNT2 failed"
+	cleanup_24a
+}
+run_test 77 "comma-separated MGS NIDs and failover node NIDs"
+
 if ! combined_mgs_mds ; then
 	stop mgs
 fi