From fe45ada3cb639dc6935e07b6526f4d41b43dafbc Mon Sep 17 00:00:00 2001 From: James Nunez Date: Wed, 15 Mar 2017 15:25:30 -0600 Subject: [PATCH] LU-8366 test: Remove PIOS tests PIOS is an old benchmark and is not open source. PIOS should be removed from sanity-benchmark. Test-Parameters: trivial testlist=sanity-benchmark Signed-off-by: James Nunez Change-Id: Id89ab1107e4d7e444f6149d04bd90b4ea8c7828b Reviewed-on: https://review.whamcloud.com/26014 Reviewed-by: Andreas Dilger Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Cliff White --- lustre/tests/sanity-benchmark.sh | 159 --------------------------------------- 1 file changed, 159 deletions(-) diff --git a/lustre/tests/sanity-benchmark.sh b/lustre/tests/sanity-benchmark.sh index 398656e..5ea7a0c 100644 --- a/lustre/tests/sanity-benchmark.sh +++ b/lustre/tests/sanity-benchmark.sh @@ -31,16 +31,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} -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} - [ "$SLOW" = "no" ] && EXCEPT_SLOW="iozone" build_test_filter @@ -203,155 +193,6 @@ test_fsx() { } 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 testdir=$DIR/$tdir - local stripe=$($LFS getstripe -c $testdir) - local min_space_available=0 - - # if stripe_count = 1 the size should be less than min ost size, - # bug 24294 - min_space_available=$(lfs df | grep "^$FSNAME-OST" | \ - awk '{print $4}' | sort -un | head -1) - local space=$((min_space_available * OSTCOUNT)) - - [ $stripe -eq 1 ] && space=$(min_ost_size) - - 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:-0} - 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 - pios_setup --stripe || return - if ! space_check; then - skip_env "not enough space" - pios_cleanup - return 0 - fi - 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 - pios_setup || return - if ! space_check; then - skip_env "not enough space" - pios_cleanup - return 0 - fi - run_pios -L fpp || return - run_pios -L fpp --verify || rc=$? - pios_cleanup $rc - return $rc -} -run_test pios_fpp "pios file per process" - complete $SECONDS check_and_cleanup_lustre exit_status -- 1.8.3.1