summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2016-04-25 14:22:42 -0500
committerDavid Teigland <teigland@redhat.com>2016-04-25 15:02:23 -0500
commit4a2eb3debb68fd98a0ea91f7c3da4d494e70a42f (patch)
tree062604883de3661b7b5fd81f48122cfcefe2ee27
parent5cff83dadf151820e10d208be38b613c4ed0e0d0 (diff)
downloadlvm2-dev-dct-lvmetad-disabled-8.tar.gz
test: vgsplit-usagedev-dct-lvmetad-disabled-8
Restart clvmd between testing each mdatype to avoid a problem with dev state being kept from one test to the next.
-rw-r--r--test/shell/vgsplit-usage.sh15
1 files changed, 14 insertions, 1 deletions
diff --git a/test/shell/vgsplit-usage.sh b/test/shell/vgsplit-usage.sh
index 4f5c6d46b..f404a5ba3 100644
--- a/test/shell/vgsplit-usage.sh
+++ b/test/shell/vgsplit-usage.sh
@@ -152,8 +152,22 @@ lvcreate -l 4 -n $lv2 $vg1
vgchange -an $vg1
not vgsplit $vg1 $vg2 "$dev3" 2>err;
vgremove -f $vg2 $vg1
+
+# Restart clvm because using the same
+# devs as lvm1 and then lvm2 causes problems.
+if test -e LOCAL_CLVMD ; then
+ kill $(< LOCAL_CLVMD)
+ for i in $(seq 1 100) ; do
+ test $i -eq 100 && die "Shutdown of clvmd is too slow."
+ pgrep clvmd || break
+ sleep .1
+ done # wait for the pid removal
+ aux prepare_clvmd
+fi
+
done
+if test -z "$LVM_TEST_LVM1" ; then
# ONLY LVM2 metadata
# setup PVs" '
pvcreate --metadatacopies 0 "$dev5"
@@ -168,7 +182,6 @@ check pvlv_counts $vg1 2 1 0
vgremove -f $vg1
# vgsplit rejects split because metadata types differ
-if test -n "$LVM_TEST_LVM1" ; then
pvcreate -ff -M1 "$dev3" "$dev4"
pvcreate -ff "$dev1" "$dev2"
vgcreate -M1 $vg1 "$dev3" "$dev4"