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 <adilger@whamcloud.com>
Change-Id: I26dd91cacc2596f6e84f4c32362befa1e339cab0
Reviewed-on: http://review.whamcloud.com/2007
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Jinshan Xiong <jinshan.xiong@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity-benchmark.sh b/lustre/tests/sanity-benchmark.sh
index e3dd8e6..5eedb00 100644 (file)
--- 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
     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
 }
     rm -f $testfile
     $DEBUG_ON
 }

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index ebc82a1..e2098ed 100644 (file)
--- 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
 
 . ${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
 
 
 FAIL_ON_ERROR=false