- repair lmv.sh - it was broken for months

[fs/lustre-release.git] / lustre / tests / local.sh

diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh
index 44fa4b9..5f5df4e 100755 (executable)
--- a/lustre/tests/local.sh
+++ b/lustre/tests/local.sh
@@ -7,37 +7,21 @@ config=${1:-local.xml}
 LMC="${LMC:-lmc} -m $config"
 TMP=${TMP:-/tmp}
 
-FSTYPE=${FSTYPE:-ext3}
-
 MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
-MDSSIZE=${MDSSIZE:-100000}
 
+MDSSIZE=${MDSSIZE:-400000}
+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}
-NETWORKTYPE=${NETWORKTYPE:-tcp}
+NETTYPE=${NETTYPE:-tcp}
 
 OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
-OSTSIZE=${OSTSIZE:-200000}
-
-MDS_BACKFSTYPE=${MDS_BACKFSTYPE:-ext3}
-OST_BACKFSTYPE=${OST_BACKFSTYPE:-ext3}
-
-MDS_BACKDEV=${MDS_BACKDEV:-$TMP/mds1-`hostname`}
-OST_BACKDEV=${OST_BACKDEV:-$TMP/ost1-`hostname`}
+OSTSIZE=${OSTSIZE:-400000}
 
-MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS:-"errors=remount-ro"}
-OST_MOUNT_OPTS=${OST_MOUNT_OPTS:-"errors=remount-ro"}
-
-# adding some options needed for ext3 on 2.4.x kernels
-if test "x$(uname -r | sed -e 's/-.*//' -e 's/\.[[:digit:]]*$//')" = "x2.4"; then
-    if test "x$FSTYPE" = "xext3" || test "x$FSTYPE" = "xldiskfs"; then
-       if test "x$OST_MOUNT_OPTS" = "x"; then
-           OST_MOUNT_OPTS="asyncdel"
-       else
-           OST_MOUNT_OPTS="$OST_MOUNT_OPTS,asyncdel"
-       fi
-    fi
-fi
+MDS_BACKFSTYPE=${MDS_BACKFSTYPE:-$DEF_FSTYPE}
+OST_BACKFSTYPE=${OST_BACKFSTYPE:-$DEF_FSTYPE}
 
 # specific journal size for the ost, in MB
 JSIZE=${JSIZE:-0}
@@ -45,35 +29,55 @@ JSIZE=${JSIZE:-0}
 MDSISIZE=${MDSISIZE:-0}
 [ "$MDSISIZE" -gt 0 ] && IARG="--inode_size $MDSISIZE"
 
-STRIPE_BYTES=65536
+STRIPE_BYTES=1048576
 STRIPES_PER_OBJ=0      # 0 means stripe over all OSTs
 
 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
-${LMC} --add net --node  localhost --nid `hostname` --nettype $NETWORKTYPE || exit 11
-${LMC} --add net --node client --nid '*' --nettype $NETWORKTYPE || exit 12
+${LMC} --add net --node  localhost --nid `local_nid` --nettype $NETTYPE || exit 11
+${LMC} --add net --node client --nid '*' --nettype $NETTYPE || exit 12
+
 
-echo "MDS mount options are: $MDS_MOUNT_OPTS"
+[ "x$MDS_MOUNT_OPTS" != "x" ] &&
+    MDS_MOUNT_OPTS="--mountfsoptions $MDS_MOUNT_OPTS"
 
 # configure mds server
 ${LMC} --add mds --nspath /mnt/mds_ns --node localhost --mds mds1 \
 --fstype $FSTYPE --backfstype $MDS_BACKFSTYPE --dev $MDSDEV \
---backdev $MDS_BACKDEV --mountfsoptions $MDS_MOUNT_OPTS \
---size $MDSSIZE $JARG $IARG || exit 20
+$MDS_MOUNT_OPTS --size $MDSSIZE $JARG $IARG || exit 20
 
-echo "OST mount options are: $OST_MOUNT_OPTS"
+[ "x$OST_MOUNT_OPTS" != "x" ] &&
+    OST_MOUNT_OPTS="--mountfsoptions $OST_MOUNT_OPTS"
 
 # configure ost
 ${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 --mountfsoptions $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
-${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