From 3ddc0968ec1443f72bf20f0f28f0832c1cafbb2f Mon Sep 17 00:00:00 2001 From: Nathan Rutman Date: Fri, 20 Aug 2010 11:54:56 -0700 Subject: [PATCH] b=22934 fix writeconf, redeux --- lustre/tests/conf-sanity.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 8ea58f3..8f10a87 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -53,14 +53,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 } -- 1.8.3.1