X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllmountcleanup.sh;h=ea054ee696ed66df10488f687f20db1f8ef9e073;hb=6f6320cc43ec48f72994c02436909b276497c544;hp=8d4fa522022c233bcafc7f2bfe29683a0ace6b4e;hpb=93acd158c57c4c5d0fc751d46741231490c04707;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 8d4fa52..ea054ee 100755
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,36 +1,60 @@
 #!/bin/sh
 
-LCONF=${LCONF:-../utils/lconf}
+export PATH=`dirname $0`/../utils:$PATH
+
+LCONF=${LCONF:-lconf}
 NAME=${NAME:-local}
 TMP=${TMP:-/tmp}
 
 config=$NAME.xml
 mkconfig=$NAME.sh
 
+. krb5_env.sh
+
 if [ "$PORTALS" ]; then
   portals_opt="--portals=$PORTALS"
 fi
 
-if [ ! -f $config ]; then
-   sh $mkconfig $config || exit 1
+if [ "$LUSTRE" ]; then
+  lustre_opt="--lustre=$LUSTRE"
 fi
 
+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
-${LCONF} $portals_opt --cleanup --dump $TMP/debug $config
+
+[ "$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 -20 | grep -v "leaked: 0" | grep leaked`
-LEAK_PORTALS=`dmesg | tail -20 | grep "Portals memory leaked"`
+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
 
 exit $rc