From df764443d452c1db1db5e72f72c9ad6e0819f567 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 24 Jan 2012 13:22:08 -0700 Subject: [PATCH 1/1] LU-1028 tests: re-enable sanityn.sh test_16 (fsx) The sanityn.sh version of fsx in test_16 provides useful test coverage because it is running an IO load that is doing unaligned file access from multiple clients (mountpoints) and also verifying data correctness. This has exposed several bugs in the orion branch, and should also be enabled by default for all landings on master. A longer version of the test is run in sanity-benchmark.sh for better test coverage. Check that fsx completes successfully, otherwise it may fail without reporting an error to the test framework. Signed-off-by: Andreas Dilger Change-Id: I26dd91cacc2596f6e84f4c32362befa1e339cab0 Reviewed-on: http://review.whamcloud.com/2007 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Jinshan Xiong Reviewed-by: Oleg Drokin --- lustre/tests/sanity-benchmark.sh | 7 ++++--- lustre/tests/sanityn.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity-benchmark.sh b/lustre/tests/sanity-benchmark.sh index e3dd8e6..5eedb00 100644 --- a/lustre/tests/sanity-benchmark.sh +++ b/lustre/tests/sanity-benchmark.sh @@ -193,9 +193,10 @@ test_fsx() { FSX_SEED=${FSX_SEED:-$RANDOM} rm -f $testfile $LFS setstripe -c -1 $testfile - echo Using FSX_SEED=$FSX_SEED FSX_SIZE=$FSX_SIZE FSX_COUNT=$FSX_COUNT - fsx -c 50 -p 1000 -S $FSX_SEED -P $TMP -l $FSX_SIZE \ - -N $(($FSX_COUNT * 100)) $testfile + CMD="fsx -c 50 -p 1000 -S $FSX_SEED -P $TMP -l $FSX_SIZE \ + -N $((FSX_COUNT * 100)) $testfile" + echo "Using: $CMD" + $CMD || error "fsx failed" rm -f $testfile $DEBUG_ON } diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index ebc82a1..e2098ed 100644 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -43,7 +43,7 @@ init_test_env $@ . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} init_logging -[ "$SLOW" = "no" ] && EXCEPT_SLOW="12 16 23 33a" +[ "$SLOW" = "no" ] && EXCEPT_SLOW="12 23 33a" FAIL_ON_ERROR=false -- 1.8.3.1