Update configurations to set up LDLM where needed.

Convert scripts over to new setup methods where possible to avoid them
becoming increasingly outdated.  Some scripts are already broken, and
I don't use them so I'm not sure whether to remove them or fix them.

Scripts updated are llmount.sh, llrmount.sh, llecho.sh, lldlm.sh,
llmount-client.sh and llmount-server.sh.  They use the default config
scripts net*.cfg, obd*.cfg, ldlm.cfg, mds.cfg as needed to do the same
thing they used to do.

diff --git a/lustre/tests/README b/lustre/tests/README
index 1135e8b..50fa500 100644 (file)
--- a/lustre/tests/README
+++ b/lustre/tests/README
@@ -82,6 +82,7 @@ marcus-obd-server.cfg:
    OSTFS=ext2
    OSTTYPE=obdext2
    SETUP_OST=y
+   SETUP_LDLM=y
 
 As with the echo test, you run "sh llsetup.sh marcus-obd-server.cfg" on
 the server to configure it.
@@ -94,5 +95,6 @@ For marcus-obd-client.cfg you only need to include the client data:
    SETUP_OSC=y
    OSCMT=/mnt/lustre
    SETUP_MOUNT=y
+   SETUP_LDLM=y
 
 You run the test via "sh runtests marcus-obd-client.cfg".

diff --git a/lustre/tests/elan-client.cfg b/lustre/tests/elan-client.cfg
index 1978c12..120b605 100644 (file)
--- a/lustre/tests/elan-client.cfg
+++ b/lustre/tests/elan-client.cfg
@@ -3,8 +3,3 @@
 NETWORK=elan
 LOCALHOST=5
 SERVER=4
-
-[ -z "$RSH" ] && RSH=ssh
-RSH_MDS="$RSH dev$SERVER"
-RSH_OST="$RSH dev$SERVER"
-RSH_OSC=eval

diff --git a/lustre/tests/lldlm.sh b/lustre/tests/lldlm.sh
index d7b5e1d..6c575e1 100755 (executable)
--- a/lustre/tests/lldlm.sh
+++ b/lustre/tests/lldlm.sh
@@ -1,21 +1,13 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
-NETWORK=tcp
-LOCALHOST=localhost
-SERVER=localhost
-PORT=1234
-
-setup_portals
-setup_lustre
-read
+export DEBUG_WAIT=yes
+. $SRCDIR/llsetup.sh $SRCDIR/net-local.cfg $SRCDIR/ldlm.cfg || exit 2
 
 $OBDCTL <<EOF
-device 0
-attach ldlm LDLMDEV
-setup
+name2dev LDLMDEV
 test_ldlm
 quit
 EOF

diff --git a/lustre/tests/llecho.sh b/lustre/tests/llecho.sh
index 950ef71..7296f0d 100644 (file)
--- a/lustre/tests/llecho.sh
+++ b/lustre/tests/llecho.sh
@@ -1,31 +1,13 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
-NETWORK=tcp
-LOCALHOST=localhost
-SERVER=localhost
-PORT=1234
-
-setup_portals
-setup_lustre
-
-$OBDCTL <<EOF
-newdev
-attach obdecho OBDDEV
-setup
-newdev
-attach ost OSTDEV
-setup \$OBDDEV
-newdev
-attach osc OSCDEV
-setup -1
-quit
-EOF
+export DEBUG_WAIT=yes
+. $SRCDIR/llsetup.sh $SRCDIR/net-local.cfg $SRCDIR/obdecho.cfg $SRCDIR/client-echo.cfg
 
 cat <<EOF
 
 run getattr tests as:
-obdctl --device 2 test_getattr 1000000
+$OBDCTL --device `$OBDCTL name2dev OSCDEV` test_getattr 1000000
 EOF

diff --git a/lustre/tests/lllocalmount.sh b/lustre/tests/lllocalmount.sh
deleted file mode 100755 (executable)
index 70e2250..0000000
--- a/lustre/tests/lllocalmount.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-SRCDIR="`dirname $0`"
-. $SRCDIR/common.sh
-
-NETWORK=tcp
-LOCALHOST=localhost
-SERVER=localhost
-PORT=1234
-
-setup_portals
-setup_lustre
-
-new_fs ext2 /tmp/ost 10000
-OST=${LOOPDEV}
-
-MDSFS=ext2
-new_fs ${MDSFS} /tmp/mds 10000
-MDS=${LOOPDEV}
-
-echo 0xffffffff > /proc/sys/portals/debug
-
-$OBDCTL <<EOF
-device 0
-attach mds MDSDEV
-setup ${MDS} ${MDSFS}
-device 1
-attach obdext2 OBDDEV
-setup ${OST}
-device 2
-attach ost OSTDEV
-setup \$OBDDEV
-device 3
-attach osc OSCDEV
-setup 2
-quit
-EOF
-
-# mount -t lustre_lite -o device=3 none /mnt/lustre

diff --git a/lustre/tests/llmount-client.sh b/lustre/tests/llmount-client.sh
index 7c90e9e..503f93f 100644 (file)
--- a/lustre/tests/llmount-client.sh
+++ b/lustre/tests/llmount-client.sh
@@ -1,28 +1,9 @@
 #!/bin/sh
-export PATH=/sbin:/usr/sbin:$PATH
-
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
-NETWORK=tcp
-LOCALHOST=dev5
-SERVER=dev4
-PORT=1234
-
-setup_portals
-setup_lustre
-
-$OBDCTL <<EOF
-device 0
-attach ptlrpc RPCDEV
-setup
-device 1
-attach ldlm LDLMDEV
-setup
-device 2
-attach osc OSCDEV
-setup -1
-quit
-EOF
+export DEBUG_WAIT=yes
+. $SRCDIR/llsetup.sh $SRCDIR/net-client.cfg $SRCDIR/ldlm.cfg $SRCDIR/client-mount.cfg || exit 2
 
-mount -t lustre_lite -o device=2 none /mnt/lustre
+debug_client_on
+#debug_client_off

diff --git a/lustre/tests/llmount-server.sh b/lustre/tests/llmount-server.sh
index e22d80a..d31f033 100644 (file)
--- a/lustre/tests/llmount-server.sh
+++ b/lustre/tests/llmount-server.sh
@@ -1,39 +1,9 @@
 #!/bin/sh
-
-export PATH=/sbin:/usr/sbin:$PATH
-
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
-NETWORK=tcp
-LOCALHOST=dev4
-SERVER=dev4
-PORT=1234
-
-setup_portals
-setup_lustre
-
-new_fs ext2 /tmp/ost 6000000
-OST=${LOOPDEV}
-MDSFS=ext2
-new_fs ${MDSFS} /tmp/mds 50000
-MDS=${LOOPDEV}
+export DEBUG_WAIT=yes
+. $SRCDIR/llsetup.sh $SRCDIR/net-server.cfg $SRCDIR/ldlm.cfg $SRCDIR/mds.cfg $SRCDIR/obdfilter.cfg || exit 2
 
-$OBDCTL <<EOF
-device 0
-attach mds MDSDEV
-setup ${MDS} ${MDSFS}
-device 1
-attach obdext2 OBDDEV
-setup ${OST}
-device 2
-attach ost OSTDEV
-setup \$OBDDEV
-device 3
-attach ptlrpc RPCDEV
-setup
-device 4
-attach ldlm LDLMDEV
-setup
-quit
-EOF
+debug_client_on
+#debug_client_off

diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 410bb3c..09ef437 100755 (executable)
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -1,43 +1,10 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
-NETWORK=tcp
-LOCALHOST=localhost
-SERVER=localhost
-PORT=1234
+export DEBUG_WAIT=yes
+. $SRCDIR/llsetup.sh $SRCDIR/net-local.cfg $SRCDIR/mds.cfg $SRCDIR/obdext2.cfg $SRCDIR/client-mount.cfg $SRCDIR/ldlm.cfg || exit 2
 
-setup_portals
-setup_lustre
-echo -n "Hit return to continue..."
-read
-
-new_fs ext2 /tmp/ost 10001
-OST=$LOOPDEV
-MDSFS=ext3
-new_fs ${MDSFS} /tmp/mds 10001
-MDS=$LOOPDEV
-
-echo 0xffffffff > /proc/sys/portals/debug
-
-$OBDCTL <<EOF
-newdev
-attach mds MDSDEV
-setup ${MDS} ${MDSFS}
-newdev
-attach obdext2 OBDDEV
-setup ${OST}
-newdev
-attach ost OSTDEV
-setup \$OBDDEV
-newdev
-attach ldlm LDLMDEV
-setup
-newdev
-attach osc OSCDEV
-setup -1
-quit
-EOF
-
-mount -t lustre_lite -o device=`$OBDCTL name2dev OSCDEV` none /mnt/lustre
+debug_client_on
+#debug_client_off

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index b9ce682..11de094 100755 (executable)
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
 $DBGCTL get_debug > /tmp/debug.1
 
-if [ "`mount | grep '/mnt/lustre'`" ]; then
+if mount | grep '/mnt/lustre'; then
        umount /mnt/lustre || fail "cannot unmount"
 fi
 
@@ -44,6 +44,7 @@ rmmod obdext2
 rmmod ldlm
 rmmod ptlrpc
 rmmod obdclass
+rmmod extN
 
 $DBGCTL get_debug > /tmp/debug.2
 

diff --git a/lustre/tests/llrmount.sh b/lustre/tests/llrmount.sh
index bf7948a..4376a58 100755 (executable)
--- a/lustre/tests/llrmount.sh
+++ b/lustre/tests/llrmount.sh
@@ -1,41 +1,10 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
-NETWORK=tcp
-LOCALHOST=localhost
-SERVER=localhost
-PORT=1234
+export DEBUG_WAIT=yes
+. $SRCDIR/llrsetup.sh $SRCDIR/net-local.cfg $SRCDIR/client-mount.cfg $SRCDIR/mds.cfg $SRCDIR/obdext2.cfg $SRCDIR/ldlm.cfg || exit 2
 
-setup_portals
-setup_lustre
-
-old_fs ext2 /tmp/ost 80000
-OST=$LOOPDEV
-MDSFS=ext2
-old_fs ${MDSFS} /tmp/mds 10000
-MDS=$LOOPDEV
-
-echo 0xffffffff > /proc/sys/portals/debug
-
-$OBDCTL <<EOF
-newdev
-attach mds MDSDEV
-setup ${MDS} ${MDSFS}
-newdev
-attach obdext2 OBDDEV
-setup ${OST}
-newdev
-attach ost OSTDEV
-setup \$OBDDEV
-newdev
-attach ldlm LDLMDEV
-setup
-newdev
-attach osc OSCDEV
-setup -1
-quit
-EOF
-
-mount -t lustre_lite -o device=`$OBDCTL name2dev OSCDEV` none /mnt/lustre
+debug_client_on
+#debug_client_off

diff --git a/lustre/tests/mdcreqcleanup.sh b/lustre/tests/mdcreqcleanup.sh
index 141d1df..3cacfbd 100755 (executable)
--- a/lustre/tests/mdcreqcleanup.sh
+++ b/lustre/tests/mdcreqcleanup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
 rmmod llite

diff --git a/lustre/tests/mds.cfg b/lustre/tests/mds.cfg
index 7807b33..34a2db0 100644 (file)
--- a/lustre/tests/mds.cfg
+++ b/lustre/tests/mds.cfg
@@ -2,5 +2,5 @@
 # Config file for setting up a metadata server
 MDSFS=ext3
 MDSDEV=/tmp/mds
-MDSSIZE=10000
+MDSSIZE=25000
 SETUP_MDS=y

diff --git a/lustre/tests/net-client.cfg b/lustre/tests/net-client.cfg
index e25c19f..64986ca 100644 (file)
--- a/lustre/tests/net-client.cfg
+++ b/lustre/tests/net-client.cfg
@@ -4,8 +4,3 @@ NETWORK=tcp
 LOCALHOST=dev5
 SERVER=dev4
 PORT=1234
-
-[ -z "$RSH" ] && RSH=ssh
-SERVER_DNS=dev4
-MDS_RSH="$RSH $SERVER_DNS"
-OST_RSH="$RSH $SERVER_DNS"

diff --git a/lustre/tests/obddisk.cfg b/lustre/tests/obddisk.cfg
index 1bafe0a..22e6ef2 100644 (file)
--- a/lustre/tests/obddisk.cfg
+++ b/lustre/tests/obddisk.cfg
@@ -1,6 +1,6 @@
 #!/bin/sh
-# Config file for setting up an object storage target with obdext2
+# Config file for setting up an object storage target with obdfilter
 OSTDEV=/dev/hda7
 OSTFS=ext2
-OSTTYPE=obdext2
+OSTTYPE=obdfilter
 SETUP_OST=y

diff --git a/lustre/tests/obdext2.cfg b/lustre/tests/obdext2.cfg
index 5d127d3..677b8ef 100644 (file)
--- a/lustre/tests/obdext2.cfg
+++ b/lustre/tests/obdext2.cfg
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Config file for setting up an object storage target with obdext2
 OSTDEV=/tmp/ost
-OSTSIZE=10000
+OSTSIZE=25000
 OSTFS=ext2
 OSTTYPE=obdext2
 SETUP_OST=y

diff --git a/lustre/tests/obdfilter.cfg b/lustre/tests/obdfilter.cfg
index ee1504e..24930d5 100644 (file)
--- a/lustre/tests/obdfilter.cfg
+++ b/lustre/tests/obdfilter.cfg
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Config file for setting up an object storage target with obdext2
+# Config file for setting up an object storage target with obdfilter
 OSTDEV=/tmp/ost
 OSTSIZE=10000
 OSTFS=ext2

diff --git a/lustre/tests/ostreq.sh b/lustre/tests/ostreq.sh
index d84bc43..13e3fbc 100644 (file)
--- a/lustre/tests/ostreq.sh
+++ b/lustre/tests/ostreq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
 SERVER=localhost