shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

test: Disable lvmetad logging in lvconvert-{mirror,raid}*.

Browse Source
This commit is contained in:
Petr Rockai 2014-07-21 21:44:53 +02:00
parent fa2e84caa8
commit f0d314bd6d
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/lib/aux.sh
View File

@ -80,6 +80,7 @@ prepare_dmeventd() {
} }
prepare_lvmetad() { prepare_lvmetad() {
test $# -eq 0 && default_opts="-l wire,debug"
rm -f debug.log rm -f debug.log
# skip if we don't have our own lvmetad... # skip if we don't have our own lvmetad...
(which lvmetad 2>/dev/null | grep "$abs_builddir") || skip (which lvmetad 2>/dev/null | grep "$abs_builddir") || skip
@ -90,8 +91,10 @@ prepare_lvmetad() {
local run_valgrind= local run_valgrind=
test "${LVM_VALGRIND_LVMETAD:-0}" -eq 0 || run_valgrind="run_valgrind" test "${LVM_VALGRIND_LVMETAD:-0}" -eq 0 || run_valgrind="run_valgrind"
kill_sleep_kill_ LOCAL_LVMETAD ${LVM_VALGRIND_LVMETAD:-0}
echo "preparing lvmetad..." echo "preparing lvmetad..."
$run_valgrind lvmetad -f "$@" -s "$TESTDIR/lvmetad.socket" -l wire,debug & $run_valgrind lvmetad -f "$@" -s "$TESTDIR/lvmetad.socket" $default_opts "$@" &
echo $! > LOCAL_LVMETAD echo $! > LOCAL_LVMETAD
while ! test -e "$TESTDIR/lvmetad.socket"; do echo -n .; sleep .1; done # wait for the socket while ! test -e "$TESTDIR/lvmetad.socket"; do echo -n .; sleep .1; done # wait for the socket
echo ok echo ok

2
test/shell/lvconvert-mirror-basic.sh
View File

@ -110,6 +110,8 @@ test_lvconvert() {
fi fi
} }
# disable lvmetad logging as it bogs down test systems
test -e LOCAL_LVMETAD && aux prepare_lvmetad ""
aux prepare_pvs 5 5 aux prepare_pvs 5 5
vgcreate -s 32k $vg $(cat DEVICES) vgcreate -s 32k $vg $(cat DEVICES)

3
test/shell/lvconvert-mirror.sh
View File

@ -11,6 +11,9 @@
. lib/inittest . lib/inittest
# disable lvmetad logging as it bogs down test systems
test -e LOCAL_LVMETAD && aux prepare_lvmetad ""
aux prepare_pvs 5 10 aux prepare_pvs 5 10
# proper DEVRANGE needs to be set according to extent size # proper DEVRANGE needs to be set according to extent size
DEVRANGE="0-32" DEVRANGE="0-32"

3
test/shell/lvconvert-raid.sh
View File

@ -11,6 +11,9 @@
. lib/inittest . lib/inittest
# disable lvmetad logging as it bogs down test systems
test -e LOCAL_LVMETAD && aux prepare_lvmetad ""
get_image_pvs() { get_image_pvs() {
local d local d
local images local images