Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix in lmv.sh to use it along with sanityN.sh
[fs/lustre-release.git]
/
lustre
/
tests
/
local.sh
diff --git
a/lustre/tests/local.sh
b/lustre/tests/local.sh
index
f3d7d2e
..
5f5df4e
100755
(executable)
--- a/
lustre/tests/local.sh
+++ b/
lustre/tests/local.sh
@@
-10,8
+10,9
@@
TMP=${TMP:-/tmp}
MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
MDSSIZE=${MDSSIZE:-400000}
MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
MDSSIZE=${MDSSIZE:-400000}
-FSTYPE=${FSTYPE:-ext3}
-
+DEF_FSTYPE=`test "x$(uname -r | grep -o '2.6')" = "x2.6" && echo "ldiskfs" || echo "ext3"`
+FSTYPE=${FSTYPE:-$DEF_FSTYPE}
+OST_FSTYPE=${OST_FSTYPE:-$FSTYPE}
MOUNT=${MOUNT:-/mnt/lustre}
MOUNT2=${MOUNT2:-${MOUNT}2}
NETTYPE=${NETTYPE:-tcp}
MOUNT=${MOUNT:-/mnt/lustre}
MOUNT2=${MOUNT2:-${MOUNT}2}
NETTYPE=${NETTYPE:-tcp}
@@
-19,11
+20,8
@@
NETTYPE=${NETTYPE:-tcp}
OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
OSTSIZE=${OSTSIZE:-400000}
OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
OSTSIZE=${OSTSIZE:-400000}
-MDS_BACKFSTYPE=${MDS_BACKFSTYPE:-ext3}
-OST_BACKFSTYPE=${OST_BACKFSTYPE:-ext3}
-
-MDS_BACKDEV=${MDS_BACKDEV:-$TMP/mds1-`hostname`}
-OST_BACKDEV=${OST_BACKDEV:-$TMP/ost1-`hostname`}
+MDS_BACKFSTYPE=${MDS_BACKFSTYPE:-$DEF_FSTYPE}
+OST_BACKFSTYPE=${OST_BACKFSTYPE:-$DEF_FSTYPE}
# specific journal size for the ost, in MB
JSIZE=${JSIZE:-0}
# specific journal size for the ost, in MB
JSIZE=${JSIZE:-0}
@@
-36,9
+34,28
@@
STRIPES_PER_OBJ=0 # 0 means stripe over all OSTs
rm -f $config
rm -f $config
+#
+# duplicated form test-framework.sh
+#
+h2tcp() {
+ echo $1
+}
+h2elan() {
+ echo $1 | sed 's/[^0-9]*//g'
+}
+h2openib() {
+ echo $1 | sed 's/[^0-9]*//g'
+}
+
+local_nid() {
+ hostname=`hostname`
+ nid=`h2$NETTYPE $hostname`
+ echo $nid
+}
+
# create nodes
${LMC} --add node --node localhost || exit 10
# create nodes
${LMC} --add node --node localhost || exit 10
-${LMC} --add net --node localhost --nid `
hostname
` --nettype $NETTYPE || exit 11
+${LMC} --add net --node localhost --nid `
local_nid
` --nettype $NETTYPE || exit 11
${LMC} --add net --node client --nid '*' --nettype $NETTYPE || exit 12
${LMC} --add net --node client --nid '*' --nettype $NETTYPE || exit 12
@@
-48,7
+65,7
@@
${LMC} --add net --node client --nid '*' --nettype $NETTYPE || exit 12
# configure mds server
${LMC} --add mds --nspath /mnt/mds_ns --node localhost --mds mds1 \
--fstype $FSTYPE --backfstype $MDS_BACKFSTYPE --dev $MDSDEV \
# configure mds server
${LMC} --add mds --nspath /mnt/mds_ns --node localhost --mds mds1 \
--fstype $FSTYPE --backfstype $MDS_BACKFSTYPE --dev $MDSDEV \
-
--backdev $MDS_BACKDEV
$MDS_MOUNT_OPTS --size $MDSSIZE $JARG $IARG || exit 20
+$MDS_MOUNT_OPTS --size $MDSSIZE $JARG $IARG || exit 20
[ "x$OST_MOUNT_OPTS" != "x" ] &&
OST_MOUNT_OPTS="--mountfsoptions $OST_MOUNT_OPTS"
[ "x$OST_MOUNT_OPTS" != "x" ] &&
OST_MOUNT_OPTS="--mountfsoptions $OST_MOUNT_OPTS"
@@
-57,10
+74,10
@@
${LMC} --add mds --nspath /mnt/mds_ns --node localhost --mds mds1 \
${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES \
--stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES \
--stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
-${LMC} --add ost --nspath /mnt/ost_ns --node localhost --lov lov1 \
---fstype $FSTYPE --backfstype $OST_BACKFSTYPE --dev $OSTDEV \
-
--backdev $OST_BACKDEV
$OST_MOUNT_OPTS --size $OSTSIZE $JARG || exit 30
+${LMC} --add ost --
ost ost1 --
nspath /mnt/ost_ns --node localhost --lov lov1 \
+--fstype $
OST_
FSTYPE --backfstype $OST_BACKFSTYPE --dev $OSTDEV \
+$OST_MOUNT_OPTS --size $OSTSIZE $JARG || exit 30
# create client config
# create client config
-${LMC} --add mtpt --node localhost --path $MOUNT --mds mds1 --lov lov1 || exit 40
-${LMC} --add mtpt --node client --path $MOUNT2 --mds mds1 --lov lov1 || exit 41
+${LMC} --add mtpt --node localhost --path $MOUNT --
clientoptions async --
mds mds1 --lov lov1 || exit 40
+${LMC} --add mtpt --node client --path $MOUNT2 --mds mds1 --
clientoptions async --
lov lov1 || exit 41