X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllmountcleanup.sh;h=ea054ee696ed66df10488f687f20db1f8ef9e073;hb=4878172a970b8120517cb98e83414a78192177fa;hp=298d01d53fa62b100c462ed62c0ec6b9fc435414;hpb=cee4763f010a922b5e2b750c10290463d0ef9189;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 298d01d..ea054ee 100755
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,80 +1,60 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`/"
-. $SRCDIR/common.sh
+export PATH=`dirname $0`/../utils:$PATH
 
-TIME=`date +'%s'`
+LCONF=${LCONF:-lconf}
+NAME=${NAME:-local}
+TMP=${TMP:-/tmp}
 
-$DBGCTL debug_kernel /tmp/debug.1.$TIME 1
+config=$NAME.xml
+mkconfig=$NAME.sh
 
-if mount | grep '/mnt/lustre'; then
-	umount /mnt/lustre || fail "cannot unmount"
-fi
-
-killall acceptor
-rmmod llite
-
-$OBDCTL <<EOF
-name2dev MDCDEV
-cleanup
-detach
-name2dev OSCDEV
-cleanup
-detach
-name2dev OSTDEV
-cleanup
-detach
-name2dev OBDDEV
-cleanup
-detach
-name2dev MDSDEV
-cleanup
-detach
-name2dev LDLMDEV
-cleanup
-detach
-name2dev RPCDEV
-cleanup
-detach
-quit
-EOF
-
-rmmod lov
-rmmod obdecho
-rmmod mds_extN
-rmmod mds_ext3
-rmmod mds_ext2
-rmmod mds
-rmmod mdc
-rmmod osc
-rmmod ost
-rmmod obdfilter
-rmmod obdext2
-rmmod ldlm
-rmmod ptlrpc
-rmmod obdclass
-rmmod extN
-
-$DBGCTL debug_kernel /tmp/debug.2.$TIME 1
+. krb5_env.sh
 
-$PTLCTL <<EOF
-setup tcp
-disconnect
-del_uuid self
-del_uuid localhost
-del_uuid localhost
-del_uuid localhost
-quit
-EOF
-
-rmmod kqswnal
-rmmod ksocknal
+if [ "$PORTALS" ]; then
+  portals_opt="--portals=$PORTALS"
+fi
 
-$DBGCTL debug_kernel /tmp/debug.3.$TIME 1
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
+fi
 
-rmmod portals
+if [ "$LDAPURL" ]; then
+    conf_opt="--ldapurl $LDAPURL --config $NAME"
+else
+    if [ ! -f $config ]; then
+	sh $mkconfig $config || exit 1
+    fi
+    conf_opt="$config"
+fi    
+
+[ "$NODE" ] && node_opt="--node $NODE"
+
+sync; sleep 2; sync
+
+[ "$MOUNT2" ] && umount $MOUNT2
+
+${LCONF} $NOMOD $portals_opt $lustre_opt $node_opt --cleanup $@ \
+    --dump $TMP/debug $conf_opt
+rc=$?
+echo "lconf DONE"
+stop_lsvcgssd
+stop_lgssd
+
+BUSY=`dmesg | grep -i destruct`
+if [ "$BUSY" ]; then
+	echo "$BUSY" 1>&2
+	mv $TMP/debug $TMP/debug-busy.`date +%s`
+	exit 255
+fi
+LEAK_LUSTRE=`dmesg | tail -n 30 | grep "obd mem.*leaked"`
+LEAK_PORTALS=`dmesg | tail -n 20 | grep "Portals memory leaked"`
+if [ "$LEAK_LUSTRE" -o "$LEAK_PORTALS" ]; then
+	echo "$LEAK_LUSTRE" 1>&2
+	echo "$LEAK_PORTALS" 1>&2
+	mv $TMP/debug $TMP/debug-leak.`date +%s`
+	exit 254
+fi
+lsmod | grep portals && echo "modules still loaded" && exit 1
 
-losetup -d ${LOOP}0
-losetup -d ${LOOP}1
-losetup -d ${LOOP}2
-exit 0
+exit $rc