X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-benchmark.sh;h=b01dc450de7bce702ab44382ed3b3fc6b82f9fc9;hb=61138e82b52b19ab2a73398c2a238410ed559198;hp=370afae292ac35344421ad145512d2c324e516a6;hpb=b0ebe1cf73a46b427c6b0e42bd8d288d79b3be8e;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-benchmark.sh b/lustre/tests/sanity-benchmark.sh
index 370afae..b01dc45 100644
--- a/lustre/tests/sanity-benchmark.sh
+++ b/lustre/tests/sanity-benchmark.sh
@@ -8,17 +8,18 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-# bug number:
 ALWAYS_EXCEPT="$SANITY_BENCHMARK_EXCEPT"
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="iozone"
+
+build_test_filter
 
 MAX_THREADS=${MAX_THREADS:-20}
-RAMKB=`awk '/MemTotal:/ { print $2 }' /proc/meminfo`
+RAMKB=$(awk '/MemTotal:/ { print $2 }' /proc/meminfo)
 if [ -z "$THREADS" ]; then
 	THREADS=$((RAMKB / 16384))
 	[ $THREADS -gt $MAX_THREADS ] && THREADS=$MAX_THREADS
@@ -31,9 +32,6 @@ DEBUG_OFF=${DEBUG_OFF:-"eval lctl set_param debug=\"$DEBUG_LVL\""}
 DEBUG_ON=${DEBUG_ON:-"eval lctl set_param debug=0x33f0484"}
 DIRECTIO=${DIRECTIO:-directio}
 
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="iozone"
-
-build_test_filter
 check_and_setup_lustre
 
 assert_DIR
@@ -180,21 +178,24 @@ 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 }'`
+
+	check_set_fallocate
+
+	[ $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"