Skip to content
Permalink
Browse files

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
  • Loading branch information...
richardelling authored and tonyhutter committed Jun 7, 2019
1 parent 249d17b commit ef313a792347e53dd03259675a9c0c5cb50bf4a2
@@ -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
@@ -92,7 +92,7 @@ for snap in $snapctr $snapctrvol $snapctrclone $snapctrfs; do
log_fail "The snapshot $snap is not destroyed correctly."
done

for snap in $snappool $snapfs $snapvol $ctrfs@$TESTSNAP1;do
for snap in $snappool $snapfs $snapvol $ctrfs@$TESTSNAP1; do
! snapexists $snap && \
log_fail "The snapshot $snap should be not destroyed."
done

0 comments on commit ef313a7

Please sign in to comment.
You can’t perform that action at this time.