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

tests: avoid endless loops

Browse Source 
If there is some problem with device removal avoid generating very long
error logs...
This commit is contained in:
Zdenek Kabelac 2017-07-18 21:17:51 +02:00
parent 9599645bb6
commit 466da710e0
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/shell/pvmove-resume-1.sh
View File

@ -54,10 +54,17 @@ test_pvmove_resume() {
wait
while dmsetup status "$vg-$lv1"; do dmsetup remove "$vg-$lv1" || true; done
while dmsetup status "$vg1-$lv1"; do dmsetup remove "$vg1-$lv1" || true; done
while dmsetup status "$vg-pvmove0"; do dmsetup remove "$vg-pvmove0" || true; done
while dmsetup status "$vg1-pvmove0"; do dmsetup remove "$vg1-pvmove0" || true; done
local finished
for i in {1..100}; do
finished=1
for d in "$vg-$lv1" "$vg1-$lv1" "$vg-pvmove0" "$vg1-pvmove0" ; do
dmsetup status "$d" 2>/dev/null && {
dmsetup remove "$d" || finished=0
}
done
test "$finished" -eq 0 || break
done
test "$finished" -eq 0 && die "Can't remove device"
check lv_attr_bit type $vg/pvmove0 "p"
check lv_attr_bit type $vg1/pvmove0 "p"

16
test/shell/pvmove-resume-2.sh
View File

@ -44,9 +44,17 @@ test_pvmove_resume() {
wait
while dmsetup status "$vg-$lv1"; do dmsetup remove "$vg-$lv1" || true; done
while dmsetup status "$vg-$lv2"; do dmsetup remove "$vg-$lv2" || true; done
while dmsetup status "$vg-pvmove0"; do dmsetup remove "$vg-pvmove0" || true; done
local finished
for i in {1..100}; do
finished=1
for d in "$vg-$lv1" "$vg-$lv2" "$vg-pvmove0" ; do
dmsetup status "$d" 2>/dev/null && {
dmsetup remove "$d" || finished=0
}
done
test "$finished" -eq 0 || break
done
test "$finished" -eq 0 && die "Can't remove device"
check lv_attr_bit type $vg/pvmove0 "p"
@ -59,7 +67,7 @@ test_pvmove_resume() {
# errors, based on the fact pvmove is killed -9
# Restart clvmd
kill "$(< LOCAL_CLVMD)"
for i in $(seq 1 100) ; do
for i in {1 100} ; do
test $i -eq 100 && die "Shutdown of clvmd is too slow."
test -e "$CLVMD_PIDFILE" || break
sleep .1