diff options
| author | Tony Nguyen <[email protected]> | 2020-01-16 10:16:16 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-01-16 09:16:16 -0800 |
| commit | 1b64627e7335e9f38d66424cdd242b3d0889b060 (patch) | |
| tree | bcc7dc8d8b1b324a6734edb48146cb783700296c /tests | |
| parent | 1bb5f5e2b47336ddc8d22833801eadbee8ce21e6 (diff) | |
ZFS performance suite should use JSON fio output
Making the default FIO output format be JSON thus easier to post process
performance results. To get previous 'normal' output format,
PERF_FIO_FORMAT can be set prior to invoking zfs-tests.sh. For example:
'PERF_FIO_FORMAT=normal ./zfs-tests.sh -T perf -r ./runfiles/perf.run'
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tony Nguyen <[email protected]>
Closes #9847
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/zfs-tests/tests/perf/perf.shlib | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/zfs-tests/tests/perf/perf.shlib b/tests/zfs-tests/tests/perf/perf.shlib index 196db2497..78e6140c6 100644 --- a/tests/zfs-tests/tests/perf/perf.shlib +++ b/tests/zfs-tests/tests/perf/perf.shlib @@ -23,6 +23,9 @@ export PERF_RUNTIME_WEEKLY=$((30 * 60)) export PERF_RUNTIME_NIGHTLY=$((10 * 60)) +# Default to JSON for fio output +export PERF_FIO_FORMAT=${PERF_FIO_FORMAT:-'json'} + # Default fs creation options export PERF_FS_OPTS=${PERF_FS_OPTS:-'-o recsize=8k -o compress=lz4' \ ' -o checksum=sha256 -o redundant_metadata=most'} @@ -139,11 +142,13 @@ function do_fio_run_impl # Start the load if [[ $NFS -eq 1 ]]; then log_must ssh -t $NFS_USER@$NFS_CLIENT " - fio --output /tmp/fio.out /tmp/test.fio + fio --output-format=${PERF_FIO_FORMAT} \ + --output /tmp/fio.out /tmp/test.fio " log_must scp $NFS_USER@$NFS_CLIENT:/tmp/fio.out $outfile else - log_must fio --output $outfile $FIO_SCRIPTS/$script + log_must fio --output-format=${PERF_FIO_FORMAT} \ + --output $outfile $FIO_SCRIPTS/$script fi } |