X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Foos.sh;h=c547b635f0d014e0d5e0b7bc893e14d6014801b2;hp=1d068d536251e6e06e571b6153ba9d439a2e38f9;hb=04d23a7f3dac333c3dad238ebbd7d978421089b4;hpb=7ce2000eb0f4e7b7ea1f362c17099881098cfef7

diff --git a/lustre/tests/oos.sh b/lustre/tests/oos.sh
index 1d068d5..c547b63 100755
--- a/lustre/tests/oos.sh
+++ b/lustre/tests/oos.sh
@@ -1,83 +1,96 @@
 #!/bin/bash
 
 set -e
-set -vx
+#set -vx
+
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+. $LUSTRE/tests/test-framework.sh
+. ${CONFIG:=$LUSTRE/tests/cfg/${NAME}.sh}
 
 export PATH=`dirname $0`/../utils:$PATH
 LFS=${LFS:-lfs}
+LCTL=${LCTL:-lctl}
 MOUNT=${MOUNT:-$1}
 MOUNT=${MOUNT:-/mnt/lustre}
 OOS=$MOUNT/oosfile
 TMP=${TMP:-/tmp}
-LOG=$TMP/ooslog
+LOG=$TMP/$(basename $0 .sh).log
 
 SUCCESS=1
 
-rm -f $OOS
+rm -f $OOS $LOG
+
+sync; sleep 1; sync	# to ensure we get up-to-date statfs info
 
-sleep 1	# to ensure we get up-to-date statfs info
+#$LCTL set_param -n debug=-1
+#$LCTL set_param -n subsystem_debug=0x40a8
 
-#echo -1 > /proc/sys/portals/debug
-#echo 0x40a8 > /proc/sys/portals/subsystem_debug
-#lctl clear
-#lctl debug_daemon start /r/tmp/debug 1024
+#$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))}
+STRIPECOUNT=`$LCTL get_param -n lov.*.activeobd | head -n 1`
+ORIGFREE=`$LCTL get_param -n llite.*.kbytesavail | head -n 1`
+MAXFREE=${MAXFREE:-$((400000 * $STRIPECOUNT))}
+echo STRIPECOUNT=$STRIPECOUNT ORIGFREE=$ORIGFREE MAXFREE=$MAXFREE
 if [ $ORIGFREE -gt $MAXFREE ]; then
-	echo "skipping out-of-space test on $OSC"
-	echo "reports ${ORIGFREE}kB free, more tham MAXFREE ${MAXFREE}kB"
-	echo "increase $MAXFREE (or reduce test fs size) to proceed"
+	skip "$0: ${ORIGFREE}kB free gt MAXFREE ${MAXFREE}kB, increase $MAXFREE (or reduce test fs size) to proceed"
 	exit 0
 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
+[ -f $LOG ] && error "log file wasn't removed?"
+
+echo BEFORE dd started
+oos_full || true
 
 # make sure we stripe over all OSTs to avoid OOS on only a subset of OSTs
-$LFS setstripe $OOS 65536 0 $STRIPECOUNT
+$LFS setstripe $OOS -c $STRIPECOUNT
 if dd if=/dev/zero of=$OOS count=$(($ORIGFREE + 100)) bs=1k 2> $LOG; then
 	echo "ERROR: dd did not fail"
 	SUCCESS=0
 fi
 
+[ ! -s "$LOG" ] && error "LOG file is empty!"
+
 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
-	AVAIL=`cat $OSC/kbytesavail`
-	GRANT=`cat $OSC/cur_grant_bytes`
-	[ $(($AVAIL - $GRANT / 1024)) -lt 400 ] && OSCFULL=full
-done
-
-if [ -z "$OSCFULL" ]; then
+echo AFTER dd
+if ! oos_full; then
 	echo "no OSTs are close to full"
-	grep [0-9] /proc/fs/lustre/osc/OSC*MNT*/{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
+#$LCTL debug_daemon stop
 
+echo LOG file
+cat $LOG
 rm -f $OOS
+sync; sleep 1; sync
+
+sync; sleep 3; sync
 
 if [ $SUCCESS -eq 1 ]; then
 	echo "Success!"
+	rm -f $LOG
 else
 	exit 1
 fi