land b1_5 onto HEAD

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

diff --git a/lustre/tests/oos.sh b/lustre/tests/oos.sh
index 1d068d5..3da2ceb 100755 (executable)
--- a/lustre/tests/oos.sh
+++ b/lustre/tests/oos.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -e
-set -vx
+#set -vx
 
 export PATH=`dirname $0`/../utils:$PATH
 LFS=${LFS:-lfs}
@@ -13,18 +13,18 @@ LOG=$TMP/ooslog
 
 SUCCESS=1
 
-rm -f $OOS
+rm -f $OOS $LOG
 
-sleep 1        # to ensure we get up-to-date statfs info
+sync; sleep 1; sync    # to ensure we get up-to-date statfs info
 
-#echo -1 > /proc/sys/portals/debug
-#echo 0x40a8 > /proc/sys/portals/subsystem_debug
+#echo -1 > /proc/sys/lnet/debug
+#echo 0x40a8 > /proc/sys/lnet/subsystem_debug
 #lctl clear
 #lctl debug_daemon start /r/tmp/debug 1024
 
 STRIPECOUNT=`cat /proc/fs/lustre/lov/*/activeobd | head -n 1`
 ORIGFREE=`cat /proc/fs/lustre/llite/*/kbytesavail | head -n 1`
-MAXFREE=${MAXFREE:-$((200000 * $STRIPECOUNT))}
+MAXFREE=${MAXFREE:-$((400000 * $STRIPECOUNT))}
 if [ $ORIGFREE -gt $MAXFREE ]; then
        echo "skipping out-of-space test on $OSC"
        echo "reports ${ORIGFREE}kB free, more tham MAXFREE ${MAXFREE}kB"
@@ -34,7 +34,6 @@ fi
 
 export LANG=C LC_LANG=C # for "No space left on device" message
 
-rm -f $LOG >/dev/null 2>&1
 [ -f $LOG ] && echo "ERROR: log file wasn't removed?" && exit 1
 
 # make sure we stripe over all OSTs to avoid OOS on only a subset of OSTs
@@ -45,14 +44,15 @@ if dd if=/dev/zero of=$OOS count=$(($ORIGFREE + 100)) bs=1k 2> $LOG; then
 fi
 
 if [ "`grep -c 'No space left on device' $LOG`" -ne 1 ]; then
-        echo "ERROR: dd not return ENOSPC"
+       echo "ERROR: dd not return ENOSPC"
+       sed "s/^/LOG: /" $LOG
        SUCCESS=0
 fi
 
 # flush cache to OST(s) so avail numbers are correct
 sync; sleep 1 ; sync
 
-for OSC in /proc/fs/lustre/osc/OSC*MNT*; do
+for OSC in /proc/fs/lustre/osc/*-osc-*; do
        AVAIL=`cat $OSC/kbytesavail`
        GRANT=`cat $OSC/cur_grant_bytes`
        [ $(($AVAIL - $GRANT / 1024)) -lt 400 ] && OSCFULL=full
@@ -60,16 +60,19 @@ done
 
 if [ -z "$OSCFULL" ]; then
        echo "no OSTs are close to full"
-       grep [0-9] /proc/fs/lustre/osc/OSC*MNT*/{kbytesavail,cur*}
+       grep "[0-9]" /proc/fs/lustre/osc/*-osc-*/{kbytesavail,cur*}
        SUCCESS=0
 fi
 
 RECORDSOUT=`grep "records out" $LOG | cut -d + -f1`
-
 FILESIZE=`ls -l $OOS | awk '{ print $5 }'`
-if [ $RECORDSOUT -ne $(($FILESIZE / 1024)) ]; then
-        echo "ERROR: blocks written by dd not equal to the size of file"
-        SUCCESS=0
+if [ -z "$RECORDSOUT" ]; then
+       echo "ERROR: no blocks written by dd?"
+       sed "s/^/LOG: /" $LOG
+       SUCCESS=0
+elif [ "$RECORDSOUT" -ne $((FILESIZE / 1024)) ]; then
+       echo "ERROR: blocks written by dd not equal to the size of file"
+       SUCCESS=0
 fi
 
 #lctl debug_daemon stop
@@ -78,6 +81,7 @@ rm -f $OOS
 
 if [ $SUCCESS -eq 1 ]; then
        echo "Success!"
+       rm -f $LOG
 else
        exit 1
 fi