From: Manoj Joseph <Manoj.Joseph@Sun.COM>
Date: Thu, 11 Mar 2010 22:39:56 +0000 (-0700)
Subject: b=20837 incomplete test output for ost-pools
X-Git-Tag: v1_8_2_52~3
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=435d49f388d1566fbcff191b5fe78d7314ef2145;p=fs%2Flustre-release.git

b=20837 incomplete test output for ost-pools

i=nathan.rutman
i=grev

Instead of creating many 10M files to fill the OST, create 9 files
of size OST_SIZE/10 each.
---

diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh
index 45ff7cd..2699b46 100644
--- a/lustre/tests/ost-pools.sh
+++ b/lustre/tests/ost-pools.sh
@@ -801,20 +801,20 @@ test_14() {
         i=$((i+1))
     done
 
-    # Fill OST $TGT_FIRST with 10M files
+    # Fill up OST0 until it is nearly full.
+    # Create 9 files of size OST0_SIZE/10 each.
     create_dir $POOL_ROOT/dir2 $POOL2 1
-    RC=0
-    i=0
-    while [[ $RC -eq 0 ]];
+    $LFS df $POOL_ROOT/dir2
+    echo "Filling up OST0"
+    OST0_SIZE=`$LFS df $POOL_ROOT/dir2 | awk '/\[OST:0\]/ {print $4}'`
+    FILE_SIZE=$((OST0_SIZE/1024/10))
+    i=1
+    while [[ $i -lt 10 ]];
     do
-      dd if=/dev/zero of=$POOL_ROOT/dir2/f${i} bs=1k count=$((1024*10))
-      RC=$?
+      dd if=/dev/zero of=$POOL_ROOT/dir2/f${i} bs=1M count=$FILE_SIZE
       i=$((i+1))
     done
-
-    # Leave some space on the OST
-    rm -f $POOL_ROOT/dir2/f0
-    df -h /mnt/ost?
+    $LFS df $POOL_ROOT/dir2
 
     # OST $TGT_FIRST is no longer favored; but it may still be used.
     create_dir $POOL_ROOT/dir3 $POOL 1