X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=4bf271cdd2193475d341e7f50b6cd977ba0360e9;hp=6d95b786d56d5b06bbad55a57c03da2b52001fa3;hb=aa3300dddd42bc0a1cc6eeeeeebf850c6349a7b6;hpb=d675a1fe48be5d86a3fdb9ccc9542a748cc007a0

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 6d95b78..4bf271cd 100755
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -5134,23 +5134,30 @@ test_72() { #LU-2634
 	local ostdev=$(ostdevname 1)
 	local cmd="$E2FSCK -fnvd $mdsdev"
 	local fn=3
+	local add_options
 
 	[ "$(facet_fstype $SINGLEMDS)" != "ldiskfs" ] &&
 		skip "ldiskfs only test" && return
 
+	if combined_mgs_mds; then
+		add_options='--reformat'
+	else
+		add_options='--reformat --replace'
+	fi
+
 	#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) ||
+			$add_options $(mdsdevname $num) $(mdsvdevname $num) ||
 			error "add mds $num failed"
 		do_facet mds${num} "$TUNE2FS -O extents $(mdsdevname $num)" ||
 			error "$TUNE2FS failed on mds${num}"
 	done
 
-	add ost1 $(mkfs_opts ost1 $ostdev) --reformat $ostdev ||
+	add ost1 $(mkfs_opts ost1 $ostdev) $add_options $ostdev ||
 		error "add $ostdev failed"
-	start_mgsmds || error "start mds failed"
+	start_mds || error "start mds failed"
 	start_ost || error "start ost failed"
 	mount_client $MOUNT || error "mount client failed"