From b0ebe1cf73a46b427c6b0e42bd8d288d79b3be8e Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Mon, 30 May 2016 14:45:51 +0400 Subject: [PATCH] LU-8215 tests: sanity-benchmark/iozone should wait for space recovery otherwise it may fail due to a transient state where the space confsumed by the previous run hasn't recovered yet. this happens to tiny filesystems used in local setups. Change-Id: I04b3ce096621583629277c1e52c64a1551bc8ace Signed-off-by: Alex Zhuravlev Reviewed-on: https://review.whamcloud.com/20499 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/sanity-benchmark.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lustre/tests/sanity-benchmark.sh b/lustre/tests/sanity-benchmark.sh index 5ea7a0c..370afae 100644 --- 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 }'` -- 1.8.3.1