Branch b1_6

Make sure that the unlinked file actually releases all of the blocks on
disk, otherwise the next test may fail with ENOSPC.
b=12507

diff --git a/lustre/tests/oos.sh b/lustre/tests/oos.sh
index 3da2ceb..31ac3ab 100755 (executable)
--- a/lustre/tests/oos.sh
+++ b/lustre/tests/oos.sh
@@ -78,6 +78,7 @@ fi
 #lctl debug_daemon stop
 
 rm -f $OOS
+sync; sleep 1; sync
 
 if [ $SUCCESS -eq 1 ]; then
        echo "Success!"

diff --git a/lustre/tests/oos2.sh b/lustre/tests/oos2.sh
index 60772c4..580fad2 100644 (file)
--- a/lustre/tests/oos2.sh
+++ b/lustre/tests/oos2.sh
@@ -83,6 +83,7 @@ if [ "$RECORDSOUT" -ne $(($FILESIZE / 1024)) ]; then
 fi
 
 rm -f $OOS $OOS2
+sync; sleep 1; sync
 
 if [ $SUCCESS -eq 1 ]; then
        echo "Success!"