From f0d314bd6dcf22cee8e18c6e21fa06829a0f01ac Mon Sep 17 00:00:00 2001
From: Petr Rockai <prockai@redhat.com>
Date: Mon, 21 Jul 2014 21:44:53 +0200
Subject: [PATCH] test: Disable lvmetad logging in lvconvert-{mirror,raid}*.

---
 test/lib/aux.sh                      | 5 ++++-
 test/shell/lvconvert-mirror-basic.sh | 2 ++
 test/shell/lvconvert-mirror.sh       | 3 +++
 test/shell/lvconvert-raid.sh         | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 9def3042a..84edb7d79 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -80,6 +80,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
@@ -90,8 +91,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 12e042094..34c94bf20 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