X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-benchmark.sh;h=370afae292ac35344421ad145512d2c324e516a6;hb=8befc64e5aabe9b9bdca49f51830f25b3f747019;hp=dbd4bac3b8c172391d19e4ef66e07c288c6ae378;hpb=02582d03b7d530e4bf3be5952d1b9de9ef97e71a;p=fs%2Flustre-release.git diff --git a/lustre/tests/sanity-benchmark.sh b/lustre/tests/sanity-benchmark.sh index dbd4bac..370afae 100644 --- a/lustre/tests/sanity-benchmark.sh +++ b/lustre/tests/sanity-benchmark.sh @@ -29,16 +29,7 @@ RSIZE=${RSIZE:-512} DEBUG_LVL=${DEBUG_LVL:-0} DEBUG_OFF=${DEBUG_OFF:-"eval lctl set_param debug=\"$DEBUG_LVL\""} DEBUG_ON=${DEBUG_ON:-"eval lctl set_param debug=0x33f0484"} - -PIOSBIN=${PIOSBIN:-$(which pios 2> /dev/null || true)} - -pios_THREADCOUNT=${pios_THREADCOUNT:-"1,8,40"} -[ "$SLOW" = "no" ] && pios_THREADCOUNT=8 - -pios_REGIONCOUNT=${pios_REGIONCOUNT:-1024} -pios_CHUNKSIZE=${pios_CHUNKSIZE:-1M} -pios_REGIONSIZE=${pios_REGIONSIZE:-8M} -pios_OFFSET=${pios_OFFSET:-16M} +DIRECTIO=${DIRECTIO:-directio} [ "$SLOW" = "no" ] && EXCEPT_SLOW="iozone" @@ -116,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 @@ -138,16 +130,18 @@ 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 if [ -z "$O_DIRECT" ]; then touch $DIR/f.iozone - if ! ./directio write $DIR/f.iozone 0 1; then + if ! $DIRECTIO write $DIR/f.iozone 0 1; then log "SKIP iozone DIRECT IO test" 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 @@ -155,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 @@ -175,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 }'` @@ -193,139 +189,15 @@ 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)) $DIR/fsxfile + 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" - -############################################################ -# PIOS -# - -iterpr_KMGT () { - local str=$1 - local num=${str:0:${#str}-1} - case ${str:${#str}-1} in - k|K ) num=$((num << 10));; # - m|M ) num=$((num << 20));; # emacs is confsued by the << and - g|G ) num=$((num << 30));; # these comments help it out. - t|T ) num=$((num << 40));; # - * ) num=$str;; - esac - echo $num -} - -pios_file_size () { - # pios.c: check_device_size () - # /* Adding 10% to total test size for filesystem overhead */ - # size = size + (double)(size) * (double) (0.1); - # pios.c: set_actual_streams () - # total_test_size = runarg->regioncount * runarg->regionsize - - local size=$(($(iterpr_KMGT $pios_REGIONCOUNT) * \ - $(iterpr_KMGT $pios_REGIONSIZE) )) - echo $size -} - -space_check () { - local space=$(df -P $DIR | tail -n 1 | awk '{ print $4 }') - local size=$(pios_file_size) - size=$(( size + size / 10 )) - # we can not use pios --cleanup|-x because we need the files exist for pios --verify, - # so, we need space available for each of pios_THREADCOUNT value run - local num_runs=$(echo ${pios_THREADCOUNT//,/ } | wc -w) - size=$(( size * $num_runs)) - space=$((space * 1024)) - echo size=$size space=$space - if [ $space -le $size ]; then - local ratio=$(( size / space + 1 )) - echo "Need free space atleast $size, available $space, ratio=$ratio" - local rgcount=$(( pios_REGIONCOUNT / ratio )) - echo "reducing pios_REGIONCOUNT=$pios_REGIONCOUNT on $ratio" - if [ $rgcount -eq 0 ]; then - echo "fs is too small, reduced pios_REGIONCOUNT=$rgcount" - return 10 - fi - pios_REGIONCOUNT=$(( pios_REGIONCOUNT / ratio )) - echo using pios_REGIONCOUNT=$pios_REGIONCOUNT size=$(pios_file_size) - fi -} - -pios_setup() { - local testdir=$DIR/$tdir - mkdir -p $testdir - - stripes=1 - [ "$1" == "--stripe" ] && stripes=-1 - $LFS setstripe $testdir -c $stripes - echo "Test directory $testdir stripe count: $stripes" -} - -pios_cleanup() { - local rc=$1 - local testdir=$DIR/$tdir - if [ $rc -eq 0 ]; then - echo cleanup: testdir=$testdir rc=$rc - rm -rf $testdir - wait_delete_completed || true - fi -} - -run_pios () { - local testdir=$DIR/$tdir - local cmd="$PIOSBIN -t $pios_THREADCOUNT -n $pios_REGIONCOUNT \ - -c $pios_CHUNKSIZE -s $pios_REGIONSIZE \ - -o $pios_OFFSET $@ -p $testdir" - - if [ ! -d $testdir ]; then - error "No test directory created, setup_pios must have failed" - return 20 - fi - - log "$cmd" - - local rc=0 - eval $cmd - rc=$? - - return $rc -} - -test_pios_ssf() { - if [ -z "$PIOSBIN" ]; then - skip_env "$0 : pios not found PIOSBIN=$PIOSBIN" - return - fi - - local rc=0 - space_check || { skip_env "not enough space" && return 0; } - pios_setup --stripe || return - run_pios || return - run_pios --verify || rc=$? - pios_cleanup $rc - return $rc -} -run_test pios_ssf "pios shared single file" - -test_pios_fpp() { - if [ -z "$PIOSBIN" ]; then - skip_env "pios not found PIOSBIN=$PIOSBIN" - return - fi - - local rc=0 - space_check || { skip_env "not enough space" && return 0; } - pios_setup || return - run_pios -L fpp || return - run_pios -L fpp --verify || rc=$? - pios_cleanup $rc - return $rc -} -run_test pios_fpp "pios file per process" - -equals_msg `basename $0`: test complete, cleaning up +complete $SECONDS check_and_cleanup_lustre -[ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true +exit_status