diff --git a/test/shell/pvmove-abort-all.sh b/test/shell/pvmove-abort-all.sh index 081c02911..302d4bf94 100644 --- a/test/shell/pvmove-abort-all.sh +++ b/test/shell/pvmove-abort-all.sh @@ -22,12 +22,17 @@ export DM_ABORT_ON_INTERNAL_ERRORS=0 aux lvmconf 'activation/raid_region_size = 16' -aux target_at_least dm-mirror 1 10 0 || skip -# Throttle mirroring -aux throttle_dm_mirror || skip +aux target_at_least dm-mirror 1 2 0 || skip aux prepare_pvs 6 90 +for i in "$dev3" "$dev6" ; do + aux delay_dev "$i" 0 1 "$(get first_extent_sector "$i"):" +done +# fallback to mirror throttling +# this does not work too well with fast CPUs +test -f HAVE_DM_DELAY || { aux throttle_dm_mirror || skip ; } + vgcreate -s 512k $vg "$dev1" "$dev2" pvcreate --metadatacopies 0 "$dev3" vgextend $vg "$dev3" diff --git a/test/shell/pvmove-abort.sh b/test/shell/pvmove-abort.sh index 86f24176e..9f5f33b7d 100644 --- a/test/shell/pvmove-abort.sh +++ b/test/shell/pvmove-abort.sh @@ -18,12 +18,15 @@ SKIP_WITH_LVMLOCKD=1 aux lvmconf 'activation/raid_region_size = 16' -aux target_at_least dm-mirror 1 10 0 || skip -# Throttle mirroring -aux throttle_dm_mirror || skip +aux target_at_least dm-mirror 1 2 0 || skip aux prepare_pvs 3 90 +aux delay_dev "$dev3" 0 1 "$(get first_extent_sector "$dev3"):" +# fallback to mirror throttling +# this does not work too well with fast CPUs +test -f HAVE_DM_DELAY || { aux throttle_dm_mirror || skip ; } + vgcreate -s 512k $vg "$dev1" "$dev2" pvcreate --metadatacopies 0 "$dev3" vgextend $vg "$dev3"