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: use aux mdadm_assemble wrapper

Browse Source
This commit is contained in:
Zdenek Kabelac 2021-03-26 16:07:24 +01:00
parent 4c59b2aa21
commit 02e02a5ccc
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/shell/lvm-on-md.sh
View File

@ -27,19 +27,6 @@ _clear_online_files() {
. lib/inittest
which mdadm || skip
STRACE=
[ "$DM_DEV_DIR" = "/dev" ] && mdadm -V 2>&1 | grep " v3.2" && {
# use this 'trick' to slow down mdadm which otherwise
# is racing with udev rule since mdadm internally
# opens and closes raid leg devices in RW mode and then
# tries to get exlusive access to the leg device during
# insertion to kernel and fails during assembly
# There could be more affted version of mdadm.
STRACE="strace -f -o /dev/null"
}
# This stops lvm from taking advantage of hints which
# will have already excluded md components.
@ -121,8 +108,7 @@ test ! -f "$RUNDIR/lvm/vgs_online/$vg"
# should not show an active lv
not dmsetup info $vg-$lv1
$STRACE mdadm --assemble "$mddev" "$dev1" "$dev2"
aux udev_wait
aux mdadm_assemble "$mddev" "$dev1" "$dev2"
not pvs "$dev1"
not pvs "$dev2"
@ -276,8 +262,7 @@ test ! -f "$RUNDIR/lvm/vgs_online/$vg"
not dmsetup info $vg-$lv1
# start the md dev
$STRACE mdadm --assemble "$mddev" "$dev1" "$dev2"
aux udev_wait
aux mdadm_assemble "$mddev" "$dev1" "$dev2"
not pvs "$dev1"
not pvs "$dev2"

4
test/shell/pvcreate-md-fake-hdr.sh
View File

@ -88,8 +88,8 @@ if mdadm --detail "$mddev" ; then
fi
# now reassemble array from PV1 & PV2
mdadm --assemble --verbose "$mddev" "$dev1" "$dev2"
aux udev_wait
aux mdadm_assemble --verbose "$mddev" "$dev1" "$dev2"
sleep 1
# and let 'fake hdr' to be fixed from master/primary leg