Block_device_wait does not return an error code
Reviewed by: John Kennedy <john.kennedy@delphix.com> Reviewed-by: Giuseppe Di Natale <guss80@gmail.com> Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Richard Elling <Richard.Elling@RichardElling.com> Closes #8839
This commit is contained in:
parent
bef70afaa6
commit
4cb1b541d4
@ -56,6 +56,9 @@ function scan_scsi_hosts
|
||||
#
|
||||
# Wait for newly created block devices to have their minors created.
|
||||
#
|
||||
# Note: there is no meaningful return code if udevadm fails. Consumers
|
||||
# should not expect a return code (do not call as argument to log_must)
|
||||
#
|
||||
function block_device_wait
|
||||
{
|
||||
if is_linux; then
|
||||
|
@ -62,7 +62,7 @@ log_must eval "echo 'password' > $keyfile"
|
||||
|
||||
log_must zfs create -o dedup=on -o encryption=on -o keyformat=passphrase \
|
||||
-o keylocation=file://$keyfile -V 128M $TESTPOOL/$TESTVOL
|
||||
log_must block_device_wait
|
||||
block_device_wait
|
||||
|
||||
log_must eval "echo 'y' | newfs -t ext4 -v $zdev"
|
||||
log_must mkdir -p $mntpnt
|
||||
@ -82,7 +82,7 @@ done
|
||||
log_must eval "zfs send -wDR $TESTPOOL/$TESTVOL@snap$snap_count > $sendfile"
|
||||
log_must eval "zfs recv $TESTPOOL/recv < $sendfile"
|
||||
log_must zfs load-key $TESTPOOL/recv
|
||||
log_must block_device_wait
|
||||
block_device_wait
|
||||
|
||||
log_must mount $recvdev $recvmnt
|
||||
|
||||
|
@ -86,7 +86,7 @@ log_must zfs create -V 128M $TESTPOOL/$TESTVOL
|
||||
log_must zfs set compression=on $TESTPOOL/$TESTVOL
|
||||
log_must zfs set sync=always $TESTPOOL/$TESTVOL
|
||||
log_must mkdir -p $TESTDIR
|
||||
log_must block_device_wait
|
||||
block_device_wait
|
||||
echo "y" | newfs -t ext4 -v $VOLUME
|
||||
log_must mkdir -p $MNTPNT
|
||||
log_must mount -o discard $VOLUME $MNTPNT
|
||||
@ -149,7 +149,7 @@ log_must zpool export $TESTPOOL
|
||||
# `zpool import -f` because we can't write a frozen pool's labels!
|
||||
#
|
||||
log_must zpool import -f $TESTPOOL
|
||||
log_must block_device_wait
|
||||
block_device_wait
|
||||
log_must mount $VOLUME $MNTPNT
|
||||
|
||||
#
|
||||
|
@ -88,7 +88,7 @@ else
|
||||
fi
|
||||
|
||||
log_must zfs snapshot -r $snappool
|
||||
log_must block_device_wait
|
||||
block_device_wait
|
||||
|
||||
#verify the snapshot -r results
|
||||
for snap in $snappool $snapfs $snapvol $snapctr $snapctrvol \
|
||||
|
@ -83,7 +83,7 @@ else
|
||||
fi
|
||||
|
||||
log_must zfs snapshot -r $snappool
|
||||
log_must block_device_wait
|
||||
block_device_wait
|
||||
|
||||
#select the $TESTCTR as destroy point, $TESTCTR is a child of $TESTPOOL
|
||||
log_must zfs destroy -r $snapctr
|
||||
|
Loading…
Reference in New Issue
Block a user