Print this page
7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>

*** 10,20 **** # source. A copy of the CDDL is also available via the Internet at # http://www.illumos.org/license/CDDL. # # ! # Copyright (c) 2015 by Delphix. All rights reserved. # # # Description: # Trigger fio runs using the sequential_reads job file. The number of runs and --- 10,20 ---- # source. A copy of the CDDL is also available via the Internet at # http://www.illumos.org/license/CDDL. # # ! # Copyright (c) 2015, 2016 by Delphix. All rights reserved. # # # Description: # Trigger fio runs using the sequential_reads job file. The number of runs and
*** 28,46 **** . $STF_SUITE/include/libtest.shlib . $STF_SUITE/tests/perf/perf.shlib function cleanup { ! log_must $ZFS destroy $TESTFS } log_assert "Measure IO stats during sequential read load" log_onexit cleanup export TESTFS=$PERFPOOL/testfs recreate_perfpool ! log_must $ZFS create $PERF_FS_OPTS $TESTFS # Make sure the working set can be cached in the arc. Aim for 1/2 of arc. export TOTAL_SIZE=$(($(get_max_arc_size) / 2)) # Variables for use by fio. --- 28,46 ---- . $STF_SUITE/include/libtest.shlib . $STF_SUITE/tests/perf/perf.shlib function cleanup { ! log_must zfs destroy $TESTFS } log_assert "Measure IO stats during sequential read load" log_onexit cleanup export TESTFS=$PERFPOOL/testfs recreate_perfpool ! log_must zfs create $PERF_FS_OPTS $TESTFS # Make sure the working set can be cached in the arc. Aim for 1/2 of arc. export TOTAL_SIZE=$(($(get_max_arc_size) / 2)) # Variables for use by fio.
*** 61,77 **** # Layout the files to be used by the read tests. Create as many files as the # largest number of threads. An fio run with fewer threads will use a subset # of the available files. export NUMJOBS=$(get_max $PERF_NTHREADS) export FILE_SIZE=$((TOTAL_SIZE / NUMJOBS)) ! log_must $FIO $FIO_SCRIPTS/mkfiles.fio # Set up the scripts and output files that will log performance data. lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io" ! "$PERF_SCRIPTS/prefetch_io.d $PERFPOOL 1" "prefetch" "$VMSTAT 1" "vmstat" ! "$MPSTAT 1" "mpstat" "$IOSTAT -xcnz 1" "iostat") log_note "Sequential cached reads with $PERF_RUNTYPE settings" ! do_fio_run sequential_reads.fio $FALSE $FALSE log_pass "Measure IO stats during sequential cached read load" --- 61,77 ---- # Layout the files to be used by the read tests. Create as many files as the # largest number of threads. An fio run with fewer threads will use a subset # of the available files. export NUMJOBS=$(get_max $PERF_NTHREADS) export FILE_SIZE=$((TOTAL_SIZE / NUMJOBS)) ! log_must fio $FIO_SCRIPTS/mkfiles.fio # Set up the scripts and output files that will log performance data. lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io" ! "$PERF_SCRIPTS/prefetch_io.d $PERFPOOL 1" "prefetch" "vmstat 1" "vmstat" ! "mpstat 1" "mpstat" "iostat -xcnz 1" "iostat") log_note "Sequential cached reads with $PERF_RUNTYPE settings" ! do_fio_run sequential_reads.fio false false log_pass "Measure IO stats during sequential cached read load"