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

aux: more efficient lvmlock shutdown

This commit is contained in:
Zdenek Kabelac 2023-04-24 22:18:57 +02:00
parent 8947964f10
commit 5e4c0701d9

View File

@ -175,7 +175,7 @@ prepare_lvmlockd() {
fi fi
sleep 1 sleep 1
if ! pgrep lvmlockd; then if ! pgrep lvmlockd >LOCAL_LVMLOCKD; then
echo "Failed to start lvmlockd" echo "Failed to start lvmlockd"
exit 1 exit 1
fi fi
@ -552,11 +552,7 @@ teardown() {
if test -n "$LVM_TEST_LVMLOCKD_TEST" ; then if test -n "$LVM_TEST_LVMLOCKD_TEST" ; then
echo "" echo ""
echo "## stopping lvmlockd in teardown" echo "## stopping lvmlockd in teardown"
killall lvmlockd kill_sleep_kill_ LOCAL_LVMLOCKD 0
sleep 1
killall lvmlockd || true
sleep 1
killall -9 lvmlockd || true
fi fi
dm_table | not grep -E -q "$vg|$vg1|$vg2|$vg3|$vg4" || { dm_table | not grep -E -q "$vg|$vg1|$vg2|$vg3|$vg4" || {