X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Foos.sh;h=98d2c183205fe7cbbda2313400746dee69bd08ba;hb=48830f888b651c32bfe4742f3d03fd04b15638a9;hp=b34727ee81730a48abe231f7f3b1cc466210fc1c;hpb=84fc6974a3c77f4adf8df6fc16e15d2856454434;p=fs%2Flustre-release.git

diff --git a/lustre/tests/oos.sh b/lustre/tests/oos.sh
index b34727e..98d2c18 100755
--- a/lustre/tests/oos.sh
+++ b/lustre/tests/oos.sh
@@ -5,6 +5,7 @@ set -e
 
 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}
@@ -41,16 +42,15 @@ export LANG=C LC_LANG=C # for "No space left on device" message
 [ -f $LOG ] && error "log file wasn't removed?"
 
 echo BEFORE dd started
-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))"
-	echo " "
-done
+oos_full || true
 
 # make sure we stripe over all OSTs to avoid OOS on only a subset of OSTs
 $LFS setstripe $OOS -c $STRIPECOUNT
-if dd if=/dev/zero of=$OOS count=$(($ORIGFREE + 100)) bs=1k 2> $LOG; then
+# add 20% of margin since the metadata overhead estimated in bavail might be
+# too aggressive and we might be able to write more than reported initially
+# by statfs.
+echo dd size $((ORIGFREE * 120 / 100))kB
+if dd if=/dev/zero of=$OOS count=$((ORIGFREE * 120 / 100)) bs=1k 2> $LOG; then
 	echo "ERROR: dd did not fail"
 	SUCCESS=0
 fi
@@ -67,18 +67,8 @@ fi
 sync; sleep 1 ; sync
 
 echo AFTER dd
-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
-
-if [ -z "$OSCFULL" ]; then
+if ! oos_full; then
 	echo "no OSTs are close to full"
-	$LCTL get_param "osc.*-osc-*.kbytesavail"
-	$LCTL get_param "osc.*-osc-*.cur*"
 	SUCCESS=0
 fi
 
@@ -95,13 +85,13 @@ fi
 
 #$LCTL debug_daemon stop
 
-echo LOG file
-cat $LOG
+[ $SUCCESS != 0 ] && echo LOG file && sed "s/^/LOG: /" $LOG
 rm -f $OOS
-sync; sleep 1; sync
 
 sync; sleep 3; sync
 
+wait_delete_completed 300
+
 if [ $SUCCESS -eq 1 ]; then
 	echo "Success!"
 	rm -f $LOG