summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2017-09-19 10:09:37 -0700
committerTony Hutter <[email protected]>2017-09-20 10:25:54 -0700
commit4e6a9e45982bcf0bc33ce75ec936018bf6b36224 (patch)
treee30f5127fb1d6588cce5285acb2a7adcd87734d3
parent661907e6bc3942aef5cee6098e3b743dcf03a372 (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-xtests/zfs-tests/tests/functional/slog/slog_replay_volume.ksh4
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