- cleanups in sanity-fid.sh

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

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 3ce5dfa..ea054ee 100755 (executable)
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -9,6 +9,8 @@ TMP=${TMP:-/tmp}
 config=$NAME.xml
 mkconfig=$NAME.sh
 
+. krb5_env.sh
+
 if [ "$PORTALS" ]; then
   portals_opt="--portals=$PORTALS"
 fi
@@ -29,23 +31,30 @@ 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 | grep "obd mem.*leaked" | tail -1 | grep -v "leaked: 0"`
-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