|
 |
f0aa83 |
From 509497ae21a4c84f4714835c6f8017a66b666308 Mon Sep 17 00:00:00 2001
|
|
|
f0aa83 |
From: Zdenek Kabelac <zkabelac@redhat.com>
|
|
|
f0aa83 |
Date: Mon, 15 Jan 2018 13:29:14 +0100
|
|
|
f0aa83 |
Subject: [PATCH 22/25] tests: check preserved exclusivness of snapshot merge
|
|
|
f0aa83 |
|
|
|
f0aa83 |
Detect if origin remains exclusively activated after merging.
|
|
|
f0aa83 |
|
|
|
f0aa83 |
(cherry picked from commit 8ebd45fde759c438e854d6b4f02f0e9803094fea)
|
|
|
f0aa83 |
---
|
|
|
f0aa83 |
test/shell/snapshot-merge.sh | 4 ++++
|
|
|
f0aa83 |
test/shell/thin-merge.sh | 9 +++++++++
|
|
|
f0aa83 |
2 files changed, 13 insertions(+)
|
|
|
f0aa83 |
|
|
|
f0aa83 |
diff --git a/test/shell/snapshot-merge.sh b/test/shell/snapshot-merge.sh
|
|
|
f0aa83 |
index 9d0a264..41e7b00 100644
|
|
|
f0aa83 |
--- a/test/shell/snapshot-merge.sh
|
|
|
f0aa83 |
+++ b/test/shell/snapshot-merge.sh
|
|
|
f0aa83 |
@@ -54,7 +54,11 @@ setup_merge_ $vg $lv1
|
|
|
f0aa83 |
|
|
|
f0aa83 |
# make sure lvconvert --merge requires explicit LV listing
|
|
|
f0aa83 |
not lvconvert --merge
|
|
|
f0aa83 |
+
|
|
|
f0aa83 |
+# check exclusive lock is preserved after merge
|
|
|
f0aa83 |
+check lv_field "$vg/$lv1" lv_active_exclusively "active exclusively"
|
|
|
f0aa83 |
lvconvert --merge "$vg/$(snap_lv_name_ "$lv1")"
|
|
|
f0aa83 |
+check lv_field "$vg/$lv1" lv_active_exclusively "active exclusively"
|
|
|
f0aa83 |
lvremove -f $vg/$lv1
|
|
|
f0aa83 |
|
|
|
f0aa83 |
setup_merge_ $vg $lv1
|
|
|
f0aa83 |
diff --git a/test/shell/thin-merge.sh b/test/shell/thin-merge.sh
|
|
|
f0aa83 |
index 3abda40..24dec96 100644
|
|
|
f0aa83 |
--- a/test/shell/thin-merge.sh
|
|
|
f0aa83 |
+++ b/test/shell/thin-merge.sh
|
|
|
f0aa83 |
@@ -30,6 +30,15 @@ aux have_thin 1 0 0 || skip
|
|
|
f0aa83 |
aux prepare_vg 2
|
|
|
f0aa83 |
|
|
|
f0aa83 |
lvcreate -T -L8M $vg/pool -V10M -n $lv1
|
|
|
f0aa83 |
+lvcreate -s -K -n snap $vg/$lv1
|
|
|
f0aa83 |
+# check exclusive lock is preserved after merge
|
|
|
f0aa83 |
+check lv_field "$vg/$lv1" lv_active_exclusively "active exclusively"
|
|
|
f0aa83 |
+lvconvert --merge $vg/snap
|
|
|
f0aa83 |
+check lv_field "$vg/$lv1" lv_active_exclusively "active exclusively"
|
|
|
f0aa83 |
+lvremove -ff $vg
|
|
|
f0aa83 |
+
|
|
|
f0aa83 |
+
|
|
|
f0aa83 |
+lvcreate -T -L8M $vg/pool -V10M -n $lv1
|
|
|
f0aa83 |
lvchange --addtag tagL $vg/$lv1
|
|
|
f0aa83 |
|
|
|
f0aa83 |
mkdir mnt
|
|
|
f0aa83 |
--
|
|
|
f0aa83 |
1.8.3.1
|
|
|
f0aa83 |
|