From: Nathan Rutman <nathan.rutman@oracle.com>
Date: Thu, 19 Aug 2010 21:40:05 +0000 (+0400)
Subject: b=22934 fix writeconf testing: require modules for tunefs, don't use SINGLEMDS
X-Git-Tag: 2.0.51.0~45
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e043abca9dfa8cacf10d95e5dde9c79258cc1cc4

b=22934 fix writeconf testing: require modules for tunefs, don't use SINGLEMDS

i=johann
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index c4565e7..1e7c8a6 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -60,14 +60,16 @@ writeconf1() {
 	stop ${facet} -f
 	rm -f ${facet}active
 	# who knows if/where $TUNEFS is installed?  Better reformat if it fails...
-	do_facet ${facet} "$TUNEFS --writeconf $dev" ||
+	do_facet ${facet} "$TUNEFS --quiet --writeconf $dev" ||
 		{ echo "tunefs failed, reformatting instead" && reformat_and_config && return 1; }
 	return 0
 }
 
 writeconf() {
-	# if writeconf failed, we reformatted
-	writeconf1 mds $MDSDEV || return 0
+	# 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
 }