diff options
| author | Petr Rockai <prockai@redhat.com> | 2014-07-21 21:44:53 +0200 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2014-10-01 08:20:08 +0200 |
| commit | 38da9a2a429670b513cae38785581b97fecfc46c (patch) | |
| tree | e9d8879b2e320f5e5e655ea2c0766f06965003ac | |
| parent | 2250524d5a0dc0427c1b7f1f1bc70adb79c30e1d (diff) | |
| download | lvm2-38da9a2a429670b513cae38785581b97fecfc46c.tar.gz | |
test: Disable lvmetad logging in lvconvert-{mirror,raid}*.
| -rw-r--r-- | test/lib/aux.sh | 5 | ||||
| -rw-r--r-- | test/shell/lvconvert-mirror-basic.sh | 2 | ||||
| -rw-r--r-- | test/shell/lvconvert-mirror.sh | 3 | ||||
| -rw-r--r-- | test/shell/lvconvert-raid.sh | 3 |
4 files changed, 12 insertions, 1 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 183996dcf..45643cc0d 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -79,6 +79,7 @@ prepare_dmeventd() { } prepare_lvmetad() { + test $# -eq 0 && default_opts="-l wire,debug" rm -f debug.log # skip if we don't have our own lvmetad... (which lvmetad 2>/dev/null | grep "$abs_builddir") || skip @@ -89,8 +90,10 @@ prepare_lvmetad() { local 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..." - $run_valgrind lvmetad -f "$@" -s "$TESTDIR/lvmetad.socket" -l wire,debug & + $run_valgrind lvmetad -f "$@" -s "$TESTDIR/lvmetad.socket" $default_opts "$@" & echo $! > LOCAL_LVMETAD while ! test -e "$TESTDIR/lvmetad.socket"; do echo -n .; sleep .1; done # wait for the socket echo ok diff --git a/test/shell/lvconvert-mirror-basic.sh b/test/shell/lvconvert-mirror-basic.sh index 07bafb950..ce5b34494 100644 --- a/test/shell/lvconvert-mirror-basic.sh +++ b/test/shell/lvconvert-mirror-basic.sh @@ -110,6 +110,8 @@ test_lvconvert() { fi } +# disable lvmetad logging as it bogs down test systems +test -e LOCAL_LVMETAD && aux prepare_lvmetad "" aux prepare_pvs 5 5 vgcreate -s 32k $vg $(cat DEVICES) diff --git a/test/shell/lvconvert-mirror.sh b/test/shell/lvconvert-mirror.sh index d8f057a9b..6ba2ab2f0 100644 --- a/test/shell/lvconvert-mirror.sh +++ b/test/shell/lvconvert-mirror.sh @@ -11,6 +11,9 @@ . lib/inittest +# disable lvmetad logging as it bogs down test systems +test -e LOCAL_LVMETAD && aux prepare_lvmetad "" + aux prepare_pvs 5 10 # proper DEVRANGE needs to be set according to extent size DEVRANGE="0-32" diff --git a/test/shell/lvconvert-raid.sh b/test/shell/lvconvert-raid.sh index bcf3874c6..8a84257f5 100644 --- a/test/shell/lvconvert-raid.sh +++ b/test/shell/lvconvert-raid.sh @@ -11,6 +11,9 @@ . lib/inittest +# disable lvmetad logging as it bogs down test systems +test -e LOCAL_LVMETAD && aux prepare_lvmetad "" + get_image_pvs() { local d local images |