X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Foos.sh;h=98d2c183205fe7cbbda2313400746dee69bd08ba;hb=c52d48bf7838c8d9a886a8865017e150e294d91c;hp=c547b635f0d014e0d5e0b7bc893e14d6014801b2;hpb=306dde62ff051efba7d48a2f1281d578e5e55d80;p=fs%2Flustre-release.git

diff --git a/lustre/tests/oos.sh b/lustre/tests/oos.sh
index c547b63..98d2c18 100755
--- a/lustre/tests/oos.sh
+++ b/lustre/tests/oos.sh
@@ -46,7 +46,11 @@ 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
@@ -81,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