From 1cf64de2bfdbff37ebc1e33f8cf5c862d1854f6d Mon Sep 17 00:00:00 2001
From: Jonathan Earl Brassow <jbrassow@redhat.com>
Date: Wed, 31 Mar 2010 02:36:03 +0000
Subject: [PATCH] For the mirror repair tests, we should use --ignoremonitoring
 because we are running the repair manually.  If we don't ignore, then
 dmeventd and the manually run repair can collide.  (We should still get clean
 results in such a case, but it makes it harder to validate the test results.)

---
 test/t-lvconvert-repair-policy.sh |  2 +-
 test/t-lvconvert-repair.sh        | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/t-lvconvert-repair-policy.sh b/test/t-lvconvert-repair-policy.sh
index 96305ff4d..4f33cfc98 100644
--- a/test/t-lvconvert-repair-policy.sh
+++ b/test/t-lvconvert-repair-policy.sh
@@ -21,7 +21,7 @@ cleanup() {
 	for d in "$@"; do enable_dev $d; done
 	for d in "$@"; do vgextend $vg $d; done
 	lvremove -ff $vg/mirror
-	lvcreate -m 1 -l 2 -n mirror $vg $dev1 $dev2 $dev3:0
+	lvcreate -m 1 --ig -l 2 -n mirror $vg $dev1 $dev2 $dev3:0
 }
 
 repair() {
diff --git a/test/t-lvconvert-repair.sh b/test/t-lvconvert-repair.sh
index 796833b6f..1dd4f4f18 100644
--- a/test/t-lvconvert-repair.sh
+++ b/test/t-lvconvert-repair.sh
@@ -15,7 +15,7 @@ prepare_vg 5
 
 # fail multiple devices
 
-lvcreate -m 3 -L 1 -n 3way $vg
+lvcreate -m 3 --ig -L 1 -n 3way $vg
 disable_dev $dev2 $dev4
 echo n | lvconvert -i 1 --repair $vg/3way
 lvs -a -o +devices > lvlist
@@ -27,7 +27,7 @@ lvchange -a n $vg/3way
 vgremove -ff $vg
 vgcreate -c n $vg $dev1 $dev2 $dev3 $dev4
 
-lvcreate -m 2 -L 1 -n 4way $vg
+lvcreate -m 2 --ig -L 1 -n 4way $vg
 disable_dev $dev1 $dev2
 echo n | lvconvert -i 1 --repair $vg/4way
 lvs -a -o +devices > lvlist
@@ -41,7 +41,7 @@ lvchange -a n $vg/4way
 vgremove -ff $vg
 vgcreate -c n $vg $dev1 $dev2 $dev3
 
-lvcreate -m 1 -L 1 -n mirror $vg
+lvcreate -m 1 --ig -L 1 -n mirror $vg
 
 lvchange -a n $vg/mirror
 vgextend $vg $dev4
@@ -63,11 +63,15 @@ vgextend $vg $dev2
 disable_dev $dev3
 lvconvert -y -i 1 --repair $vg/mirror
 vgreduce --removemissing $vg
-
 enable_dev $dev3
 vgextend $vg $dev3
-lvcreate -m 2 -l 1 -n mirror2 $vg $dev1 $dev2 $dev3 $dev4
+lvremove -ff $vg
+
+# Test repair of inactive mirror with log failure
+#  Replacement should fail, but covert should succeed (switch to corelog)
+lvcreate -m 2 --ig -l 2 -n mirror2 $vg $dev1 $dev2 $dev3 $dev4:0
 vgchange -a n $vg
 pvremove -ff -y $dev4
 echo 'y' | lvconvert -y -i 1 --repair $vg/mirror2
+# FIXME: check that mirror ok and log is now 'core'
 vgs
-- 
2.43.5