diff --git a/tests/zfs-tests/tests/perf/fio/mkfiles.fio b/tests/zfs-tests/tests/perf/fio/mkfiles.fio index 2134a93550..36ec22d492 100644 --- a/tests/zfs-tests/tests/perf/fio/mkfiles.fio +++ b/tests/zfs-tests/tests/perf/fio/mkfiles.fio @@ -25,9 +25,9 @@ thread=1 directory=${DIRECTORY} numjobs=${NUMJOBS} filesize=${FILE_SIZE} -randseed=${RANDSEED} -buffer_compress_percentage=${COMPPERCENT} +randseed=${PERF_RANDSEED} +buffer_compress_percentage=${PERF_COMPPERCENT} buffer_pattern=0xdeadbeef -buffer_compress_chunk=${COMPCHUNK} +buffer_compress_chunk=${PERF_COMPCHUNK} [job] diff --git a/tests/zfs-tests/tests/perf/regression/random_reads.ksh b/tests/zfs-tests/tests/perf/regression/random_reads.ksh index 8e2058666e..e6d207e227 100755 --- a/tests/zfs-tests/tests/perf/regression/random_reads.ksh +++ b/tests/zfs-tests/tests/perf/regression/random_reads.ksh @@ -12,7 +12,7 @@ # # -# Copyright (c) 2015, 2016 by Delphix. All rights reserved. +# Copyright (c) 2015, 2020 by Delphix. All rights reserved. # # @@ -58,9 +58,9 @@ export TOTAL_SIZE=$(($(get_prop avail $PERFPOOL) * 3 / 2)) # Variables for use by fio. if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} + export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} + export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'} export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} @@ -68,9 +68,9 @@ if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 128k'} elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + 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=${PERF_NTHREADS:-'16 32'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} diff --git a/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh b/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh index 625960a277..573e9c7d4c 100755 --- a/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh +++ b/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh @@ -12,7 +12,7 @@ # # -# Copyright (c) 2015, 2016 by Delphix. All rights reserved. +# Copyright (c) 2015, 2020 by Delphix. All rights reserved. # # @@ -58,9 +58,9 @@ export TOTAL_SIZE=$(($(get_prop avail $PERFPOOL) * 3 / 2)) # Variables for use by fio. if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} + export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} + export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'} export PERF_NTHREADS=${PERF_NTHREADS:-'4 8 16 64'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} @@ -68,9 +68,9 @@ if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_IOSIZES='' # bssplit used instead elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + 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=${PERF_NTHREADS:-'32 64'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} 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 e6272992d0..78af5213a3 100755 --- a/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh +++ b/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh @@ -1,5 +1,6 @@ #!/bin/ksh -# file and its contents are supplied under the terms of the + +# This file and its contents are supplied under the terms of the # Common Development and Distribution License ("CDDL"), version 1.0. # You may only use this file in accordance with the terms of version # 1.0 of the CDDL. @@ -10,7 +11,7 @@ # # -# Copyright (c) 2017 by Delphix. All rights reserved. +# Copyright (c) 2017, 2020 by Delphix. All rights reserved. # # @@ -47,9 +48,9 @@ export TOTAL_SIZE=$(($(get_prop avail $PERFPOOL) * 3 / 2)) # Variables for use by fio. if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} + export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} + export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'} export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} @@ -57,9 +58,9 @@ if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_IOSIZES='8k 64k' elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + 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=${PERF_NTHREADS:-'64 128'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} diff --git a/tests/zfs-tests/tests/perf/regression/random_writes.ksh b/tests/zfs-tests/tests/perf/regression/random_writes.ksh index cba27b29d4..dca013cbae 100755 --- a/tests/zfs-tests/tests/perf/regression/random_writes.ksh +++ b/tests/zfs-tests/tests/perf/regression/random_writes.ksh @@ -12,7 +12,7 @@ # # -# Copyright (c) 2015, 2016 by Delphix. All rights reserved. +# Copyright (c) 2015, 2020 by Delphix. All rights reserved. # # @@ -57,9 +57,9 @@ export TOTAL_SIZE=$(($(get_prop avail $PERFPOOL) * 3 / 2)) # Variables for use by fio. if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} + export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} + export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'} export PERF_NTHREADS=${PERF_NTHREADS:-'1 4 8 16 32 64 128'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} @@ -67,9 +67,9 @@ if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 256k'} elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + 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=${PERF_NTHREADS:-'32 128'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} 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 7d3ea6cf90..5d4fd77a74 100755 --- a/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh +++ b/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh @@ -12,7 +12,7 @@ # # -# Copyright (c) 2015, 2016 by Delphix. All rights reserved. +# Copyright (c) 2015, 2020 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib @@ -45,9 +45,9 @@ export TOTAL_SIZE=$(($(get_prop avail $PERFPOOL) * 3 / 2)) if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} + export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} + export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'} export PERF_NTHREADS=${PERF_NTHREADS:-'1 2 4 8 16 32 64 128'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0 1'} @@ -56,9 +56,9 @@ if [[ -n $PERF_REGRESSION_WEEKLY ]]; then elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + 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=${PERF_NTHREADS:-'1 4 16 64'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0 1'} diff --git a/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh b/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh index 265acb50b1..e5cf627839 100755 --- a/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh +++ b/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh @@ -12,7 +12,7 @@ # # -# Copyright (c) 2015, 2016 by Delphix. All rights reserved. +# Copyright (c) 2015, 2020 by Delphix. All rights reserved. # # @@ -58,9 +58,9 @@ export TOTAL_SIZE=$(($(get_prop avail $PERFPOOL) * 3 / 2)) # Variables for use by fio. if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} + export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} + export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'} export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} @@ -68,9 +68,9 @@ if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 128k'} elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + 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=${PERF_NTHREADS:-'8 16'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} 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 9163a903c3..d44e37f3ea 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 @@ -12,7 +12,7 @@ # # -# Copyright (c) 2015, 2016 by Delphix. All rights reserved. +# Copyright (c) 2015, 2020 by Delphix. All rights reserved. # # @@ -48,9 +48,9 @@ export TOTAL_SIZE=$(($(get_max_arc_size) / 2)) # Variables for use by fio. if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} + export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} + export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'} export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} @@ -58,9 +58,9 @@ if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 128k'} elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + 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=${PERF_NTHREADS:-'64 128'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} 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 b431528f96..1b3ee85ec5 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 @@ -12,7 +12,7 @@ # # -# Copyright (c) 2015, 2016 by Delphix. All rights reserved. +# Copyright (c) 2015, 2020 by Delphix. All rights reserved. # # @@ -54,9 +54,9 @@ export TOTAL_SIZE=$(($(get_max_arc_size) / 2)) # Variables for use by fio. if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} + export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} + export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'} export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} @@ -64,9 +64,9 @@ if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 128k'} elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + 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=${PERF_NTHREADS:-'64 128'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} 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 eeb703dd6e..944a3d13c1 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 @@ -12,7 +12,7 @@ # # -# Copyright (c) 2016 by Delphix. All rights reserved. +# Copyright (c) 2016, 2020 by Delphix. All rights reserved. # # @@ -52,9 +52,9 @@ export TOTAL_SIZE=$(($(get_max_dbuf_cache_size) * 3 / 4)) # Variables for use by fio. if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} + export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} + export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'} export PERF_NTHREADS=${PERF_NTHREADS:-'8 16 32 64'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} @@ -62,9 +62,9 @@ if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 128k'} elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + 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=${PERF_NTHREADS:-'64'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} diff --git a/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh b/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh index e2f4cf67ed..b4f466c4f6 100755 --- a/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh +++ b/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh @@ -12,7 +12,7 @@ # # -# Copyright (c) 2015, 2016 by Delphix. All rights reserved. +# Copyright (c) 2015, 2020 by Delphix. All rights reserved. # # @@ -57,9 +57,9 @@ export TOTAL_SIZE=$(($(get_prop avail $PERFPOOL) * 3 / 2)) # Variables for use by fio. if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_WEEKLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + export PERF_RANDSEED=${PERF_RANDSEED:-'1234'} + export PERF_COMPPERCENT=${PERF_COMPPERCENT:-'66'} + export PERF_COMPCHUNK=${PERF_COMPCHUNK:-'4096'} export PERF_RUNTYPE=${PERF_RUNTYPE:-'weekly'} export PERF_NTHREADS=${PERF_NTHREADS:-'1 4 8 16 32 64 128'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'} @@ -67,9 +67,9 @@ if [[ -n $PERF_REGRESSION_WEEKLY ]]; then export PERF_IOSIZES=${PERF_IOSIZES:-'8k 64k 256k'} elif [[ -n $PERF_REGRESSION_NIGHTLY ]]; then export PERF_RUNTIME=${PERF_RUNTIME:-$PERF_RUNTIME_NIGHTLY} - export RANDSEED=${PERF_RANDSEED:-'1234'} - export COMPPERCENT=${PERF_COMPPERCENT:-'66'} - export COMPCHUNK=${PERF_COMPCHUNK:-'4096'} + 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=${PERF_NTHREADS:-'16 32'} export PERF_NTHREADS_PER_FS=${PERF_NTHREADS_PER_FS:-'0'}