diff options
| author | Matthew Ahrens <[email protected]> | 2016-07-13 16:48:01 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-02-09 10:27:02 -0800 |
| commit | d7958b4cda27b82bd24dd4d4b2a539e26c62a409 (patch) | |
| tree | 7c18081445f41c5ade05f99c5c2479486da48d3e /tests/zfs-tests/include | |
| parent | df7eeccc7597980efd3cb1efd9377ad5e0483042 (diff) | |
OpenZFS 7104 - increase indirect block size
Authored by: Matthew Ahrens <[email protected]>
Reviewed by: George Wilson <[email protected]>
Reviewed by: Paul Dagnelie <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: George Melikov <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/7104
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/4b5c8e9
Closes #5679
Diffstat (limited to 'tests/zfs-tests/include')
| -rw-r--r-- | tests/zfs-tests/include/default.cfg.in | 6 | ||||
| -rw-r--r-- | tests/zfs-tests/include/libtest.shlib | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/zfs-tests/include/default.cfg.in b/tests/zfs-tests/include/default.cfg.in index d6913f1f3..ef34d2b90 100644 --- a/tests/zfs-tests/include/default.cfg.in +++ b/tests/zfs-tests/include/default.cfg.in @@ -160,6 +160,12 @@ export BIGVOLSIZE=1eb # Default to limit disks to be checked export MAX_FINDDISKSNUM=6 +# Default minimum size for file based vdevs in the test suite +export MINVDEVSIZE=$((256 * 1024 * 1024)) + +# Minimum vdev size possible as defined in the OS +export SPA_MINDEVSIZE=$((64 * 1024 * 1024)) + # For iscsi target support export ISCSITGTFILE=/tmp/iscsitgt_file export ISCSITGT_FMRI=svc:/system/iscsitgt:default diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib index 31b1e1dfc..22b79b15a 100644 --- a/tests/zfs-tests/include/libtest.shlib +++ b/tests/zfs-tests/include/libtest.shlib @@ -1542,7 +1542,7 @@ function zfs_zones_setup #zone_name zone_root zone_ip # if verify_slog_support ; then typeset sdevs="/var/tmp/sdev1 /var/tmp/sdev2" - log_must $MKFILE 100M $sdevs + log_must $MKFILE $MINVDEVSIZE $sdevs log_must $ZPOOL add $pool_name log mirror $sdevs fi @@ -2512,7 +2512,7 @@ function verify_slog_support typeset sdev=$dir/b $MKDIR -p $dir - $MKFILE 64M $vdev $sdev + $MKFILE $MINVDEVSIZE $vdev $sdev typeset -i ret=0 if ! $ZPOOL create -n $pool $vdev log $sdev > /dev/null 2>&1; then |