shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-28 03:27:58 +03:00
Code Releases Activity

tests: change default to 30s.

Browse Source 
Keep rather the default lower and avoid to pass it with every call.
This commit is contained in:
Zdenek Kabelac 2015-04-03 19:35:18 +02:00
parent 32a0f625a5
commit 87cb0a3e9f
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/lib/aux.sh
View File

@ -470,6 +470,7 @@ common_dev_() {
init_udev_transaction init_udev_transaction
dmsetup load "$name" "$name.devtable" dmsetup load "$name" "$name.devtable"
# TODO: add support for resume without udev rescan
dmsetup resume "$name" dmsetup resume "$name"
finish_udev_transaction finish_udev_transaction
} }
@ -903,7 +904,7 @@ dmsetup_wrapped() {
wait_pvmove_lv_ready() { wait_pvmove_lv_ready() {
# given sleep .1 this is about 60 secs of waiting # given sleep .1 this is about 60 secs of waiting
local retries=${2:-600} local retries=${2:-300}
while : ; do while : ; do
test $retries -le 0 && die "Waiting for pvmove LV to get activated has timed out" test $retries -le 0 && die "Waiting for pvmove LV to get activated has timed out"
dmsetup info -c -o tables_loaded $1 > out 2>/dev/null|| true; dmsetup info -c -o tables_loaded $1 > out 2>/dev/null|| true;

6
test/shell/pvmove-abort-all.sh
View File

@ -38,12 +38,12 @@ lvcreate -an -Zn -l30 -n $lv1 $vg1 "$dev4"
lvextend -l+30 -n $vg1/$lv1 "$dev5" lvextend -l+30 -n $vg1/$lv1 "$dev5"
pvmove -i1 $backgroundarg "$dev1" "$dev3" $mode & pvmove -i1 $backgroundarg "$dev1" "$dev3" $mode &
aux wait_pvmove_lv_ready "$vg-pvmove0" 300 aux wait_pvmove_lv_ready "$vg-pvmove0"
pvmove -i1 $backgroundarg "$dev2" "$dev3" $mode & pvmove -i1 $backgroundarg "$dev2" "$dev3" $mode &
aux wait_pvmove_lv_ready "$vg-pvmove1" 300 aux wait_pvmove_lv_ready "$vg-pvmove1"
pvmove -i1 $backgroundarg -n $vg1/$lv1 "$dev4" "$dev6" $mode & pvmove -i1 $backgroundarg -n $vg1/$lv1 "$dev4" "$dev6" $mode &
aux wait_pvmove_lv_ready "$vg1-pvmove0" 300 aux wait_pvmove_lv_ready "$vg1-pvmove0"
# test removal of all pvmove LVs # test removal of all pvmove LVs
pvmove --abort pvmove --abort

7
test/shell/pvmove-abort.sh
View File

@ -32,12 +32,9 @@ lvcreate -an -Zn -l30 -n $lv1 $vg "$dev1"
lvcreate -an -Zn -l30 -n $lv2 $vg "$dev2" lvcreate -an -Zn -l30 -n $lv2 $vg "$dev2"
pvmove -i1 $backgroundarg "$dev1" "$dev3" $mode & pvmove -i1 $backgroundarg "$dev1" "$dev3" $mode &
aux wait_pvmove_lv_ready "$vg-pvmove0" 300 aux wait_pvmove_lv_ready "$vg-pvmove0"
pvmove -i1 $backgroundarg "$dev2" "$dev3" $mode & pvmove -i1 $backgroundarg "$dev2" "$dev3" $mode &
aux wait_pvmove_lv_ready "$vg-pvmove1" 300 aux wait_pvmove_lv_ready "$vg-pvmove1"
# Slow things even more for very slow machines....
aux delay_dev "$dev3" 0 1000
# remove specific device # remove specific device
pvmove --abort "$dev1" pvmove --abort "$dev1"

4
test/shell/pvmove-restart.sh
View File

@ -35,7 +35,7 @@ lvextend -l+10 $vg/$lv1 "$dev2"
pvmove -i0 -n $vg/$lv1 "$dev1" "$dev3" $mode & pvmove -i0 -n $vg/$lv1 "$dev1" "$dev3" $mode &
PVMOVE=$! PVMOVE=$!
# Let's wait a bit till pvmove starts and kill it # Let's wait a bit till pvmove starts and kill it
aux wait_pvmove_lv_ready "$vg-pvmove0" 300 aux wait_pvmove_lv_ready "$vg-pvmove0"
kill -9 $PVMOVE kill -9 $PVMOVE
wait wait
@ -80,7 +80,7 @@ dmsetup table
# Restart pvmove # Restart pvmove
# use exclusive activation to have usable pvmove without cmirrord # use exclusive activation to have usable pvmove without cmirrord
vgchange -aey $vg vgchange -aey $vg
aux wait_pvmove_lv_ready "$vg-pvmove0" 300 aux wait_pvmove_lv_ready "$vg-pvmove0"
dmsetup table dmsetup table
pvmove --abort pvmove --abort