c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 18:59:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: Cleanup partition tables

Browse Source 
The cleanup_devices function should remove any partitions created
on the device and force the partition table to be reread.  This
is needed to ensure that blkid has an up to date version of what
devices and partitions are used by zfs.

The cleanup_devices call was removed from inuse_008_pos.ksh since
it operated on partitions instead of devices and was not needed.

Lastly ddidecode may be called by parted and was therefore added
to the constrained path.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #9806
This commit is contained in:
Brian Behlendorf 2020-01-06 11:14:19 -08:00 committed by GitHub
parent 33dc49e0c0
commit 581ca28169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/zfs-tests/include/commands.cfg
View File

@ -132,6 +132,7 @@ export SYSTEM_FILES_LINUX='attr
blockdev blockdev
chattr chattr
cksum cksum
dmidecode
exportfs exportfs
fallocate fallocate
fdisk fdisk

7
tests/zfs-tests/include/libtest.shlib
View File

@ -2301,10 +2301,11 @@ function cleanup_devices #vdevs
{ {
typeset pool="foopool$$" typeset pool="foopool$$"
if poolexists $pool ; then for vdev in $@; do
destroy_pool $pool zero_partitions $vdev
fi done
poolexists $pool && destroy_pool $pool
create_pool $pool $@ create_pool $pool $@
destroy_pool $pool destroy_pool $pool

1
tests/zfs-tests/tests/functional/inuse/inuse_008_pos.ksh
View File

@ -107,7 +107,6 @@ while (( i < ${#vdevs[*]} )); do
create_pool $TESTPOOL1 ${vdevs[i]} $vslices spare $sslices create_pool $TESTPOOL1 ${vdevs[i]} $vslices spare $sslices
log_must zpool export $TESTPOOL1 log_must zpool export $TESTPOOL1
verify_assertion "$rawtargets" verify_assertion "$rawtargets"
cleanup_devices $vslices $sslices
(( i = i + 1 )) (( i = i + 1 ))
done done