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

Improve teardown_devs

Browse Source 
Try to avoid start of dmeventd during vgremove if the code has any bug
inside.
This commit is contained in:
Zdenek Kabelac 2012-03-23 09:41:20 +00:00
parent 467f454c09
commit 86bdfb3722
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/lib/aux.sh
View File

@ -102,11 +102,6 @@ teardown_devs_prefixed() {
fi fi
fi fi
if test "$stray" -eq 0; then
dmsetup table | not egrep -q "$vg|$vg1|$vg2|$vg3|$vg4" || \
vgremove -ff $vg $vg1 $vg2 $vg3 $vg4 &>/dev/null || rm -f debug.log
fi
# Remove devices, start with closed (sorted by open count) # Remove devices, start with closed (sorted by open count)
local remfail=no local remfail=no
local need_udev_wait=0 local need_udev_wait=0
@ -166,7 +161,14 @@ teardown_devs() {
teardown() { teardown() {
echo -n "## teardown..." echo -n "## teardown..."
test -f LOCAL_CLVMD && { dmsetup table | not egrep -q "$vg|$vg1|$vg2|$vg3|$vg4" || {
# Avoid activation of dmeventd if there is no pid
cfg=$(test -s LOCAL_DMEVENTD || echo "--config 'activation { monitoring = 0 }'")
vgremove -ff $cfg \
$vg $vg1 $vg2 $vg3 $vg4 &>/dev/null || rm -f debug.log
}
test -s LOCAL_CLVMD && {
kill -INT "$(cat LOCAL_CLVMD)" kill -INT "$(cat LOCAL_CLVMD)"
test -z "$LVM_VALGRIND_CLVMD" || sleep 1 test -z "$LVM_VALGRIND_CLVMD" || sleep 1
sleep .1 sleep .1
@ -176,8 +178,8 @@ teardown() {
echo -n . echo -n .
pgrep dmeventd || true pgrep dmeventd || true
test -f LOCAL_DMEVENTD && kill -9 $(cat LOCAL_DMEVENTD) || true test ! -s LOCAL_DMEVENTD || kill -9 "$(cat LOCAL_DMEVENTD)" || true
test -f LOCAL_LVMETAD && kill -9 $(cat LOCAL_LVMETAD) || true test ! -s LOCAL_LVMETAD || kill -9 "$(cat LOCAL_LVMETAD)" || true
echo -n . echo -n .