shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

tests: resolve missing removal of loopdevice on error path

Browse Source 
In case of test failure, loop device leaked and occupied space forever.
This commit is contained in:
Zdenek Kabelac 2020-09-18 00:31:11 +02:00
parent a5e867139d
commit 8d40859e29
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/shell/integrity-blocksize.sh
View File

@ -18,6 +18,21 @@ aux have_integrity 1 5 0 || skip
losetup -h | grep sector-size || skip
cleanup_mounted_and_teardown()
{
umount "$mnt" || true
vgremove -ff $vg1 $vg2 || true
losetup -d $LOOP1 || true
losetup -d $LOOP2 || true
losetup -d $LOOP3 || true
losetup -d $LOOP4 || true
rm -f loop{abcd}
aux teardown
}
# Tests with fs block sizes require a libblkid version that shows BLOCK_SIZE
aux prepare_devs 1
vgcreate $vg "$dev1"
@ -27,6 +42,8 @@ blkid "$DM_DEV_DIR/$vg/$lv1" | grep BLOCK_SIZE || skip
lvchange -an $vg
vgremove -ff $vg
trap 'cleanup_mounted_and_teardown' EXIT
dd if=/dev/zero of=loopa bs=$((1024*1024)) count=64 2> /dev/null
dd if=/dev/zero of=loopb bs=$((1024*1024)) count=64 2> /dev/null
dd if=/dev/zero of=loopc bs=$((1024*1024)) count=64 2> /dev/null
@ -270,15 +287,4 @@ pvck --dump metadata $LOOP3 | grep 'block_size = 4096'
lvchange -an $vg2/$lv1
lvremove -y $vg2/$lv1
vgremove -ff $vg1
vgremove -ff $vg2
losetup -d $LOOP1
losetup -d $LOOP2
losetup -d $LOOP3
losetup -d $LOOP4
rm loopa
rm loopb
rm loopc
rm loopd
# remove of $vg1, $vg2 and loops in cleanup_mounted_and_teardown()