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>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads_cached.ksh
+++ new/usr/src/test/zfs-tests/tests/perf/regression/sequential_reads_cached.ksh
1 1 #!/usr/bin/ksh
2 2
3 3 #
4 4 # This file and its contents are supplied under the terms of the
|
↓ open down ↓ |
4 lines elided |
↑ open up ↑ |
5 5 # Common Development and Distribution License ("CDDL"), version 1.0.
6 6 # You may only use this file in accordance with the terms of version
7 7 # 1.0 of the CDDL.
8 8 #
9 9 # A full copy of the text of the CDDL should have accompanied this
10 10 # source. A copy of the CDDL is also available via the Internet at
11 11 # http://www.illumos.org/license/CDDL.
12 12 #
13 13
14 14 #
15 -# Copyright (c) 2015 by Delphix. All rights reserved.
15 +# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
16 16 #
17 17
18 18 #
19 19 # Description:
20 20 # Trigger fio runs using the sequential_reads job file. The number of runs and
21 21 # data collected is determined by the PERF_* variables. See do_fio_run for
22 22 # details about these variables.
23 23 #
24 24 # The files to read from are created prior to the first fio run, and used
25 25 # for all fio runs. The ARC is not cleared to ensure that all data is cached.
26 26 #
27 27
28 28 . $STF_SUITE/include/libtest.shlib
29 29 . $STF_SUITE/tests/perf/perf.shlib
30 30
31 31 function cleanup
32 32 {
33 - log_must $ZFS destroy $TESTFS
33 + log_must zfs destroy $TESTFS
34 34 }
35 35
36 36 log_assert "Measure IO stats during sequential read load"
37 37 log_onexit cleanup
38 38
39 39 export TESTFS=$PERFPOOL/testfs
40 40 recreate_perfpool
41 -log_must $ZFS create $PERF_FS_OPTS $TESTFS
41 +log_must zfs create $PERF_FS_OPTS $TESTFS
42 42
43 43 # Make sure the working set can be cached in the arc. Aim for 1/2 of arc.
44 44 export TOTAL_SIZE=$(($(get_max_arc_size) / 2))
45 45
46 46 # Variables for use by fio.
47 47 if [[ -n $PERF_REGRESSION_WEEKLY ]]; then
48 48 export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY}
49 49 export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'}
50 50 export PERF_NTHREADS=${PERF_NTHREADS:-'16 64'}
51 51 export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
52 52 export PERF_IOSIZES=${PERF_IOSIZES:-'64k 128k 1m'}
53 53 elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then
54 54 export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY}
55 55 export PERF_RUNTYPE=${PERF_RUNTYPE:-'nightly'}
|
↓ open down ↓ |
4 lines elided |
↑ open up ↑ |
56 56 export PERF_NTHREADS=${PERF_NTHREADS:-'64 128'}
57 57 export PERF_SYNC_TYPES=${PERF_SYNC_TYPES:-'1'}
58 58 export PERF_IOSIZES=${PERF_IOSIZES:-'128k 1m'}
59 59 fi
60 60
61 61 # Layout the files to be used by the read tests. Create as many files as the
62 62 # largest number of threads. An fio run with fewer threads will use a subset
63 63 # of the available files.
64 64 export NUMJOBS=$(get_max $PERF_NTHREADS)
65 65 export FILE_SIZE=$((TOTAL_SIZE / NUMJOBS))
66 -log_must $FIO $FIO_SCRIPTS/mkfiles.fio
66 +log_must fio $FIO_SCRIPTS/mkfiles.fio
67 67
68 68 # Set up the scripts and output files that will log performance data.
69 69 lun_list=$(pool_to_lun_list $PERFPOOL)
70 70 log_note "Collecting backend IO stats with lun list $lun_list"
71 71 export collect_scripts=("$PERF_SCRIPTS/io.d $PERFPOOL $lun_list 1" "io"
72 - "$PERF_SCRIPTS/prefetch_io.d $PERFPOOL 1" "prefetch" "$VMSTAT 1" "vmstat"
73 - "$MPSTAT 1" "mpstat" "$IOSTAT -xcnz 1" "iostat")
72 + "$PERF_SCRIPTS/prefetch_io.d $PERFPOOL 1" "prefetch" "vmstat 1" "vmstat"
73 + "mpstat 1" "mpstat" "iostat -xcnz 1" "iostat")
74 74
75 75 log_note "Sequential cached reads with $PERF_RUNTYPE settings"
76 -do_fio_run sequential_reads.fio $FALSE $FALSE
76 +do_fio_run sequential_reads.fio false false
77 77 log_pass "Measure IO stats during sequential cached read load"
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX