From 45c80df5a18434e6a80a8ccb6e9b06f354abcf41 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Fri, 24 Oct 2008 20:46:31 +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 45d67a31f8..1bde9b10a4 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -978,6 +978,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
@@ -986,6 +1017,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
--
GitLab