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

TEST: Give lvmetad a chance to exit gracefully upon teardown.

Browse Source
This commit is contained in:
Petr Rockai 2012-10-08 20:25:51 +02:00
parent 39468b73a3
commit 556d2c920a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/lib/aux.sh
View File

@ -167,7 +167,9 @@ teardown_devs() {
teardown() { teardown() {
echo -n "## teardown..." echo -n "## teardown..."
test ! -s LOCAL_LVMETAD || kill -9 "$(cat LOCAL_LVMETAD)" || true test ! -s LOCAL_LVMETAD || \
(kill -TERM "$(cat LOCAL_LVMETAD)" && sleep 1 &&
kill -KILL "$(cat LOCAL_LVMETAD)" 2> /dev/null) || true
dm_table | not egrep -q "$vg|$vg1|$vg2|$vg3|$vg4" || { dm_table | not egrep -q "$vg|$vg1|$vg2|$vg3|$vg4" || {
# Avoid activation of dmeventd if there is no pid # Avoid activation of dmeventd if there is no pid