X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=11dc37f873dbbdf1ac52333692acb5fc2e704219;hp=b9989066c7e95872525b155d4896d0766d6ee738;hb=4dcd475716418d7b2093d917a8bffa9ad14e4465;hpb=c233f39a015943b3df8ddb555765a81b85b31083

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index b998906..11dc37f 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -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 "MDT0 start fail"
 	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"
@@ -2567,9 +2567,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 +2602,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 +2658,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 +2685,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 +2712,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
@@ -4289,8 +4306,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 +4328,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 +4347,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 +4371,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 +4403,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 +4419,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 +4432,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 +4449,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 +4464,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 +4479,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 +4494,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 +4510,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 +4525,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 +4541,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"