From 70322be8dc160f003fa95e034462ad625b325568 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 15 Aug 2017 16:40:04 -0700 Subject: [PATCH] Fix ZTS grow_pool/setup The addition of the large_dnode_008_pos test case, which runs right before this one, exposed some racy behavior in grow_pool setup.sh on the Ubuntu kmemleak builder. Before creating partitions on a device destroying any existing ones. ERROR: set_partition 1 100mb loop0 exited 1 Reviewed-by: George Melikov Reviewed-by: Giuseppe Di Natale Signed-off-by: Brian Behlendorf Closes #6499 Closes #6516 --- tests/zfs-tests/tests/functional/grow_pool/setup.ksh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/zfs-tests/tests/functional/grow_pool/setup.ksh b/tests/zfs-tests/tests/functional/grow_pool/setup.ksh index 4c1257915d..2c0a029bd8 100755 --- a/tests/zfs-tests/tests/functional/grow_pool/setup.ksh +++ b/tests/zfs-tests/tests/functional/grow_pool/setup.ksh @@ -40,12 +40,15 @@ fi if [[ -n $DISK ]]; then log_note "No spare disks available. Using slices on $DISK" + log_must zero_partitions $DISK for i in $SLICE0 $SLICE1 ; do log_must set_partition $i "$cyl" $SIZE $DISK cyl=$(get_endslice $DISK $i) done tmp=$DISK"s"$SLICE0 else + log_must zero_partitions $DISK0 + log_must zero_partitions $DISK1 log_must set_partition $SLICE "" $SIZE $DISK0 log_must set_partition $SLICE "" $SIZE $DISK1 tmp=$DISK0$SLICE_PREFIX$SLICE