From dd965afc7b618c5c7b5cab26c7e42e229f63ef9f Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Wed, 20 Aug 2008 13:59:21 +0000
Subject: [PATCH] b=16261 i=Adilger MOUNTOPT fix: use MDSOPT and OSTOPT for mds
and ost mkfs options
---
lustre/tests/cfg/local.sh | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 00d5796c2b..e1ccc00d04 100644
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -36,7 +36,6 @@ SUBSYSTEM=${SUBSYSTEM:- 0xffb7e3ff}
L_GETGROUPS=${L_GETGROUPS:-`do_facet mds which l_getgroups || echo`}
MKFSOPT=""
-MOUNTOPT=""
[ "x$MDSJOURNALSIZE" != "x" ] &&
MKFSOPT=$MKFSOPT" -J size=$MDSJOURNALSIZE"
[ "x$MDSISIZE" != "x" ] &&
@@ -44,24 +43,23 @@ MOUNTOPT=""
[ "x$MKFSOPT" != "x" ] &&
MKFSOPT="--mkfsoptions=\\\"$MKFSOPT\\\""
[ "x$mdsfailover_HOST" != "x" ] &&
- MOUNTOPT=$MOUNTOPT" --failnode=`h2$NETTYPE $mdsfailover_HOST`"
+ MDSOPT=$MDSOPT" --failnode=`h2$NETTYPE $mdsfailover_HOST`"
[ "x$STRIPE_BYTES" != "x" ] &&
- MOUNTOPT=$MOUNTOPT" --param lov.stripesize=$STRIPE_BYTES"
+ MDSOPT=$MDSOPT" --param lov.stripesize=$STRIPE_BYTES"
[ "x$STRIPES_PER_OBJ" != "x" ] &&
- MOUNTOPT=$MOUNTOPT" --param lov.stripecount=$STRIPES_PER_OBJ"
+ MDSOPT=$MDSOPT" --param lov.stripecount=$STRIPES_PER_OBJ"
[ "x$L_GETGROUPS" != "x" ] &&
- MOUNTOPT=$MOUNTOPT" --param mdt.group_upcall=$L_GETGROUPS"
-MDS_MKFS_OPTS="--mgs --mdt --fsname=$FSNAME --device-size=$MDSSIZE --param sys.timeout=$TIMEOUT $MKFSOPT $MOUNTOPT $MDSOPT"
+ MDSOPT=$MDSOPT" --param mdt.group_upcall=$L_GETGROUPS"
+MDS_MKFS_OPTS="--mgs --mdt --fsname=$FSNAME --device-size=$MDSSIZE --param sys.timeout=$TIMEOUT $MKFSOPT $MDSOPT"
MKFSOPT=""
-MOUNTOPT=""
[ "x$OSTJOURNALSIZE" != "x" ] &&
MKFSOPT=$MKFSOPT" -J size=$OSTJOURNALSIZE"
[ "x$MKFSOPT" != "x" ] &&
MKFSOPT="--mkfsoptions=\\\"$MKFSOPT\\\""
[ "x$ostfailover_HOST" != "x" ] &&
- MOUNTOPT=$MOUNTOPT" --failnode=`h2$NETTYPE $ostfailover_HOST`"
-OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$TIMEOUT $MKFSOPT $MOUNTOPT $OSTOPT"
+ OSTOPT=$OSTOPT" --failnode=`h2$NETTYPE $ostfailover_HOST`"
+OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$TIMEOUT $MKFSOPT $OSTOPT"
MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-"-o loop"}
OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"-o loop"}
--
GitLab