mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-03 05:18:29 +03:00
tests: use 800ms write delay
Since this value magically worked for pvmove-abort* use it here as well. Also prepate_lvmetad has better kill&reload mechanism.
This commit is contained in:
parent
4f6660db7d
commit
31f1375d23
@ -21,7 +21,7 @@ vgextend $vg "$dev3"
|
|||||||
|
|
||||||
# Slowdown writes
|
# Slowdown writes
|
||||||
# (FIXME: generates interesting race when not used)
|
# (FIXME: generates interesting race when not used)
|
||||||
aux delay_dev "$dev3" 100 100 $(get first_extent_sector "$dev3"):
|
aux delay_dev "$dev3" 0 800 $(get first_extent_sector "$dev3"):
|
||||||
|
|
||||||
for mode in "--atomic" ""
|
for mode in "--atomic" ""
|
||||||
do
|
do
|
||||||
@ -44,7 +44,7 @@ wait
|
|||||||
|
|
||||||
# First take down $lv1 then it's pvmove0
|
# First take down $lv1 then it's pvmove0
|
||||||
j=0
|
j=0
|
||||||
for i in $lv1 pvmove0 pvmove0_mimage_1 pvmove0_mimage_0 ; do
|
for i in $lv1 pvmove0 pvmove0_mimage_0 pvmove0_mimage_1 ; do
|
||||||
while dmsetup status "$vg-$i"; do
|
while dmsetup status "$vg-$i"; do
|
||||||
dmsetup remove "$vg-$i" || {
|
dmsetup remove "$vg-$i" || {
|
||||||
j=$(($j + 1))
|
j=$(($j + 1))
|
||||||
@ -76,8 +76,7 @@ if test -e LOCAL_CLVMD ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if test -e LOCAL_LVMETAD ; then
|
if test -e LOCAL_LVMETAD ; then
|
||||||
# Restart lvmetad
|
# Restart lvmetad (kill is built-in)
|
||||||
kill $(< LOCAL_LVMETAD)
|
|
||||||
aux prepare_lvmetad
|
aux prepare_lvmetad
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -92,8 +91,6 @@ dmsetup table
|
|||||||
|
|
||||||
pvmove --abort
|
pvmove --abort
|
||||||
|
|
||||||
pvmove --abort
|
|
||||||
|
|
||||||
lvs -a -o+devices $vg
|
lvs -a -o+devices $vg
|
||||||
|
|
||||||
lvremove -ff $vg
|
lvremove -ff $vg
|
||||||
|
Loading…
Reference in New Issue
Block a user