LU-13960 tests: correct usage of _var variable

[fs/lustre-release.git] / lustre / tests / sanity-benchmark.sh

diff --git a/lustre/tests/sanity-benchmark.sh b/lustre/tests/sanity-benchmark.sh
index 5ea7a0c..ee57119 100644 (file)
--- a/lustre/tests/sanity-benchmark.sh
+++ b/lustre/tests/sanity-benchmark.sh
@@ -107,6 +107,7 @@ test_iozone() {
     export O_DIRECT
     
     local IOZDIR=$DIR/d0.iozone
+    wait_delete_completed || true
     mkdir -p $IOZDIR
     $LFS setstripe -c -1 $IOZDIR
     sync
@@ -129,6 +130,7 @@ test_iozone() {
     tail -1 $IOZLOG | grep -q complete || \
        { error "iozone (1) failed" && return 1; }
     rm -f $IOZLOG
+    wait_delete_completed || true
     $DEBUG_ON
     
     # check if O_DIRECT support is implemented in kernel
@@ -139,6 +141,7 @@ test_iozone() {
            O_DIRECT=no
        fi
        rm -f $DIR/f.iozone
+       wait_delete_completed || true
     fi
     if [ "$O_DIRECT" != "no" -a "$IOZONE_DIR" != "no" ]; then
        $DEBUG_OFF
@@ -146,6 +149,7 @@ test_iozone() {
        tail -1 $IOZLOG | grep -q complete || \
            { error "iozone (2) failed" && return 1; }
        rm -f $IOZLOG
+       wait_delete_completed || true
        $DEBUG_ON
     fi
 
@@ -166,6 +170,7 @@ test_iozone() {
        tail -1 $IOZLOG | grep -q complete || \
            { error "iozone (3) failed" && return 1; }
        rm -f $IOZLOG
+       wait_delete_completed || true
        $DEBUG_ON
     elif [ $IOZVER -lt 3145 ]; then
        VER=`iozone -v | awk '/Revision:/ { print $3 }'`
@@ -175,21 +180,22 @@ test_iozone() {
 run_test iozone "iozone"
 
 test_fsx() {
-    local testfile=$DIR/f0.fsxfile
-    FSX_SIZE=$SIZE
-    FSX_COUNT=1000
-    local SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
-    [ $SPACE -lt $FSX_SIZE ] && FSX_SIZE=$((SPACE * 3 / 4))
-    $DEBUG_OFF
-    FSX_SEED=${FSX_SEED:-$RANDOM}
-    rm -f $testfile
-    $LFS setstripe -c -1 $testfile
-    CMD="fsx -c 50 -p 1000 -S $FSX_SEED -P $TMP -l $FSX_SIZE \
-        -N $((FSX_COUNT * 100)) $FSXOPT $testfile"
-    echo "Using: $CMD"
-    $CMD || error "fsx failed"
-    rm -f $testfile
-    $DEBUG_ON
+       local testfile=$DIR/f0.fsxfile
+       FSX_SIZE=$SIZE
+       FSX_COUNT=1000
+       local SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
+
+       [ $SPACE -lt $FSX_SIZE ] && FSX_SIZE=$((SPACE * 3 / 4))
+       $DEBUG_OFF
+       FSX_SEED=${FSX_SEED:-$RANDOM}
+       rm -f $testfile
+       $LFS setstripe -c -1 $testfile
+       CMD="fsx -c 50 -p 1000 -S $FSX_SEED -P $TMP -l $FSX_SIZE \
+       -N $((FSX_COUNT * 100)) $FSXOPT $testfile"
+       echo "Using: $CMD"
+       $CMD || error "fsx failed"
+       rm -f $testfile
+       $DEBUG_ON
 }
 run_test fsx "fsx"