master - tests: checking mirror_remove_missing
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b57b4db8894056...
Commit: b57b4db88940566cb7df9368eb5520ebab1634a2
Parent: f919a255b7875db0049eb71e10a2638842541415
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 20 22:50:52 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue May 20 22:50:52 2014 +0200
tests: checking mirror_remove_missing
FIXME:
Seems like conversion of log is not supported in clustered VG
and needs to be fixed.
---
test/shell/lvconvert-repair-replace.sh | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/test/shell/lvconvert-repair-replace.sh b/test/shell/lvconvert-repair-replace.sh
index 53c0938..c02d2ac 100644
--- a/test/shell/lvconvert-repair-replace.sh
+++ b/test/shell/lvconvert-repair-replace.sh
@@ -51,10 +51,15 @@ check mirror $vg 2way
aux enable_dev "$dev1" "$dev2"
vgremove -ff $vg
+# FIXME - exclusive activation for mirrors should work here
+# conversion of inactive cluster logs is also unsupported
+test -e LOCAL_CLVMD && exit 0
+
+
# Test repair of inactive mirror with log failure
# Replacement should fail, but convert should succeed (switch to corelog)
vgcreate $vg "$dev1" "$dev2" "$dev3" "$dev4"
-lvcreate -aey --type mirror -m 2 --ignoremonitoring --nosync -l 2 -n mirror2 $vg "$dev1" "$dev2" "$dev3" "$dev4":0
+lvcreate -aey --type mirror -m 2 --ignoremonitoring -l 2 -n mirror2 $vg "$dev1" "$dev2" "$dev3" "$dev4":0
vgchange -a n $vg
pvremove -ff -y "$dev4"
lvconvert -y --repair $vg/mirror2
@@ -62,9 +67,6 @@ check mirror $vg mirror2
vgs $vg
vgremove -ff $vg
-# FIXME - exclusive activation for mirrors should work here
-test -e LOCAL_CLVMD && exit 0
-
if kernel_at_least 3 0 0; then
# 2-way, mirrored log
# Double log failure, full replace
9 years, 11 months
master - tests: lvconvert needs --yes
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f919a255b7875d...
Commit: f919a255b7875db0049eb71e10a2638842541415
Parent: e538354e281c7b00667b3385878b4c32693359b5
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 20 22:50:33 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue May 20 22:50:33 2014 +0200
tests: lvconvert needs --yes
---
test/shell/pvmove-cache-segtypes.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/shell/pvmove-cache-segtypes.sh b/test/shell/pvmove-cache-segtypes.sh
index db3bde5..c9f2078 100644
--- a/test/shell/pvmove-cache-segtypes.sh
+++ b/test/shell/pvmove-cache-segtypes.sh
@@ -110,7 +110,7 @@ lvremove -ff $vg
lvcreate -l 2 -n ${lv1}_foo $vg "$dev1"
lvcreate --type raid1 -L 2M -n meta $vg "$dev1" "$dev2"
lvcreate --type raid1 -L 4M -n ${lv1}_pool $vg "$dev1" "$dev2"
-lvconvert --type cache-pool $vg/${lv1}_pool --poolmetadata $vg/meta
+lvconvert --yes --type cache-pool $vg/${lv1}_pool --poolmetadata $vg/meta
lvcreate --type cache -n $lv1 -L 8M $vg/${lv1}_pool "$dev5"
check lv_tree_on $vg ${lv1}_foo "$dev1"
@@ -142,7 +142,7 @@ lvcreate -l 2 -n ${lv1}_foo $vg "$dev1"
# RAID for cachepool
lvcreate --type raid1 -m 1 -L 2M -n meta $vg "$dev1" "$dev2"
lvcreate --type raid1 -m 1 -L 4M -n cachepool $vg "$dev1" "$dev2"
-lvconvert --type cache-pool $vg/cachepool --poolmetadata $vg/meta
+lvconvert --yes --type cache-pool $vg/cachepool --poolmetadata $vg/meta
# RAID for thin pool data LV
lvcreate --type raid1 -m 1 -L 8 -n thinpool $vg "$dev3" "$dev4"
# Convert thin pool data to a cached LV
@@ -150,7 +150,7 @@ lvconvert --type cache $vg/thinpool --cachepool $vg/cachepool
# Create simple thin pool meta
lvcreate -L 2M -n meta $vg "$dev1"
# Use thin pool data LV to build a thin pool
-lvconvert --thinpool $vg/thinpool --poolmetadata $vg/meta
+lvconvert --yes --thinpool $vg/thinpool --poolmetadata $vg/meta
# Create a thin lv for fun
lvcreate -T $vg/thinpool -V 20 -n thin_lv
@@ -174,4 +174,4 @@ check lv_tree_on $vg thinpool "$dev3" "$dev4" "$dev5" # Move non-cache tmeta
#check lv_tree_on $vg $vg/thinpool "$dev3" "$dev4"
#check dev_md5sum $vg/thin_lv
-lvremove -ff $vg
\ No newline at end of file
+lvremove -ff $vg
9 years, 11 months
master - spec: configurable cache build
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e538354e281c7b...
Commit: e538354e281c7b00667b3385878b4c32693359b5
Parent: 08fd24450685abd935d744795a6c2fc5e819ef64
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 20 19:56:20 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue May 20 21:50:30 2014 +0200
spec: configurable cache build
Install lvmcache man page when being configured with cache support.
Install lvmthin man page only with thin support.
---
spec/packages.inc | 8 ++++++--
spec/source.inc | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/spec/packages.inc b/spec/packages.inc
index 5999ab7..e70f6ad 100644
--- a/spec/packages.inc
+++ b/spec/packages.inc
@@ -82,9 +82,13 @@ fi
%if %{have_service lvmetad}
%{_sbindir}/lvmetad
%endif
+%if %{have_with cache}
+ %{_mandir}/man7/lvmcache.7.gz
+%endif
+%if %{have_with thin}
+ %{_mandir}/man7/lvmthin.7.gz
+%endif
%{_mandir}/man5/lvm.conf.5.gz
-%{_mandir}/man7/lvmcache.7.gz
-%{_mandir}/man7/lvmthin.7.gz
%{_mandir}/man8/fsadm.8.gz
%{_mandir}/man8/lvchange.8.gz
%{_mandir}/man8/lvconvert.8.gz
diff --git a/spec/source.inc b/spec/source.inc
index 0a1c270..6ef4791 100644
--- a/spec/source.inc
+++ b/spec/source.inc
@@ -13,6 +13,7 @@
%with clvmd corosync
# TODO %global req_dm_persistent device-mapper-persistent-data >= 0.1.4
+%with cache internal
%with thin internal
%with thin_check %{_sbindir}/thin_check
%with thin_repair %{_sbindir}/thin_repair
@@ -39,6 +40,7 @@
%endif
%if %{fedora} == 16
+%with cache none
%with thin none
%with thin_check
%with thin_repair
9 years, 11 months
master - tests: rebuild paths when Makefile is updated
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=08fd24450685ab...
Commit: 08fd24450685abd935d744795a6c2fc5e819ef64
Parent: 2e9792121fa93e7cb67583cd2757dd52ab2825dc
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 20 21:27:43 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue May 20 21:50:30 2014 +0200
tests: rebuild paths when Makefile is updated
---
test/Makefile.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/Makefile.in b/test/Makefile.in
index 33b7042..1538fa3 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -137,7 +137,7 @@ lib/%: $(srcdir)/lib/%.sh .lib-dir-stamp
cp $< $@
chmod +x $@
-lib/paths: $(srcdir)/Makefile.in .lib-dir-stamp
+lib/paths: $(srcdir)/Makefile.in .lib-dir-stamp Makefile
$(RM) $@-t
echo 'top_srcdir="$(top_srcdir)"' >> $@-t
echo 'abs_top_builddir="$(abs_top_builddir)"' >> $@-t
9 years, 11 months
master - tests: add have_cache and have_raid
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2e9792121fa93e...
Commit: 2e9792121fa93e7cb67583cd2757dd52ab2825dc
Parent: 7f92c3a13eeba179872dacd4b632d8bb5188a0ba
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 20 19:54:48 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue May 20 21:50:30 2014 +0200
tests: add have_cache and have_raid
Need to be aware of build options, when system would be
configure without raid or cache support
---
test/Makefile.in | 2 ++
test/lib/aux.sh | 14 ++++++++++++--
test/shell/lvchange-partial-raid10.sh | 2 +-
test/shell/lvchange-partial.sh | 2 +-
test/shell/lvchange-raid.sh | 6 +++---
test/shell/lvchange-raid10.sh | 2 +-
test/shell/lvchange-raid456.sh | 2 +-
test/shell/lvconvert-raid.sh | 2 +-
test/shell/lvconvert-raid10.sh | 2 +-
test/shell/lvconvert-raid456.sh | 2 +-
test/shell/lvconvert-repair-raid.sh | 2 +-
test/shell/lvconvert-thin-external.sh | 2 +-
test/shell/lvcreate-cache.sh | 2 +-
test/shell/lvcreate-large-raid.sh | 2 +-
test/shell/lvcreate-large-raid10.sh | 2 +-
test/shell/lvcreate-raid.sh | 2 +-
test/shell/lvcreate-raid10.sh | 2 +-
test/shell/lvresize-raid.sh | 2 +-
test/shell/lvresize-raid10.sh | 2 +-
test/shell/pvmove-cache-segtypes.sh | 6 +++---
test/shell/pvmove-raid-segtypes.sh | 2 +-
test/shell/pvmove-thin-segtypes.sh | 4 ++--
test/shell/pvremove-thin.sh | 2 +-
test/shell/vgsplit-raid.sh | 2 +-
24 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/test/Makefile.in b/test/Makefile.in
index 33d8ab4..33b7042 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -146,6 +146,8 @@ lib/paths: $(srcdir)/Makefile.in .lib-dir-stamp
echo 'abs_builddir="$(abs_builddir)"' >> $@-t
echo 'export DM_UDEV_SYNCHRONISATION=$(dm_udev_synchronisation)' >> $@-t
echo 'export THIN=@THIN@' >> $@-t
+ echo 'export RAID=@RAID@' >> $@-t
+ echo 'export CACHE=@CACHE@' >> $@-t
echo 'export LVMETAD_PIDFILE="@LVMETAD_PIDFILE@"' >> $@-t
echo 'export DMEVENTD_PIDFILE="@DMEVENTD_PIDFILE@"' >> $@-t
echo 'export CLVMD_PIDFILE="@CLVMD_PIDFILE@"' >> $@-t
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 8b765e9..0832f24 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -770,13 +770,23 @@ target_at_least() {
}
have_thin() {
- target_at_least dm-thin-pool "$@" || exit 1
- test "$THIN" = shared || test "$THIN" = internal || exit 1
+ test "$THIN" = shared -o "$THIN" = internal || return 1
+ target_at_least dm-thin-pool "$@" || return 1
# disable thin_check if not present in system
which thin_check || lvmconf 'global/thin_check_executable = ""'
}
+have_raid() {
+ test "$RAID" = shared -o "$RAID" = internal || return 1
+ target_at_least dm-raid "$@"
+}
+
+have_cache() {
+ test "$CACHE" = shared -o "$CACHE" = internal || return 1
+ target_at_least dm-cache "$@"
+}
+
# check if lvm shell is build-in (needs readline)
have_readline() {
echo version | lvm &>/dev/null
diff --git a/test/shell/lvchange-partial-raid10.sh b/test/shell/lvchange-partial-raid10.sh
index 3141add..3c112bb 100644
--- a/test/shell/lvchange-partial-raid10.sh
+++ b/test/shell/lvchange-partial-raid10.sh
@@ -11,7 +11,7 @@
. lib/test
-aux target_at_least dm-raid 1 3 2 || skip
+aux have_raid 1 3 2 || skip
aux prepare_vg 4
diff --git a/test/shell/lvchange-partial.sh b/test/shell/lvchange-partial.sh
index 7483d88..c3d7217 100644
--- a/test/shell/lvchange-partial.sh
+++ b/test/shell/lvchange-partial.sh
@@ -15,7 +15,7 @@
aux prepare_vg 4
TYPE=raid1
-aux target_at_least dm-raid 1 1 0 || TYPE=mirror
+aux have_raid 1 1 0 || TYPE=mirror
lvcreate -aey --type $TYPE -m 1 -l 2 -n $lv1 $vg
lvchange -an $vg/$lv1
diff --git a/test/shell/lvchange-raid.sh b/test/shell/lvchange-raid.sh
index 8ef6c33..209e094 100644
--- a/test/shell/lvchange-raid.sh
+++ b/test/shell/lvchange-raid.sh
@@ -17,9 +17,9 @@
# Proper mismatch count 1.5.2 upstream,1.3.5 < x < 1.4.0 in RHEL6
#
# We will simplify and simple test for 1.5.2 and 1.3.5 < x < 1.4.0
-aux target_at_least dm-raid 1 3 5 &&
- ! aux target_at_least dm-raid 1 4 0 ||
- aux target_at_least dm-raid 1 5 2 || skip
+aux have_raid 1 3 5 &&
+ ! aux have_raid 1 4 0 ||
+ aux have_raid 1 5 2 || skip
# DEVICE "$dev6" is reserved for non-RAID LVs that
# will not undergo failure
diff --git a/test/shell/lvchange-raid10.sh b/test/shell/lvchange-raid10.sh
index b31c328..0d17928 100644
--- a/test/shell/lvchange-raid10.sh
+++ b/test/shell/lvchange-raid10.sh
@@ -13,7 +13,7 @@ TEST_RAID=raid10
. shell/lvchange-raid.sh
-aux target_at_least dm-raid 1 5 2 || skip
+aux have_raid 1 5 2 || skip
run_types raid10 -m 1 -i 2 "$dev1" "$dev2" "$dev3" "$dev4"
diff --git a/test/shell/lvchange-raid456.sh b/test/shell/lvchange-raid456.sh
index 83f82c3..b1dd1db 100644
--- a/test/shell/lvchange-raid456.sh
+++ b/test/shell/lvchange-raid456.sh
@@ -14,7 +14,7 @@ TEST_RAID=raid456
. shell/lvchange-raid.sh
aux raid456_replace_works || skip
-aux target_at_least dm-raid 1 5 2 || skip
+aux have_raid 1 5 2 || skip
run_types raid4 -i 2 "$dev1" "$dev2" "$dev3" "$dev4"
run_types raid5 -i 2 "$dev1" "$dev2" "$dev3" "$dev4"
diff --git a/test/shell/lvconvert-raid.sh b/test/shell/lvconvert-raid.sh
index 01118cb..2a498b2 100644
--- a/test/shell/lvconvert-raid.sh
+++ b/test/shell/lvconvert-raid.sh
@@ -22,7 +22,7 @@ get_image_pvs() {
########################################################
# MAIN
########################################################
-aux target_at_least dm-raid 1 2 0 || skip
+aux have_raid 1 2 0 || skip
aux prepare_pvs 5
vgcreate -s 256k $vg $(cat DEVICES)
diff --git a/test/shell/lvconvert-raid10.sh b/test/shell/lvconvert-raid10.sh
index 6297f65..e9b0ef8 100644
--- a/test/shell/lvconvert-raid10.sh
+++ b/test/shell/lvconvert-raid10.sh
@@ -24,7 +24,7 @@ get_image_pvs() {
########################################################
# RAID10: Can replace 'copies - 1' devices from each stripe
# Tests are run on 2-way mirror, 3-way stripe RAID10
-aux target_at_least dm-raid 1 3 1 || skip
+aux have_raid 1 3 1 || skip
# 9 PVs needed for RAID10 testing (3-stripes/2-mirror - replacing 3 devs)
aux prepare_pvs 9 80
diff --git a/test/shell/lvconvert-raid456.sh b/test/shell/lvconvert-raid456.sh
index bf9a823..b9386c9 100644
--- a/test/shell/lvconvert-raid456.sh
+++ b/test/shell/lvconvert-raid456.sh
@@ -23,7 +23,7 @@ get_image_pvs() {
# MAIN
########################################################
aux raid456_replace_works || skip
-aux target_at_least dm-raid 1 2 0 || skip
+aux have_raid 1 2 0 || skip
aux prepare_pvs 6
vgcreate -s 256k $vg $(cat DEVICES)
diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh
index bc5483b..7d4ea7e 100644
--- a/test/shell/lvconvert-repair-raid.sh
+++ b/test/shell/lvconvert-repair-raid.sh
@@ -12,7 +12,7 @@
. lib/test
aux raid456_replace_works || skip
-aux target_at_least dm-raid 1 1 0 || skip
+aux have_raid 1 1 0 || skip
aux lvmconf 'allocation/maximise_cling = 0'
aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1'
diff --git a/test/shell/lvconvert-thin-external.sh b/test/shell/lvconvert-thin-external.sh
index 00712bd..5d52e60 100644
--- a/test/shell/lvconvert-thin-external.sh
+++ b/test/shell/lvconvert-thin-external.sh
@@ -157,7 +157,7 @@ lvremove -ff $vg
# Test conversion to the pool and thin external at the same time (rhbz #1003461)
lvcreate -l50 -n pool $vg
lvcreate -l100 -n thin $vg
-lvconvert --thin --thinpool $vg/pool $vg/thin --originname thin-origin
+lvconvert --yes --thin --thinpool $vg/pool $vg/thin --originname thin-origin
check lv_field $vg/thin segtype thin
check lv_field $vg/thin-origin segtype linear
diff --git a/test/shell/lvcreate-cache.sh b/test/shell/lvcreate-cache.sh
index 302a708..1c438e7 100644
--- a/test/shell/lvcreate-cache.sh
+++ b/test/shell/lvcreate-cache.sh
@@ -11,7 +11,7 @@
. lib/test
-aux target_at_least dm-cache 1 3 0 || skip
+aux have_cache 1 3 0 || skip
aux prepare_vg 5 80
diff --git a/test/shell/lvcreate-large-raid.sh b/test/shell/lvcreate-large-raid.sh
index 3f06d04..84110ab 100644
--- a/test/shell/lvcreate-large-raid.sh
+++ b/test/shell/lvcreate-large-raid.sh
@@ -16,7 +16,7 @@
# FIXME update test to make something useful on <16T
aux can_use_16T || skip
-aux target_at_least dm-raid 1 1 0 || skip
+aux have_raid 1 1 0 || skip
aux prepare_vg 5
diff --git a/test/shell/lvcreate-large-raid10.sh b/test/shell/lvcreate-large-raid10.sh
index 635d7a3..5a15ee0 100644
--- a/test/shell/lvcreate-large-raid10.sh
+++ b/test/shell/lvcreate-large-raid10.sh
@@ -16,7 +16,7 @@
# FIXME update test to make something useful on <16T
aux can_use_16T || skip
-aux target_at_least dm-raid 1 3 0 || skip
+aux have_raid 1 3 0 || skip
aux prepare_vg 5
diff --git a/test/shell/lvcreate-raid.sh b/test/shell/lvcreate-raid.sh
index d0d365f..d9c949a 100644
--- a/test/shell/lvcreate-raid.sh
+++ b/test/shell/lvcreate-raid.sh
@@ -18,7 +18,7 @@ lv_devices() {
########################################################
# MAIN
########################################################
-aux target_at_least dm-raid 1 1 0 || skip
+aux have_raid 1 1 0 || skip
aux prepare_pvs 6 20 # 6 devices for RAID10 (2-mirror,3-stripe) test
vgcreate -s 512k $vg $(cat DEVICES)
diff --git a/test/shell/lvcreate-raid10.sh b/test/shell/lvcreate-raid10.sh
index a521794..ae02ab2 100644
--- a/test/shell/lvcreate-raid10.sh
+++ b/test/shell/lvcreate-raid10.sh
@@ -18,7 +18,7 @@ lv_devices() {
########################################################
# MAIN
########################################################
-aux target_at_least dm-raid 1 3 0 || skip
+aux have_raid 1 3 0 || skip
aux prepare_pvs 6 20 # 6 devices for RAID10 (2-mirror,3-stripe) test
vgcreate -s 512k $vg $(cat DEVICES)
diff --git a/test/shell/lvresize-raid.sh b/test/shell/lvresize-raid.sh
index bc8b36f..e13a08d 100644
--- a/test/shell/lvresize-raid.sh
+++ b/test/shell/lvresize-raid.sh
@@ -11,7 +11,7 @@
. lib/test
-aux target_at_least dm-raid 1 1 0 || skip
+aux have_raid 1 1 0 || skip
aux prepare_pvs 6 80
diff --git a/test/shell/lvresize-raid10.sh b/test/shell/lvresize-raid10.sh
index 306507f..42cfeb4 100644
--- a/test/shell/lvresize-raid10.sh
+++ b/test/shell/lvresize-raid10.sh
@@ -11,7 +11,7 @@
. lib/test
-aux target_at_least dm-raid 1 3 0 || skip
+aux have_raid 1 3 0 || skip
aux prepare_vg 5
diff --git a/test/shell/pvmove-cache-segtypes.sh b/test/shell/pvmove-cache-segtypes.sh
index 2b62b1f..db3bde5 100644
--- a/test/shell/pvmove-cache-segtypes.sh
+++ b/test/shell/pvmove-cache-segtypes.sh
@@ -22,10 +22,10 @@ test_description="ensure pvmove works with the cache segment types"
test -e LOCAL_CLVMD && skip
which md5sum || skip
-aux target_at_least dm-cache 1 3 0 || skip
+aux have_cache 1 3 0 || skip
# for stacking
-aux target_at_least dm-thin-pool 1 8 0 || skip
-aux target_at_least dm-raid 1 4 2 || skip
+aux have_thin 1 8 0 || skip
+aux have_raid 1 4 2 || skip
aux prepare_vg 5 80
diff --git a/test/shell/pvmove-raid-segtypes.sh b/test/shell/pvmove-raid-segtypes.sh
index 1b0f129..f3f5cd5 100644
--- a/test/shell/pvmove-raid-segtypes.sh
+++ b/test/shell/pvmove-raid-segtypes.sh
@@ -16,7 +16,7 @@ test_description="ensure pvmove works with raid segment types"
test -e LOCAL_CLVMD && skip
which md5sum || skip
-aux target_at_least dm-raid 1 3 5 || skip
+aux have_raid 1 3 5 || skip
aux prepare_pvs 5 20
vgcreate -c n -s 128k $vg $(cat DEVICES)
diff --git a/test/shell/pvmove-thin-segtypes.sh b/test/shell/pvmove-thin-segtypes.sh
index c514bb5..4bd3b29 100644
--- a/test/shell/pvmove-thin-segtypes.sh
+++ b/test/shell/pvmove-thin-segtypes.sh
@@ -15,9 +15,9 @@ test_description="ensure pvmove works with thin segment types"
test -e LOCAL_CLVMD && skip
which md5sum || skip
-aux target_at_least dm-thin-pool 1 8 0 || skip
+aux have_thin 1 8 0 || skip
# for stacking
-aux target_at_least dm-raid 1 3 5 || skip
+aux have_raid 1 3 5 || skip
aux prepare_pvs 5 20
vgcreate -c n -s 128k $vg $(cat DEVICES)
diff --git a/test/shell/pvremove-thin.sh b/test/shell/pvremove-thin.sh
index 03e6ca3..e8af2af 100644
--- a/test/shell/pvremove-thin.sh
+++ b/test/shell/pvremove-thin.sh
@@ -16,7 +16,7 @@
aux prepare_vg
-aux target_at_least dm-thin-pool 1 8 0 || skip
+aux have_thin 1 8 0 || skip
aux extend_filter_LVMTEST
diff --git a/test/shell/vgsplit-raid.sh b/test/shell/vgsplit-raid.sh
index 898fc9a..6454556 100644
--- a/test/shell/vgsplit-raid.sh
+++ b/test/shell/vgsplit-raid.sh
@@ -21,7 +21,7 @@ create_vg_() {
vgcreate -s 64k "$@"
}
-aux target_at_least dm-raid 1 1 0 || skip
+aux have_raid 1 1 0 || skip
aux prepare_pvs 5 10
9 years, 11 months
master - tests: wait before down-convert
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7f92c3a13eeba1...
Commit: 7f92c3a13eeba179872dacd4b632d8bb5188a0ba
Parent: 205be247689d7be38b4341401516a1881e09c6aa
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon May 19 14:30:15 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue May 20 21:50:29 2014 +0200
tests: wait before down-convert
---
test/shell/lvconvert-mirror.sh | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/test/shell/lvconvert-mirror.sh b/test/shell/lvconvert-mirror.sh
index 1e9925a..8c0c72e 100644
--- a/test/shell/lvconvert-mirror.sh
+++ b/test/shell/lvconvert-mirror.sh
@@ -191,6 +191,10 @@ lvremove -ff $vg
# "remove from original mirror (the original becomes linear)"
lvcreate -aey -l2 --type mirror -m1 -n $lv1 $vg "$dev1" "$dev2" "$dev3:$DEVRANGE"
lvconvert -m+1 -b $vg/$lv1 "$dev4"
+# FIXME: Extra wait here for mirror upconvert synchronization
+# otherwise we may fail her on parallel upconvert and downconvert
+# lvconvert-mirror-updown.sh tests this errornous case separately
+lvconvert $vg/$lv1
lvconvert -m-1 $vg/$lv1 "$dev2"
lvconvert $vg/$lv1
9 years, 11 months
master - tests: update lvconvert test
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=205be247689d7b...
Commit: 205be247689d7be38b4341401516a1881e09c6aa
Parent: 16424fed543ee6d4841c1e44ba252ae976c28cbb
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 20 21:11:11 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue May 20 21:50:29 2014 +0200
tests: update lvconvert test
Split raid test to separate file
Add --yes flag to automated testing
---
test/shell/lvconvert-thin-raid.sh | 31 +++++++++++++++++++++++
test/shell/lvconvert-thin.sh | 47 ++++++++++++++++--------------------
test/shell/pvmove-thin-segtypes.sh | 2 +-
3 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/test/shell/lvconvert-thin-raid.sh b/test/shell/lvconvert-thin-raid.sh
new file mode 100644
index 0000000..ae3d2ef
--- /dev/null
+++ b/test/shell/lvconvert-thin-raid.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Copyright (C) 2014 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+. lib/test
+
+aux have_thin 1 0 0 || skip
+aux have_raid 1 4 0 || skip
+
+aux prepare_vg 4
+
+# create RAID LVs for data and metadata volumes
+lvcreate -aey --nosync -L10M --type raid1 -m1 -n $lv1 $vg
+lvcreate -aey --nosync -L8M --type raid1 -m1 -n $lv2 $vg
+lvchange -an $vg/$lv1
+
+# conversion fails for internal volumes
+fail lvconvert --thinpool $vg/${lv1}_rimage_0
+fail lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/${lv2}_rimage_0
+
+lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+
+vgremove -ff $vg
diff --git a/test/shell/lvconvert-thin.sh b/test/shell/lvconvert-thin.sh
index d177f9a..8c3b903 100644
--- a/test/shell/lvconvert-thin.sh
+++ b/test/shell/lvconvert-thin.sh
@@ -44,29 +44,23 @@ lvcreate -aey -L10M -n $lv2 $vg
lvchange -an $vg/$lv1
# conversion fails for mirror segment type
-not lvconvert --thinpool $vg/$lv1
-not lvconvert --thinpool $vg/$lv2 --poolmetadata $vg/$lv2
-lvremove -f $vg
+fail lvconvert --thinpool $vg/$lv1
+# cannot use same LV
+fail lvconvert --yes --thinpool $vg/$lv2 --poolmetadata $vg/$lv2
-# create RAID LVs for data and metadata volumes
-lvcreate -aey -L10M --type raid1 -m1 -n $lv1 $vg
-lvcreate -aey -L10M --type raid1 -m1 -n $lv2 $vg
-lvchange -an $vg/$lv1
+prepare_lvs
# conversion fails for internal volumes
-not lvconvert --thinpool $vg/${lv1}_rimage_0
-not lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/${lv2}_rimage_0
# can't use --readahead with --poolmetadata
-not lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 --readahead 512
-
-lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+invalid lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 --readahead 512
+lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
prepare_lvs
-lvconvert -c 64 --stripes 2 --thinpool $vg/$lv1 --readahead 48
+lvconvert --yes -c 64 --stripes 2 --thinpool $vg/$lv1 --readahead 48
lvremove -f $vg
lvcreate -L1T -n $lv1 $vg
-lvconvert -c 8M --thinpool $vg/$lv1
+lvconvert --yes -c 8M --thinpool $vg/$lv1
lvremove -f $vg
# test with bigger sizes
@@ -75,29 +69,30 @@ lvcreate -L8M -n $lv2 $vg
lvcreate -L1M -n $lv3 $vg
# chunk size is bigger then size of thin pool data
-not lvconvert -c 1G --thinpool $vg/$lv3
+fail lvconvert --yes -c 1G --thinpool $vg/$lv3
# stripes can't be used with poolmetadata
-not lvconvert --stripes 2 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+invalid lvconvert --stripes 2 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
# too small metadata (<2M)
-not lvconvert -c 64 --thinpool $vg/$lv1 --poolmetadata $vg/$lv3
+fail lvconvert --yes -c 64 --thinpool $vg/$lv1 --poolmetadata $vg/$lv3
# too small chunk size fails
-not lvconvert -c 4 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+# 'fail' because profiles need to read VG
+fail lvconvert -c 4 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
# too big chunk size fails
-not lvconvert -c 2G --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+fail lvconvert -c 2G --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
# negative chunk size fails
-not lvconvert -c -256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+fail lvconvert -c -256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
# non power of 2 fails
-not lvconvert -c 88 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+fail lvconvert -c 88 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
# Warning about smaller then suggested
-lvconvert -c 256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 |& tee err
+lvconvert --yes -c 256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 |& tee err
grep "WARNING: Chunk size is smaller" err
lvremove -f $vg
lvcreate -L1T -n $lv1 $vg
lvcreate -L32G -n $lv2 $vg
# Warning about bigger then needed
-lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 |& tee err
+lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 |& tee err
grep "WARNING: Maximum size" err
lvremove -f $vg
@@ -105,14 +100,14 @@ lvremove -f $vg
if test "$TSIZE" -eq 64T; then
lvcreate -L24T -n $lv1 $vg
# Warning about bigger then needed (24T data and 16G -> 128K chunk)
-lvconvert -c 64 --thinpool $vg/$lv1 |& tee err
+lvconvert --yes -c 64 --thinpool $vg/$lv1 |& tee err
grep "WARNING: Chunk size is too small" err
fi
#lvs -a -o+chunk_size,stripe_size,seg_pe_ranges
# Convertions of pool to mirror or RAID is unsupported
-not lvconvert --type mirror -m1 $vg/$lv1
-not lvconvert --type raid1 -m1 $vg/$lv1
+fail lvconvert --type mirror -m1 $vg/$lv1
+fail lvconvert --type raid1 -m1 $vg/$lv1
vgremove -ff $vg
diff --git a/test/shell/pvmove-thin-segtypes.sh b/test/shell/pvmove-thin-segtypes.sh
index 684b3f5..c514bb5 100644
--- a/test/shell/pvmove-thin-segtypes.sh
+++ b/test/shell/pvmove-thin-segtypes.sh
@@ -49,7 +49,7 @@ lvremove -ff $vg
lvcreate -l 2 -n ${lv1}_foo $vg "$dev1"
lvcreate --type raid1 -m 1 -l 4 -n ${lv1}_raid1_pool $vg "$dev1" "$dev2"
lvcreate --type raid1 -m 1 -L 2 -n ${lv1}_raid1_meta $vg "$dev1" "$dev2"
-lvconvert --thinpool $vg/${lv1}_raid1_pool \
+lvconvert --yes --thinpool $vg/${lv1}_raid1_pool \
--poolmetadata ${lv1}_raid1_meta
lvcreate -T $vg/${lv1}_raid1_pool -V 8 -n $lv1
check lv_tree_on $vg ${lv1}_foo "$dev1"
9 years, 11 months
master - thin: improve lvconvert messages
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=16424fed543ee6...
Commit: 16424fed543ee6d4841c1e44ba252ae976c28cbb
Parent: d1d50d4023d7825fe9d9d3811375e44b90def529
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 20 20:05:09 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue May 20 21:50:29 2014 +0200
thin: improve lvconvert messages
Add more info into printed message.
---
tools/lvconvert.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 3f1fd46..79f2be5 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -2570,7 +2570,9 @@ static int _lvconvert_thinpool_external(struct cmd_context *cmd,
goto deactivate_and_revert_new_lv;
}
- log_print_unless_silent("Converted %s/%s to thin external origin.",
+ log_print_unless_silent("Converted \"%s/%s\" to thin volume with "
+ "external origin \"%s/%s\".",
+ vg->name, torigin_lv->name,
vg->name, external_lv->name);
return 1;
@@ -2954,7 +2956,7 @@ mda_write:
goto out;
}
- log_print_unless_silent("Converted %s/%s to %s pool.",
+ log_print_unless_silent("Converted \"%s/%s\" to %s pool.",
pool_lv->vg->name, pool_lv->name,
(segtype_is_cache_pool(lp->segtype)) ?
"cache" : "thin");
9 years, 11 months
master - cleanup: use print when displaying info
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d1d50d4023d782...
Commit: d1d50d4023d7825fe9d9d3811375e44b90def529
Parent: 54184f92acea10de5b75ad013f6c8aaf7db03176
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 20 12:56:49 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue May 20 21:50:29 2014 +0200
cleanup: use print when displaying info
Use error or warn only when we really have some problem in the code.
---
tools/lvconvert.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 50771b4..3f1fd46 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1629,7 +1629,7 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd,
lv_check_transient(lv); /* TODO check this in lib for all commands? */
if (!(lv->status & PARTIAL_LV)) {
- log_warn("%s is consistent. Nothing to repair.", lv->name);
+ log_print_unless_silent("%s is consistent. Nothing to repair.", lv->name);
return 1;
}
@@ -1640,15 +1640,15 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd,
return_0;
if (failed_mimages)
- log_error("Mirror status: %d of %d images failed.",
- failed_mimages, original_mimages);
+ log_print_unless_silent("Mirror status: %d of %d images failed.",
+ failed_mimages, original_mimages);
/*
* Count the failed log devices
*/
if (failed_logs)
- log_error("Mirror log status: %d of %d images failed.",
- failed_logs, original_logs);
+ log_print_unless_silent("Mirror log status: %d of %d images failed.",
+ failed_logs, original_logs);
/*
* Find out our policies
9 years, 11 months
master - cleanup: indent
by Zdenek Kabelac
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=54184f92acea10...
Commit: 54184f92acea10de5b75ad013f6c8aaf7db03176
Parent: 2941cffd2c6bf67ea2b47696e0ad111f07cf921d
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue May 20 20:10:55 2014 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue May 20 21:50:28 2014 +0200
cleanup: indent
---
tools/lvconvert.c | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 03cd42d..50771b4 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1077,15 +1077,13 @@ static void _lvconvert_mirrors_repair_ask(struct cmd_context *cmd,
return;
if (failed_log &&
- yes_no_prompt("Attempt to replace failed mirror log? [y/n]: ") == 'n') {
+ yes_no_prompt("Attempt to replace failed mirror log? [y/n]: ") == 'n')
*replace_log = 0;
- }
if (failed_mirrors &&
yes_no_prompt("Attempt to replace failed mirror images "
- "(requires full device resync)? [y/n]: ") == 'n') {
+ "(requires full device resync)? [y/n]: ") == 'n')
*replace_mirrors = 0;
- }
}
/*
@@ -1677,14 +1675,12 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd,
if (_lvconvert_mirrors_aux(cmd, lv, lp, NULL,
lp->mirrors, log_count))
break;
- else {
- if (lp->mirrors > 2)
- -- lp->mirrors;
- else if (log_count > 0)
- -- log_count;
- else
- break; /* nowhere to go, anymore... */
- }
+ if (lp->mirrors > 2)
+ --lp->mirrors;
+ else if (log_count > 0)
+ --log_count;
+ else
+ break; /* nowhere to go, anymore... */
}
if (replace_mimages && lv_mirror_count(lv) != original_mimages)
9 years, 11 months