diff --git a/tests/zfs-tests/tests/perf/perf.shlib b/tests/zfs-tests/tests/perf/perf.shlib index f70986dfb65b..fe5302387ec5 100644 --- a/tests/zfs-tests/tests/perf/perf.shlib +++ b/tests/zfs-tests/tests/perf/perf.shlib @@ -21,6 +21,8 @@ export PERF_RUNTIME=${PERF_RUNTIME:-'180'} export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} +export PERF_RECORD_CMD=${PERF_RECORD_CMD:-"perf record --call-graph \ + dwarf,8192 -F 49 -agq -o /dev/stdout -- sleep ${PERF_RUNTIME}"} # Default to JSON for fio output export PERF_FIO_FORMAT=${PERF_FIO_FORMAT:-'json'} diff --git a/tests/zfs-tests/tests/perf/regression/file_deletion.ksh b/tests/zfs-tests/tests/perf/regression/file_deletion.ksh index 84174b97f730..020149a0c349 100755 --- a/tests/zfs-tests/tests/perf/regression/file_deletion.ksh +++ b/tests/zfs-tests/tests/perf/regression/file_deletion.ksh @@ -12,7 +12,7 @@ # # -# Copyright (c) 2015, 2020 by Delphix. All rights reserved. +# Copyright (c) 2015, 2021 by Delphix. All rights reserved. # # @@ -51,18 +51,13 @@ else fi # Variables for use by fio. -export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} -export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} -export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} -export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} -export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'} export PERF_NTHREADS=1 export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'0'} export PERF_IOSIZES=${PERF_IOSIZES:-'8k'} export PERF_NUMIOS=655360 # 5GB worth of IOs -# Random writing to the file +# Random writing to the file export NUMJOBS=$(get_max $PERF_NTHREADS) export FILE_SIZE=$((TOTAL_SIZE / NUMJOBS)) export DIRECTORY=$(get_directory) @@ -80,14 +75,12 @@ log_note "Collecting backend IO stats with lun list $lun_list" # Run log collection for only 10 seconds which should be sufficient. export PERF_RUNTIME=10 if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=( diff --git a/tests/zfs-tests/tests/perf/regression/random_reads.ksh b/tests/zfs-tests/tests/perf/regression/random_reads.ksh index dbe114035d2b..b286fbf2ae65 100755 --- a/tests/zfs-tests/tests/perf/regression/random_reads.ksh +++ b/tests/zfs-tests/tests/perf/regression/random_reads.ksh @@ -80,9 +80,6 @@ fill_zetta_cache 1800 lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" - export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "vmstat -t 1" "vmstat" @@ -90,7 +87,7 @@ if is_linux; then "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=( diff --git a/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh b/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh index 48cafd4d9b9f..504323e7a027 100755 --- a/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh +++ b/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh @@ -80,9 +80,6 @@ fill_zetta_cache 1800 lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" - export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "vmstat -t 1" "vmstat" @@ -90,7 +87,7 @@ if is_linux; then "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=( diff --git a/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh b/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh index 90cb42858447..e276a2822f53 100755 --- a/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh +++ b/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh @@ -70,9 +70,6 @@ fill_zetta_cache 1800 lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" - export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "vmstat -t 1" "vmstat" @@ -80,7 +77,7 @@ if is_linux; then "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=( diff --git a/tests/zfs-tests/tests/perf/regression/random_writes.ksh b/tests/zfs-tests/tests/perf/regression/random_writes.ksh index d6b658dfa199..53a5a6b36523 100755 --- a/tests/zfs-tests/tests/perf/regression/random_writes.ksh +++ b/tests/zfs-tests/tests/perf/regression/random_writes.ksh @@ -68,9 +68,6 @@ export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'0 1'} lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" - export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "vmstat -t 1" "vmstat" @@ -78,7 +75,7 @@ if is_linux; then "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=( diff --git a/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh b/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh index 04d7625a87b4..b67454b8bdd4 100755 --- a/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh +++ b/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh @@ -60,9 +60,6 @@ export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'} lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" - export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "vmstat -t 1" "vmstat" @@ -70,7 +67,7 @@ if is_linux; then "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=( diff --git a/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh b/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh index 5d4776833b3d..44fcda66bb56 100755 --- a/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh +++ b/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh @@ -80,9 +80,6 @@ fill_zetta_cache 1800 lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" - export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "$PERF_SCRIPTS/prefetch_io.sh $PERFPOOL 1" "prefetch" @@ -91,7 +88,7 @@ if is_linux; then "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=( diff --git a/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached.ksh b/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached.ksh index 8ea7e9de21cd..bff66da4a9b6 100755 --- a/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached.ksh +++ b/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached.ksh @@ -63,9 +63,6 @@ log_must fio $FIO_SCRIPTS/mkfiles.fio lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" - export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "$PERF_SCRIPTS/prefetch_io.sh $PERFPOOL 1" "prefetch" @@ -74,7 +71,7 @@ if is_linux; then "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=( diff --git a/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached_clone.ksh b/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached_clone.ksh index 636ae32efe56..7477e26b5799 100755 --- a/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached_clone.ksh +++ b/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached_clone.ksh @@ -89,9 +89,6 @@ export TESTFS=$PERFPOOL/$TESTCLONE lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" - export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "$PERF_SCRIPTS/prefetch_io.sh $PERFPOOL 1" "prefetch" @@ -100,7 +97,7 @@ if is_linux; then "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=( diff --git a/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh b/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh index c22f6345ef10..c05dce3ccb34 100755 --- a/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh +++ b/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh @@ -71,9 +71,6 @@ log_must fio $FIO_SCRIPTS/mkfiles.fio lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" - export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "$PERF_SCRIPTS/prefetch_io.sh $PERFPOOL 1" "prefetch" @@ -82,7 +79,7 @@ if is_linux; then "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=( diff --git a/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh b/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh index 40ba82e4c32f..1a5fe0b73d71 100755 --- a/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh +++ b/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh @@ -68,9 +68,6 @@ export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'0 1'} lun_list=$(pool_to_lun_list $PERFPOOL) log_note "Collecting backend IO stats with lun list $lun_list" if is_linux; then - typeset perf_record_cmd="perf record --call-graph dwarf,8192 -F 49 -agq \ - -o /dev/stdout -- sleep ${PERF_RUNTIME}" - export collect_scripts=( "zpool iostat -lpvyL $PERFPOOL 1" "zpool.iostat" "vmstat -t 1" "vmstat" @@ -78,7 +75,7 @@ if is_linux; then "iostat -tdxyz 1" "iostat" "arcstat 1" "arcstat" "dstat -at --nocolor 1" "dstat" - "$perf_record_cmd" "perf" + "$PERF_RECORD_CMD" "perf" ) else export collect_scripts=(