Skip to content

Commit

Permalink
ZTS fix slog_replay_volume.ksh failure
Browse files Browse the repository at this point in the history
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 <mail@gmelikov.ru>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #6654
  • Loading branch information
behlendorf authored Sep 19, 2017
1 parent a9a2bf7 commit 8e2ddda
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/zfs-tests/tests/functional/slog/slog_replay_volume.ksh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 8e2ddda

Please sign in to comment.