diff options
| author | Brian Behlendorf <[email protected]> | 2017-09-19 10:09:37 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-19 10:09:37 -0700 |
| commit | 8e2dddab421e7131b7bd7eadd517fb36b59b2ddd (patch) | |
| tree | edaad386f7d31ad0fa9a0b4942d0b81a30e730f6 | |
| parent | a9a2bf71520ffb5668c9204db5c7df0445dc912a (diff) | |
ZTS fix slog_replay_volume.ksh failure
The slog_replay_volume.ksh test case will fail when the pool is
layered on files in a filesystem which does not support discard.
Avoid this issue by creating the pool using DISKS which will
either be loopback device or real disk.
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #6654
| -rwxr-xr-x | tests/zfs-tests/tests/functional/slog/slog_replay_volume.ksh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/zfs-tests/tests/functional/slog/slog_replay_volume.ksh b/tests/zfs-tests/tests/functional/slog/slog_replay_volume.ksh index 54ca70bf7..2cdcb38dc 100755 --- a/tests/zfs-tests/tests/functional/slog/slog_replay_volume.ksh +++ b/tests/zfs-tests/tests/functional/slog/slog_replay_volume.ksh @@ -81,7 +81,7 @@ log_onexit cleanup_volume # 1. Create an empty volume (TESTVOL), set sync=always, and format # it with an ext4 filesystem and mount it. # -log_must zpool create $TESTPOOL $VDEV log mirror $LDEV +log_must zpool create $TESTPOOL ${DISKS%% *} log_must zfs create -V 128M $TESTPOOL/$TESTVOL log_must zfs set compression=on $TESTPOOL/$TESTVOL log_must zfs set sync=always $TESTPOOL/$TESTVOL @@ -148,7 +148,7 @@ log_must zpool export $TESTPOOL # Import the pool to unfreeze it and claim log blocks. It has to be # `zpool import -f` because we can't write a frozen pool's labels! # -log_must zpool import -f -d $VDIR $TESTPOOL +log_must zpool import -f $TESTPOOL log_must block_device_wait log_must mount $VOLUME $MNTPNT |