shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

tests: udev-pvscan-vgchange fix service wait

Browse Source 
As a result of removing -r from systemd-run in
commit fbd8b0cf43dc67f51f86f060dce748f446985855
this test needs to change how it handles the
transient services.
This commit is contained in:
David Teigland 2022-02-07 16:44:57 -06:00
parent 13122bcc33
commit 61f23fe15e
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/shell/udev-pvscan-vgchange.sh
View File

@ -75,7 +75,7 @@ wait_lvm_activate() {
local vgw=$1 local vgw=$1
local wait=0 local wait=0
while systemctl status lvm-activate-$vgw | grep "active (running)" && test "$wait" -le 30; do while systemctl status lvm-activate-$vgw > /dev/null && test "$wait" -le 30; do
sleep .2 sleep .2
wait=$(( wait + 1 )) wait=$(( wait + 1 ))
done done
@ -382,7 +382,6 @@ lvcreate -l1 -an -n $lv1 $vg9
lvcreate -l1 -an -n $lv2 $vg9 lvcreate -l1 -an -n $lv2 $vg9
mdadm --stop "$mddev" mdadm --stop "$mddev"
systemctl stop lvm-activate-$vg9 || true
_clear_online_files _clear_online_files
mdadm --assemble "$mddev" "$dev1" "$dev2" mdadm --assemble "$mddev" "$dev1" "$dev2"
@ -405,17 +404,6 @@ mdadm --stop "$mddev"
aux udev_wait aux udev_wait
wipe_all wipe_all
systemctl stop lvm-activate-$vg1
systemctl stop lvm-activate-$vg2
systemctl stop lvm-activate-$vg3
systemctl stop lvm-activate-$vg4
systemctl stop lvm-activate-$vg5
systemctl stop lvm-activate-$vg6
systemctl stop lvm-activate-$vg7
systemctl stop lvm-activate-$vg8
systemctl stop lvm-activate-$vg9
# no devices file, filter with symlink of PV # no devices file, filter with symlink of PV
# the pvscan needs to look at all dev names to # the pvscan needs to look at all dev names to
# match the symlink in the filter with the # match the symlink in the filter with the
@ -439,7 +427,6 @@ udevadm trigger --settle -c add /sys/block/$BDEV1
ls /dev/disk/by-id/lvm-pv-uuid-$OPVID1 ls /dev/disk/by-id/lvm-pv-uuid-$OPVID1
vgchange -an $vg10 vgchange -an $vg10
systemctl stop lvm-activate-$vg10
_clear_online_files _clear_online_files
aux lvmconf "devices/filter = [ \"a|/dev/disk/by-id/lvm-pv-uuid-$OPVID1|\", \"r|.*|\" ]" aux lvmconf "devices/filter = [ \"a|/dev/disk/by-id/lvm-pv-uuid-$OPVID1|\", \"r|.*|\" ]"