X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=15e81ee50be97b8922fda61d3303cd760a815cdf;hp=8134cb45cdb70a049c9fdcb677f90d8f4ee8e807;hb=3e4061862e751dbbbbba273403b56201e705a830;hpb=91a0bc56864b3dcf047e8e7be3e886ef7bc4d0e3

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 8134cb4..15e81ee 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -735,6 +735,7 @@ test_21d() {
         stop_mgs
         #writeconf to remove all ost2 traces for subsequent tests
         writeconf
+        start_mgs
 }
 run_test 21d "start mgs then ost and then mds"
 
@@ -764,6 +765,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
 	check_mount || return 41
 	pass
 
@@ -1980,9 +1983,9 @@ test_46a() {
 	# wait until osts in sync
 	for (( i=2; i<=$OSTCOUNT; i++ )); do
 	    wait_osc_import_state mds ost$i FULL
+	    wait_osc_import_state client ost$i FULL
 	done
 
-
 	#second client see all ost's
 
 	mount_client $MOUNT2 || return 8
@@ -2415,7 +2418,7 @@ test_52() {
 	[ $? -eq 0 ] || { error "Unable to mount client"; return 3; }
 
 	local nrfiles=8
-	local ost1mnt=${MOUNT%/*}/ost1
+	local ost1mnt=$(facet_mntpt ost1)
 	local ost1node=$(facet_active_host ost1)
 	local ost1tmp=$TMP/conf52
 
@@ -2451,6 +2454,8 @@ test_52() {
 	[ $? -eq 0 ] || { error "Unable to stop ost1"; return 11; }
 
 	echo mount ost1 as ldiskfs
+	do_node $ost1node mkdir -p $ost1mnt
+	[ $? -eq 0 ] || { error "Unable to create $ost1mnt"; return 23; }
 	do_node $ost1node mount -t $FSTYPE $ost1_dev $ost1mnt $OST_MOUNT_OPTS
 	[ $? -eq 0 ] || { error "Unable to mount ost1 as ldiskfs"; return 12; }
 
@@ -2473,7 +2478,7 @@ test_52() {
 	diff_files_xattrs $ost1node $ost1tmp/objects $ost1tmp/object_xattrs $objects
 	[ $? -eq 0 ] || { error "Unable to diff objects"; return 16; }
 
-	do_node $ost1node "umount $ost1_dev"
+	do_node $ost1node "umount $ost1mnt"
 	[ $? -eq 0 ] || { error "Unable to umount ost1 as ldiskfs"; return 17; }
 
 	start_ost