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 typo in patch.
[fs/lustre-release.git]
/
lustre
/
tests
/
mount2.sh
diff --git
a/lustre/tests/mount2.sh
b/lustre/tests/mount2.sh
index
f1c00b4
..
eaed7e3
100644
(file)
--- a/
lustre/tests/mount2.sh
+++ b/
lustre/tests/mount2.sh
@@
-2,26
+2,21
@@
config=${1:-mount2.xml}
config=${1:-mount2.xml}
-LMC="${LMC:-../utils/lmc} -m $config"
+SRCDIR=`dirname $0`
+PATH=$SRCDIR:$SRCDIR/../utils:$PATH
+LMC="${LMC:-lmc} -m $config"
TMP=${TMP:-/tmp}
TMP=${TMP:-/tmp}
-MDSDEV=${MDSDEV:-$TMP/mds1}
+MDSDEV=${MDSDEV:-$TMP/mds1
-`hostname`
}
MDSSIZE=${MDSSIZE:-50000}
MDSSIZE=${MDSSIZE:-50000}
+MOUNT=${MOUNT:-/mnt/lustre}
+MOUNT1=${MOUNT1:-${MOUNT}1}
+MOUNT2=${MOUNT2:-${MOUNT}2}
+FSTYPE=${FSTYPE:-ext3}
-OSTDEV=${OSTDEV:-$TMP/ost1}
+OSTDEV=${OSTDEV:-$TMP/ost1
-`hostname`
}
OSTSIZE=${OSTSIZE:-200000}
OSTSIZE=${OSTSIZE:-200000}
-kver=`uname -r | cut -d "." -f 1,2`
-
-case $kver in
- 2.4) FSTYPE="--fstype=extN" ;;
- 2.5) FSTYPE="--fstype=ext3" ;;
- *) echo "Kernel version $kver not supported"
- exit 1
- ;;
-esac
-
-
rm -f $config
# create nodes
rm -f $config
# create nodes
@@
-29,11
+24,11
@@
${LMC} --add node --node localhost || exit 10
${LMC} --add net --node localhost --nid localhost --nettype tcp || exit 11
# configure mds server
${LMC} --add net --node localhost --nid localhost --nettype tcp || exit 11
# configure mds server
-${LMC} --add mds --node localhost --mds mds1 --dev $MDSDEV --size $MDSSIZE || exit 20
+${LMC} --add mds --node localhost --mds mds1 --
fstype $FSTYPE --
dev $MDSDEV --size $MDSSIZE || exit 20
# configure ost
# configure ost
-${LMC} --add ost --node localhost --o
bd obd1
--dev $OSTDEV --size $OSTSIZE || exit 30
+${LMC} --add ost --node localhost --o
st ost1 --fstype $FSTYPE
--dev $OSTDEV --size $OSTSIZE || exit 30
# create client config
# create client config
-${LMC} --add mtpt --node localhost --path
/mnt/lustre1 --mds mds1 --obd obd
1 || exit 40
-${LMC} --add mtpt --node localhost --path
/mnt/lustre2 --mds mds1 --obd obd
1 || exit 40
+${LMC} --add mtpt --node localhost --path
$MOUNT1 --mds mds1 --ost ost
1 || exit 40
+${LMC} --add mtpt --node localhost --path
$MOUNT2 --mds mds1 --ost ost
1 || exit 40