From 4fe61d47696202fc5a7d85f884425cfdc2dc009b Mon Sep 17 00:00:00 2001 From: grev Date: Fri, 24 Oct 2008 20:44:19 +0000 Subject: [PATCH] b=17477 i=Adilger i=Tappro init facets vars for mounted lustre --- lustre/tests/test-framework.sh | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index e0475b6..2cbf793 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -977,6 +977,37 @@ mounted_lustre_filesystems() { awk '($3 ~ "lustre" && $1 ~ ":") { print $2 }' /proc/mounts } +init_facet_vars () { + local facet=$1 + shift + local device=$1 + + shift + + eval export ${facet}_dev=${device} + eval export ${facet}_opt=\"$@\" + + local dev=${facet}_dev + local label=$(do_facet ${facet} "e2label ${!dev}") + [ -z "$label" ] && echo no label for ${!dev} && exit 1 + + eval export ${facet}_svc=${label} + + local varname=${facet}failover_HOST + if [ -z "${!varname}" ]; then + eval $varname=$(facet_host $facet) + fi +} + +init_facets_vars () { + init_facet_vars mds $MDSDEV $MDS_MOUNT_OPTS + + for num in `seq $OSTCOUNT`; do + DEVNAME=`ostdevname $num` + init_facet_vars ost$num $DEVNAME $OST_MOUNT_OPTS + done +} + check_and_setup_lustre() { MOUNTED="`mounted_lustre_filesystems`" if [ -z "$MOUNTED" ]; then @@ -985,6 +1016,8 @@ check_and_setup_lustre() { MOUNTED="`mounted_lustre_filesystems`" [ -z "$MOUNTED" ] && error "NAME=$NAME not mounted" export I_MOUNTED=yes + else + init_facets_vars fi if [ "$ONLY" == "setup" ]; then exit 0 -- 1.8.3.1