X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Foos2.sh;h=6437fa425b8fe0fdfa4ab85501020f9dbd1e2116;hb=5c2e140ae225bdfcff679c95af00d3a98116df74;hp=1eb5dbd3f1fc6970df18d15a3ed3acaa9c66e600;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git

diff --git a/lustre/tests/oos2.sh b/lustre/tests/oos2.sh
index 1eb5dbd..6437fa4 100644
--- a/lustre/tests/oos2.sh
+++ b/lustre/tests/oos2.sh
@@ -2,8 +2,12 @@
 
 set -e
 
-export PATH=`dirname $0`/../utils:$PATH
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+. $LUSTRE/tests/test-framework.sh
+
+export PATH=$LUSTRE/utils:$PATH
 LFS=${LFS:-lfs}
+LCTL=${LCTL:-lctl}
 MOUNT=${MOUNT:-$1}
 MOUNT=${MOUNT:-/mnt/lustre}
 MOUNT2=${MOUNT2:-$2}
@@ -11,7 +15,7 @@ MOUNT2=${MOUNT2:-${MOUNT}2}
 OOS=$MOUNT/oosfile
 OOS2=$MOUNT2/oosfile2
 TMP=${TMP:-/tmp}
-LOG=$TMP/oosfile
+LOG=$TMP/$(basename $0 .sh).log
 LOG2=${LOG}2
 
 SUCCESS=1
@@ -20,21 +24,20 @@ rm -f $OOS $OOS2 $LOG $LOG2
 
 sync; sleep 1; sync	# to ensure we get up-to-date statfs info
 
-STRIPECOUNT=`cat /proc/fs/lustre/lov/*/activeobd | head -n 1`
-ORIGFREE=`cat /proc/fs/lustre/llite/*/kbytesavail | head -n 1`
+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
 
 # make sure we stripe over all OSTs to avoid OOS on only a subset of OSTs
-$LFS setstripe $OOS 65536 -1 $STRIPECOUNT
-$LFS setstripe $OOS2 65536 -1 $STRIPECOUNT
+$LFS setstripe $OOS -c $STRIPECOUNT
+$LFS setstripe $OOS2 -c $STRIPECOUNT
 dd if=/dev/zero of=$OOS count=$((3 * $ORIGFREE / 4 + 100)) bs=1k 2>> $LOG &
 DDPID=$!
 if dd if=/dev/zero of=$OOS2 count=$((3*$ORIGFREE/4 + 100)) bs=1k 2>> $LOG2; then
@@ -46,22 +49,36 @@ if wait $DDPID; then
 	SUCCESS=0
 fi
 
+[ ! -s "$LOG" ] && error "LOG file is empty!"
+[ ! -s "$LOG2" ] && error "LOG2 file is empty!"
+
 if [ "`cat $LOG $LOG2 | grep -c 'No space left on device'`" -ne 2 ]; then
-        echo "ERROR: dd not return ENOSPC"
+	echo "ERROR: dd not return ENOSPC"
 	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-*; do
-	AVAIL=`cat $OSC/kbytesavail`
-	GRANT=`cat $OSC/cur_grant_bytes`
-	[ $(($AVAIL - $GRANT / 1024)) -lt 400 ] && OSCFULL=full
+for OSC in `$LCTL get_param -N osc.*-osc-*.kbytesavail | cut -d"." -f1-2`; do
+	AVAIL=`$LCTL get_param -n $OSC.kbytesavail`
+	GRANT=$((`$LCTL get_param -n $OSC.cur_grant_bytes` / 1024))
+	echo -n "$(echo $OSC | cut -d"." -f2) avl=$AVAIL grnt=$GRANT diff=$(($AVAIL - $GRANT))"
+	[ $(($AVAIL - $GRANT)) -lt 400 ] && OSCFULL=full && echo -n " FULL"
+	echo " "
 done
+
+# FIXME - This test reports false failures
+# The grants from multiple clients need to be added together and compared 
+# against the kbytesavail.
+#/proc/fs/lustre/osc/lustre-OST0001-osc-c3b04200/kbytesavail:16248
+#/proc/fs/lustre/osc/lustre-OST0001-osc-c3b04200/cur_grant_bytes:4313088
+#/proc/fs/lustre/osc/lustre-OST0001-osc-c3b04e00/cur_grant_bytes:12660736
+
 if [ -z "$OSCFULL" ]; then
 	echo "no OSTs are close to full"
-	grep "[0-9]" /proc/fs/lustre/osc/*-osc-*/{kbytesavail,cur*}|tee -a $LOG
+	$LCTL get_param "osc.*-osc-*.kbytesavail"
+	$LCTL get_param "osc.*-osc-*.cur*"
 	SUCCESS=0
 fi
 
@@ -74,7 +91,11 @@ if [ "$RECORDSOUT" -ne $(($FILESIZE / 1024)) ]; then
         SUCCESS=0
 fi
 
+echo LOG LOG2 file
+cat $LOG $LOG2
+
 rm -f $OOS $OOS2
+sync; sleep 1; sync
 
 if [ $SUCCESS -eq 1 ]; then
 	echo "Success!"