public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/test t-lvcreate-usage.sh t-lvextend-perce ...
@ 2008-09-30 17:47 mornfall
0 siblings, 0 replies; 2+ messages in thread
From: mornfall @ 2008-09-30 17:47 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2008-09-30 17:47:34
Modified files:
test : t-lvcreate-usage.sh
t-lvextend-percent-extents.sh
t-mdata-strings.sh t-mirror-lvconvert.sh
t-pvcreate-operation.sh
Log message:
More test conversions, all of these are by jstava.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-lvcreate-usage.sh.diff?cvsroot=lvm2&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-lvextend-percent-extents.sh.diff?cvsroot=lvm2&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-mdata-strings.sh.diff?cvsroot=lvm2&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-mirror-lvconvert.sh.diff?cvsroot=lvm2&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-pvcreate-operation.sh.diff?cvsroot=lvm2&r1=1.10&r2=1.11
--- LVM2/test/t-lvcreate-usage.sh 2008/08/28 10:07:34 1.6
+++ LVM2/test/t-lvcreate-usage.sh 2008/09/30 17:47:34 1.7
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2007 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2008 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
@@ -9,82 +9,46 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-test_description='Exercise some lvcreate diagnostics'
-privileges_required_=1
+# 'Exercise some lvcreate diagnostics'
-. ./test-lib.sh
+. ./test-utils.sh
-cleanup_()
-{
- test -n "$vg" && {
- vgchange -an "$vg"
- lvremove -ff "$vg"
- vgremove "$vg"
- } > "$test_dir_/cleanup.log"
- test -n "$d1" && losetup -d "$d1"
- test -n "$d2" && losetup -d "$d2"
- rm -f "$f1" "$f2"
-}
-
-test_expect_success \
- 'set up temp files, loopback devices, PVs, and a VG' \
- 'f1=$(pwd)/1 && d1=$(loop_setup_ "$f1") &&
- f2=$(pwd)/2 && d2=$(loop_setup_ "$f2") &&
- pvcreate $d1 $d2 &&
- vg=$(this_test_)-test-vg-$$ &&
- vgcreate $vg $d1 $d2'
-
-lv=lvcreate-usage-$$
-
-test_expect_success \
- "lvcreate rejects repeated invocation (run 2 times)" '
- lvcreate -n $lv -l 4 $vg &&
- { lvcreate -n $lv -l 4 $vg;
- status=$?; echo status=$status; test $status = 5 &&
- lvremove -ff $vg/$lv
- }
-'
-
-test_expect_success \
- 'lvcreate rejects a negative stripe_size' \
- 'lvcreate -L 64M -n $lv -i2 --stripesize -4 $vg 2>err;
- status=$?; echo status=$status; test $status = 3 &&
- grep "^ Negative stripesize is invalid\$" err'
-
-test_expect_success \
- 'lvcreate rejects a too-large stripesize' \
- 'lvcreate -L 64M -n $lv -i2 --stripesize 4294967291 $vg 2>err; test $? = 3 &&
- grep "^ Stripe size cannot be larger than 512.00 GB\$" err'
-
-test_expect_success \
- 'lvcreate w/single stripe succeeds with diagnostics to stdout' \
- 'lvcreate -L 64M -n $lv -i1 --stripesize 4 $vg >out 2>err &&
- grep "^ Redundant stripes argument: default is 1\$" out &&
- grep "^ Ignoring stripesize argument with single stripe\$" out &&
- lvdisplay $vg &&
- lvremove -ff $vg'
-
-test_expect_success \
- 'lvcreate w/default (64KB) stripe size succeeds with diagnostics to stdout' \
- 'lvcreate -L 64M -n $lv -i2 $vg > out &&
- grep "^ Using default stripesize" out &&
- lvdisplay $vg &&
- check_lv_field_ $vg/$lv stripesize "64.00K" &&
- lvremove -ff $vg'
-
-test_expect_success \
- 'lvcreate rejects an invalid number of stripes' \
- 'lvcreate -L 64M -n $lv -i129 $vg 2>err; test $? = 3 &&
- grep "^ Number of stripes (129) must be between 1 and 128\$" err'
+aux prepare_vg 2
+
+# "lvcreate rejects repeated invocation (run 2 times)"
+lvcreate -n $lv -l 4 $vg
+not lvcreate -n $lv -l 4 $vg
+lvremove -ff $vg/$lv
+
+# "lvcreate rejects a negative stripe_size"
+not lvcreate -L 64M -n $lv -i2 --stripesize -4 $vg 2>err;
+grep "^ Negative stripesize is invalid\$" err
+
+# 'lvcreate rejects a too-large stripesize'
+not lvcreate -L 64M -n $lv -i2 --stripesize 4294967291 $vg 2>err
+grep "^ Stripe size cannot be larger than 512.00 GB\$" err
+
+# 'lvcreate w/single stripe succeeds with diagnostics to stdout'
+lvcreate -L 64M -n $lv -i1 --stripesize 4 $vg >out 2>err
+grep "^ Redundant stripes argument: default is 1\$" out
+grep "^ Ignoring stripesize argument with single stripe\$" out
+lvdisplay $vg
+lvremove -ff $vg
+
+# 'lvcreate w/default (64KB) stripe size succeeds with diagnostics to stdout'
+lvcreate -L 64M -n $lv -i2 $vg > out
+grep "^ Using default stripesize" out
+lvdisplay $vg
+check_lv_field_ $vg/$lv stripesize "64.00K"
+lvremove -ff $vg
+
+# 'lvcreate rejects an invalid number of stripes'
+not lvcreate -L 64M -n $lv -i129 $vg 2>err
+grep "^ Number of stripes (129) must be between 1 and 128\$" err
# The case on lvdisplay output is to verify that the LV was not created.
-test_expect_success \
- 'lvcreate rejects an invalid stripe size' \
- 'lvcreate -L 64M -n $lv -i2 --stripesize 3 $vg 2>err; test $? = 3 &&
- grep "^ Invalid stripe size 3\.00 KB\$" err &&
- case $(lvdisplay $vg) in "") true ;; *) false ;; esac'
-
-test_done
-# Local Variables:
-# indent-tabs-mode: nil
-# End:
+# 'lvcreate rejects an invalid stripe size'
+not lvcreate -L 64M -n $lv -i2 --stripesize 3 $vg 2>err
+grep "^ Invalid stripe size 3\.00 KB\$" err
+case $(lvdisplay $vg) in "") true ;; *) false ;; esac'
+
--- LVM2/test/t-lvextend-percent-extents.sh 2008/01/17 18:05:57 1.4
+++ LVM2/test/t-lvextend-percent-extents.sh 2008/09/30 17:47:34 1.5
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2007 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2008 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
@@ -9,60 +9,36 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-test_description='Check extents percentage arguments'
-privileges_required_=1
+# 'Check extents percentage arguments'
-. ./test-lib.sh
+. ./test-utils.sh
-cleanup_()
-{
- test -n "$vg" && {
- vgchange -an "$vg"
- lvremove -ff "$vg"
- vgremove -f "$vg"
- } > "$test_dir_/cleanup.log"
- test -n "$d1" && losetup -d "$d1"
- test -n "$d2" && losetup -d "$d2"
- rm -f "$f1" "$f2"
-}
-
-test_expect_success \
- 'set up temp files, loopback devices, PVs, and a VG' \
- 'f1=$(pwd)/1 && d1=$(loop_setup_ "$f1") &&
- f2=$(pwd)/2 && d2=$(loop_setup_ "$f2") &&
- pvcreate $d1 $d2 &&
- vg=$(this_test_)-test-vg-$$ &&
- vgcreate $vg $d1 $d2 &&
- lv=$(this_test_)-test-lv-$$ &&
- lvcreate -L 64M -n $lv $vg'
-
-test_expect_success \
- 'lvextend rejects both size and extents without PVs' \
- 'lvextend -l 10 -L 64M $vg/$lv 2>err; test $? = 3 &&
- grep "^ Please specify either size or extents but not both.\$" err'
-
-test_expect_success \
- 'lvextend rejects both size and extents with PVs' \
- 'lvextend -l 10 -L 64M $vg/$lv $d1 2>err; test $? = 3 &&
- grep "^ Please specify either size or extents but not both.\$" err'
-
-test_expect_success \
- 'lvextend accepts no size or extents but one PV - bz154691' \
- 'lvextend $vg/$lv $d1 >out; test $? = 0 &&
- grep "^ Logical volume $lv successfully resized\$" out &&
- check_pv_field_ $d1 pv_free "0"'
-
-test_expect_success \
- 'Reset LV to original size' \
- 'lvremove -f $vg/$lv; test $? = 0 &&
- lvcreate -L 64M -n $lv $vg; test $? = 0'
-
-test_expect_success \
- 'lvextend accepts no size but extents 100%PVS and two PVs - bz154691' \
- 'lvextend -l +100%PVS $vg/$lv $d1 $d2 >out; test $? = 0 &&
- grep "^ Logical volume $lv successfully resized\$" out &&
- check_pv_field_ $d1 pv_free "0" &&
- check_pv_field_ $d2 pv_free "0"'
+aux prepare_vg 2 128
+
+lvcreate -L 64M -n $lv $vg
+
+# 'lvextend rejects both size and extents without PVs'
+not lvextend -l 10 -L 64M $vg/$lv 2>err
+grep "^ Please specify either size or extents but not both.\$" err
+
+# 'lvextend rejects both size and extents with PVs'
+not lvextend -l 10 -L 64M $vg/$lv $dev1 2>err
+grep "^ Please specify either size or extents but not both.\$" err
+
+# 'lvextend accepts no size or extents but one PV - bz154691'
+lvextend $vg/$lv $dev1 >out
+grep "^ Logical volume $lv successfully resized\$" out
+check_pv_field_ $dev1 pv_free "0"
+
+# 'Reset LV to original size'
+lvremove -f $vg/$lv
+lvcreate -L 64M -n $lv $vg
+
+# 'lvextend accepts no size but extents 100%PVS and two PVs - bz154691'
+lvextend -l +100%PVS $vg/$lv $dev1 $dev2 >out
+grep "^ Logical volume $lv successfully resized\$" out
+check_pv_field_ $dev1 pv_free "0"
+check_pv_field_ $dev2 pv_free "0"
# Exercise the range overlap code. Allocate every 2 extents.
#
@@ -84,22 +60,15 @@
# Total number of extents should be 12 + overlap = 12 + 6 = 18.
# Thus, total size for the LV should be 18 * 4M = 72M
#
-test_expect_success \
- 'Reset LV to 12 extents, allocate every other 2 extents' \
- 'create_pvs=`for i in $(seq 0 4 20); do echo -n "\$d1:$i-$(($i + 1)) "; done` &&
- lvremove -f $vg/$lv; test $? = 0 &&
- lvcreate -l 12 -n $lv $vg $create_pvs; test $? = 0 &&
- check_lv_field_ $vg/$lv lv_size "48.00M"'
-
-test_expect_success \
- 'lvextend with partially allocated PVs and extents 100%PVS with PE ranges' \
- 'extend_pvs=`for i in $(seq 0 6 18); do echo -n "\$d1:$i-$(($i + 2)) "; done` &&
- lvextend -l +100%PVS $vg/$lv $extend_pvs >out; test $? = 0 &&
- grep "^ Logical volume $lv successfully resized\$" out &&
- check_lv_field_ $vg/$lv lv_size "72.00M"'
-
-
-test_done
-# Local Variables:
-# indent-tabs-mode: nil
-# End:
+# 'Reset LV to 12 extents, allocate every other 2 extents'
+create_pvs=`for i in $(seq 0 4 20); do echo -n "\$dev1:$i-$(($i + 1)) "; done`
+lvremove -f $vg/$lv
+lvcreate -l 12 -n $lv $vg $create_pvs
+check_lv_field_ $vg/$lv lv_size "48.00M"
+
+# 'lvextend with partially allocated PVs and extents 100%PVS with PE ranges'
+extend_pvs=`for i in $(seq 0 6 18); do echo -n "\$dev1:$i-$(($i + 2)) "; done`
+lvextend -l +100%PVS $vg/$lv $extend_pvs >out
+grep "^ Logical volume $lv successfully resized\$" out
+check_lv_field_ $vg/$lv lv_size "72.00M"
+
--- LVM2/test/t-mdata-strings.sh 2008/04/10 01:06:48 1.2
+++ LVM2/test/t-mdata-strings.sh 2008/09/30 17:47:34 1.3
@@ -9,43 +9,25 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-test_description='Test for proper escaping of strings in metadata (bz431474)'
-privileges_required_=1
+# 'Test for proper escaping of strings in metadata (bz431474)'
-. ./test-lib.sh
+. ./test-utils.sh
-cleanup_()
-{
- test -n "$vg" && {
- vgchange -an "$vg"
- vgremove "$vg"
- } > "$test_dir_/cleanup.log"
- test -n "$d1" && losetup -d "$d1"
- rm -f "$f1"
-}
+aux prepare_devs 1
pv_suffix="__\"!@#\$%^&*()'\\\"__"
-test_expect_success \
- 'set up temp files, loopback devices' \
- 'f1=$(pwd)/1 && d1=$(loop_setup_ "$f1") &&
- mv "$d1" "$d1$pv_suffix" &&
- d1=$d1$pv_suffix'
-
-test_expect_success \
- 'pvcreate, vgcreate on filename with backslashed chars' \
- 'pvcreate "$d1" &&
- vg=$(this_test_)-test-vg-$$ &&
- vgcreate $vg $d1'
-
-test_expect_success \
- 'no parse errors and VG really exists' \
- 'vgs 2>err &&
- grep "Parse error" err;
- status=$?; echo status=$status; test $status -ne 0 &&
- vgs $vg'
-
-test_done
-# Local Variables:
-# indent-tabs-mode: nil
-# End:
+# 'set up temp files, loopback devices'
+name=$(basename "$dev1")
+dmsetup rename "$name" "$name$pv_suffix"
+dev1=$(dirname "$dev1")/$name$pv_suffix
+
+# 'pvcreate, vgcreate on filename with backslashed chars'
+pvcreate "$dev1"
+vgcreate $vg "$dev1"
+
+# 'no parse errors and VG really exists'
+vgs 2>err
+not grep "Parse error" err;
+vgs $vg
+
--- LVM2/test/t-mirror-lvconvert.sh 2008/09/29 16:02:49 1.4
+++ LVM2/test/t-mirror-lvconvert.sh 2008/09/30 17:47:34 1.5
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2008 Red Hat, Inc. All rights reserved.
# Copyright (C) 2007 NEC Corporation
#
# This copyrighted material is made available to anyone wishing to use,
@@ -156,25 +156,25 @@
prepare_lvs_
lvcreate -l2 -m1 --mirrorlog core -n $lv1 $vg $dev1 $dev2
check_mirror_count_ $vg/$lv1 2
-!(check_mirror_log_ $vg/$lv1)
-lvconvert -m+1 -i1 --mirrorlog core $vg/$lv1 $dev4 &&
-check_no_tmplvs_ $vg/$lv1 &&
-check_mirror_count_ $vg/$lv1 3 &&
-!(check_mirror_log_ $vg/$lv1) &&
-mimages_are_redundant_ $vg $lv1 &&
-check_and_cleanup_lvs_
-
-test_expect_success "add 2 mirrors to core log mirror" \
- 'prepare_lvs_ &&
- lvcreate -l2 -m1 --mirrorlog core -n $lv1 $vg $dev1 $dev2 &&
- check_mirror_count_ $vg/$lv1 2 &&
- !(check_mirror_log_ $vg/$lv1) &&
- lvconvert -m+2 -i1 --mirrorlog core $vg/$lv1 $dev4 $dev5 &&
- check_no_tmplvs_ $vg/$lv1 &&
- check_mirror_count_ $vg/$lv1 4 &&
- !(check_mirror_log_ $vg/$lv1) &&
- mimages_are_redundant_ $vg $lv1 &&
- check_and_cleanup_lvs_'
+not check_mirror_log_ $vg/$lv1
+lvconvert -m+1 -i1 --mirrorlog core $vg/$lv1 $dev4
+check_no_tmplvs_ $vg/$lv1
+check_mirror_count_ $vg/$lv1 3
+not check_mirror_log_ $vg/$lv1
+mimages_are_redundant_ $vg $lv1
+check_and_cleanup_lvs_
+
+# add 2 mirrors to core log mirror"
+prepare_lvs_
+lvcreate -l2 -m1 --mirrorlog core -n $lv1 $vg $dev1 $dev2
+check_mirror_count_ $vg/$lv1 2
+not check_mirror_log_ $vg/$lv1
+lvconvert -m+2 -i1 --mirrorlog core $vg/$lv1 $dev4 $dev5
+check_no_tmplvs_ $vg/$lv1
+check_mirror_count_ $vg/$lv1 4
+not check_mirror_log_ $vg/$lv1
+mimages_are_redundant_ $vg $lv1
+check_and_cleanup_lvs_
# ---
# add to converting mirror
@@ -195,18 +195,18 @@
# ---
# add mirror and disk log
-test_expect_success "add 1 mirror and disk log" \
- 'prepare_lvs_ &&
- lvcreate -l2 -m1 --mirrorlog core -n $lv1 $vg $dev1 $dev2 &&
- check_mirror_count_ $vg/$lv1 2 &&
- !(check_mirror_log_ $vg/$lv1) &&
- lvconvert -m+1 --mirrorlog disk -i1 $vg/$lv1 $dev4 $dev3:0-1 &&
- check_no_tmplvs_ $vg/$lv1 &&
- check_mirror_count_ $vg/$lv1 3 &&
- check_mirror_log_ $vg/$lv1 &&
- mimages_are_redundant_ $vg $lv1 &&
- mirrorlog_is_on_ $vg/$lv1 $dev3 &&
- check_and_cleanup_lvs_'
+# "add 1 mirror and disk log"
+prepare_lvs_
+lvcreate -l2 -m1 --mirrorlog core -n $lv1 $vg $dev1 $dev2
+check_mirror_count_ $vg/$lv1 2
+not check_mirror_log_ $vg/$lv1
+lvconvert -m+1 --mirrorlog disk -i1 $vg/$lv1 $dev4 $dev3:0-1
+check_no_tmplvs_ $vg/$lv1
+check_mirror_count_ $vg/$lv1 3
+check_mirror_log_ $vg/$lv1
+mimages_are_redundant_ $vg $lv1
+mirrorlog_is_on_ $vg/$lv1 $dev3
+check_and_cleanup_lvs_
# ---
# check polldaemon restarts
@@ -226,75 +226,74 @@
# ---------------------------------------------------------------------
# removal during conversion
-test_expect_success "remove newly added mirror" \
- 'prepare_lvs_ &&
- lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0-1 &&
- check_mirror_count_ $vg/$lv1 2 &&
- check_mirror_log_ $vg/$lv1 &&
- lvconvert -m+1 -b -i100 $vg/$lv1 $dev4 &&
- lvconvert -m-1 $vg/$lv1 $dev4 &&
- wait_conversion_ $vg/$lv1 &&
- check_no_tmplvs_ $vg/$lv1 &&
- check_mirror_count_ $vg/$lv1 2 &&
- mimages_are_redundant_ $vg $lv1 &&
- mirrorlog_is_on_ $vg/$lv1 $dev3 &&
- check_and_cleanup_lvs_'
-
-test_expect_success "remove one of newly added mirrors" \
- 'prepare_lvs_ &&
- lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0-1 &&
- check_mirror_count_ $vg/$lv1 2 &&
- check_mirror_log_ $vg/$lv1 &&
- lvconvert -m+2 -b -i100 $vg/$lv1 $dev4 $dev5 &&
- lvconvert -m-1 $vg/$lv1 $dev4 &&
- lvconvert -i1 $vg/$lv1 &&
- wait_conversion_ $vg/$lv1 &&
- check_no_tmplvs_ $vg/$lv1 &&
- check_mirror_count_ $vg/$lv1 3 &&
- mimages_are_redundant_ $vg $lv1 &&
- mirrorlog_is_on_ $vg/$lv1 $dev3 &&
- check_and_cleanup_lvs_'
-
-test_expect_success "remove from original mirror (the original is still mirror)" \
- 'prepare_lvs_ &&
- lvcreate -l2 -m2 -n $lv1 $vg $dev1 $dev2 $dev5 $dev3:0-1 &&
- check_mirror_count_ $vg/$lv1 3 &&
- check_mirror_log_ $vg/$lv1 &&
- lvconvert -m+1 -b -i100 $vg/$lv1 $dev4 &&
- lvconvert -m-1 $vg/$lv1 $dev2 &&
- lvconvert -i1 $vg/$lv1 &&
- wait_conversion_ $vg/$lv1 &&
- check_no_tmplvs_ $vg/$lv1 &&
- check_mirror_count_ $vg/$lv1 3 &&
- mimages_are_redundant_ $vg $lv1 &&
- mirrorlog_is_on_ $vg/$lv1 $dev3 &&
- check_and_cleanup_lvs_'
-
-test_expect_success "remove from original mirror (the original becomes linear)" \
- 'prepare_lvs_ &&
- lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0-1 &&
- check_mirror_count_ $vg/$lv1 2 &&
- check_mirror_log_ $vg/$lv1 &&
- lvconvert -m+1 -b -i100 $vg/$lv1 $dev4 &&
- lvconvert -m-1 $vg/$lv1 $dev2 &&
- lvconvert -i1 $vg/$lv1 &&
- wait_conversion_ $vg/$lv1 &&
- check_no_tmplvs_ $vg/$lv1 &&
- check_mirror_count_ $vg/$lv1 2 &&
- mimages_are_redundant_ $vg $lv1 &&
- mirrorlog_is_on_ $vg/$lv1 $dev3 &&
- check_and_cleanup_lvs_'
-
-test_expect_success "rhbz440405: lvconvert -m0 incorrectly fails if all PEs allocated" \
- 'prepare_lvs_ &&
- lvcreate -l`pvs --noheadings -ope_count $dev1` -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0 &&
- check_mirror_count_ $vg/$lv1 2 &&
- check_mirror_log_ $vg/$lv1 &&
- lvconvert -m0 $vg/$lv1 $dev1 &&
- check_no_tmplvs_ $vg/$lv1 &&
- check_mirror_count_ $vg/$lv1 1 &&
- check_and_cleanup_lvs_'
+# "remove newly added mirror"
+prepare_lvs_
+lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0-1
+check_mirror_count_ $vg/$lv1 2
+check_mirror_log_ $vg/$lv1
+lvconvert -m+1 -b -i100 $vg/$lv1 $dev4
+lvconvert -m-1 $vg/$lv1 $dev4
+wait_conversion_ $vg/$lv1
+check_no_tmplvs_ $vg/$lv1
+check_mirror_count_ $vg/$lv1 2
+mimages_are_redundant_ $vg $lv1
+mirrorlog_is_on_ $vg/$lv1 $dev3
+check_and_cleanup_lvs_
+
+# "remove one of newly added mirrors"
+prepare_lvs_
+lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0-1
+check_mirror_count_ $vg/$lv1 2
+check_mirror_log_ $vg/$lv1
+lvconvert -m+2 -b -i100 $vg/$lv1 $dev4 $dev5
+lvconvert -m-1 $vg/$lv1 $dev4
+lvconvert -i1 $vg/$lv1
+wait_conversion_ $vg/$lv1
+check_no_tmplvs_ $vg/$lv1
+check_mirror_count_ $vg/$lv1 3
+mimages_are_redundant_ $vg $lv1
+mirrorlog_is_on_ $vg/$lv1 $dev3
+check_and_cleanup_lvs_
+
+# "remove from original mirror (the original is still mirror)"
+prepare_lvs_
+lvcreate -l2 -m2 -n $lv1 $vg $dev1 $dev2 $dev5 $dev3:0-1
+check_mirror_count_ $vg/$lv1 3
+check_mirror_log_ $vg/$lv1
+lvconvert -m+1 -b -i100 $vg/$lv1 $dev4
+lvconvert -m-1 $vg/$lv1 $dev2
+lvconvert -i1 $vg/$lv1
+wait_conversion_ $vg/$lv1
+check_no_tmplvs_ $vg/$lv1
+check_mirror_count_ $vg/$lv1 3
+mimages_are_redundant_ $vg $lv1
+mirrorlog_is_on_ $vg/$lv1 $dev3
+check_and_cleanup_lvs_
+
+# "remove from original mirror (the original becomes linear)"
+prepare_lvs_
+lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0-1
+check_mirror_count_ $vg/$lv1 2
+check_mirror_log_ $vg/$lv1
+lvconvert -m+1 -b -i100 $vg/$lv1 $dev4
+lvconvert -m-1 $vg/$lv1 $dev2
+lvconvert -i1 $vg/$lv1
+wait_conversion_ $vg/$lv1
+check_no_tmplvs_ $vg/$lv1
+check_mirror_count_ $vg/$lv1 2
+mimages_are_redundant_ $vg $lv1
+mirrorlog_is_on_ $vg/$lv1 $dev3
+check_and_cleanup_lvs_
+
+# "rhbz440405: lvconvert -m0 incorrectly fails if all PEs allocated"
+prepare_lvs_
+lvcreate -l`pvs --noheadings -ope_count $dev1` -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0
+check_mirror_count_ $vg/$lv1 2
+check_mirror_log_ $vg/$lv1
+lvconvert -m0 $vg/$lv1 $dev1
+check_no_tmplvs_ $vg/$lv1
+check_mirror_count_ $vg/$lv1 1
+check_and_cleanup_lvs_
# ---------------------------------------------------------------------
-test_done
--- LVM2/test/t-pvcreate-operation.sh 2008/09/29 16:02:50 1.10
+++ LVM2/test/t-pvcreate-operation.sh 2008/09/30 17:47:34 1.11
@@ -60,18 +60,17 @@
pvremove -f $dev2
pvremove -f $dev1
-test_expect_success \
- 'pvcreate (lvm2) succeeds with -ff when PV with metadatacopies=0 belongs to VG' \
- 'pvcreate --metadatacopies 0 $dev1 &&
- pvcreate --metadatacopies 1 $dev2 &&
- vgcreate $vg1 $dev1 $dev2 &&
- pvcreate -ff -y $dev1 &&
- vgreduce --removemissing $vg1 &&
- vgremove -ff $vg1 &&
- pvremove -f $dev2 &&
- pvremove -f $dev1'
+# pvcreate (lvm2) succeeds with -ff when PV with metadatacopies=0 belongs to VG
+pvcreate --metadatacopies 0 $dev1
+pvcreate --metadatacopies 1 $dev2
+vgcreate $vg1 $dev1 $dev2
+pvcreate -ff -y $dev1
+vgreduce --removemissing $vg1
+vgremove -ff $vg1
+pvremove -f $dev2
+pvremove -f $dev1
-for i in 0 1 2 3
+for i in 0 1 2 3
do
# pvcreate (lvm2) succeeds writing LVM label at sector $i
pvcreate --labelsector $i $dev1
^ permalink raw reply [flat|nested] 2+ messages in thread
* LVM2/test t-lvcreate-usage.sh t-lvextend-perce ...
@ 2009-09-30 16:13 wysochanski
0 siblings, 0 replies; 2+ messages in thread
From: wysochanski @ 2009-09-30 16:13 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2009-09-30 16:13:53
Modified files:
test : t-lvcreate-usage.sh
t-lvextend-percent-extents.sh
t-pvcreate-operation-md.sh t-pvcreate-usage.sh
t-read-ahead.sh t-vgcreate-usage.sh
Log message:
Update nightly tests to deal with unit changes.
Now uppercase letters imply Si units, so use lowercase everywhere.
We could stay with uppercase, but then we'd have to deal with rounding, etc.
Also, some output / error messages change slightly (instead of "GB" we're
now saying "GiB").
One test enhancement might be to add some new tests for the units changes
but for now let's just get the test back to passing.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-lvcreate-usage.sh.diff?cvsroot=lvm2&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-lvextend-percent-extents.sh.diff?cvsroot=lvm2&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-pvcreate-operation-md.sh.diff?cvsroot=lvm2&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-pvcreate-usage.sh.diff?cvsroot=lvm2&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-read-ahead.sh.diff?cvsroot=lvm2&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/t-vgcreate-usage.sh.diff?cvsroot=lvm2&r1=1.9&r2=1.10
--- LVM2/test/t-lvcreate-usage.sh 2009/07/14 19:35:35 1.15
+++ LVM2/test/t-lvcreate-usage.sh 2009/09/30 16:13:53 1.16
@@ -25,35 +25,35 @@
not lvremove -ff $vg/$lv
# "lvcreate rejects a negative stripe_size"
-not lvcreate -L 64M -n $lv -i2 --stripesize -4 $vg 2>err;
+not lvcreate -L 64m -n $lv -i2 --stripesize -4 $vg 2>err;
grep "^ Negative stripesize is invalid\$" err
# 'lvcreate rejects a too-large stripesize'
-not lvcreate -L 64M -n $lv -i2 --stripesize 4294967291 $vg 2>err
-grep "^ Stripe size cannot be larger than 512.00 GB\$" err
+not lvcreate -L 64m -n $lv -i2 --stripesize 4294967291 $vg 2>err
+grep "^ Stripe size cannot be larger than" err
# 'lvcreate w/single stripe succeeds with diagnostics to stdout'
-lvcreate -L 64M -n $lv -i1 --stripesize 4 $vg >out 2>err
+lvcreate -L 64m -n $lv -i1 --stripesize 4 $vg >out 2>err
grep "^ Redundant stripes argument: default is 1\$" out
grep "^ Ignoring stripesize argument with single stripe\$" out
lvdisplay $vg
lvremove -ff $vg
# 'lvcreate w/default (64KB) stripe size succeeds with diagnostics to stdout'
-lvcreate -L 64M -n $lv -i2 $vg > out
+lvcreate -L 64m -n $lv -i2 $vg > out
grep "^ Using default stripesize" out
lvdisplay $vg
-check_lv_field_ $vg/$lv stripesize "64.00K"
+check_lv_field_ $vg/$lv stripesize "64.00k"
lvremove -ff $vg
# 'lvcreate rejects an invalid number of stripes'
-not lvcreate -L 64M -n $lv -i129 $vg 2>err
+not lvcreate -L 64m -n $lv -i129 $vg 2>err
grep "^ Number of stripes (129) must be between 1 and 128\$" err
# The case on lvdisplay output is to verify that the LV was not created.
# 'lvcreate rejects an invalid stripe size'
-not lvcreate -L 64M -n $lv -i2 --stripesize 3 $vg 2>err
-grep "^ Invalid stripe size 3\.00 KB\$" err
+not lvcreate -L 64m -n $lv -i2 --stripesize 3 $vg 2>err
+grep "^ Invalid stripe size" err
case $(lvdisplay $vg) in "") true ;; *) false ;; esac
# Setting max_lv works. (bz490298)
@@ -91,15 +91,15 @@
# validate origin_size
vgremove -ff $vg
vgcreate -cn $vg $devs
-lvcreate -L 32M -n $lv1 $vg
-not lvcreate -L 8M -n $lv2 -s --chunksize 3K $vg/$lv1
-not lvcreate -L 8M -n $lv2 -s --chunksize 1024K $vg/$lv1
-lvcreate -L 8M -n $lv2 -s --chunksize 4K $vg/$lv1
-check_lv_field_ $vg/$lv2 chunk_size 4.00K
-check_lv_field_ $vg/$lv2 origin_size 32.00M
-lvcreate -L 8M -n $lv3 -s --chunksize 512K $vg/$lv1
-check_lv_field_ $vg/$lv3 chunk_size 512.00K
-check_lv_field_ $vg/$lv3 origin_size 32.00M
+lvcreate -L 32m -n $lv1 $vg
+not lvcreate -L 8m -n $lv2 -s --chunksize 3k $vg/$lv1
+not lvcreate -L 8m -n $lv2 -s --chunksize 1024k $vg/$lv1
+lvcreate -L 8m -n $lv2 -s --chunksize 4k $vg/$lv1
+check_lv_field_ $vg/$lv2 chunk_size 4.00k
+check_lv_field_ $vg/$lv2 origin_size 32.00m
+lvcreate -L 8m -n $lv3 -s --chunksize 512k $vg/$lv1
+check_lv_field_ $vg/$lv3 chunk_size 512.00k
+check_lv_field_ $vg/$lv3 origin_size 32.00m
lvremove -ff $vg
vgchange -l 0 $vg
@@ -107,21 +107,21 @@
# - nonzero (bz186013)
# - a power of 2 and a multiple of page size
# - <= size of LV
-not lvcreate -L 32M -n $lv -R0 $vg 2>err
+not lvcreate -L 32m -n $lv -R0 $vg 2>err
grep "Non-zero region size must be supplied." err
-not lvcreate -L 32M -n $lv -R 11k $vg
-not lvcreate -L 32M -n $lv -R 1k $vg
-lvcreate -L 32M -n $lv --regionsize 128M -m 1 $vg
-check_lv_field_ $vg/$lv regionsize "32.00M"
+not lvcreate -L 32m -n $lv -R 11k $vg
+not lvcreate -L 32m -n $lv -R 1k $vg
+lvcreate -L 32m -n $lv --regionsize 128m -m 1 $vg
+check_lv_field_ $vg/$lv regionsize "32.00m"
lvremove -ff $vg
-lvcreate -L 32M -n $lv --regionsize 4M -m 1 $vg
-check_lv_field_ $vg/$lv regionsize "4.00M"
+lvcreate -L 32m -n $lv --regionsize 4m -m 1 $vg
+check_lv_field_ $vg/$lv regionsize "4.00m"
lvremove -ff $vg
# snapshot with virtual origin works
-lvcreate -s --virtualoriginsize 64M -L 32M -n $lv1 $vg
+lvcreate -s --virtualoriginsize 64m -L 32m -n $lv1 $vg
lvrename $vg/$lv1 $vg/$lv2
-lvcreate -s --virtualoriginsize 64M -L 32M -n $lv1 $vg
+lvcreate -s --virtualoriginsize 64m -L 32m -n $lv1 $vg
lvchange -a n $vg/$lv1
lvremove $vg/$lv1
lvremove -ff $vg
--- LVM2/test/t-lvextend-percent-extents.sh 2009/05/11 03:37:34 1.7
+++ LVM2/test/t-lvextend-percent-extents.sh 2009/09/30 16:13:53 1.8
@@ -15,14 +15,14 @@
aux prepare_vg 2 128
-lvcreate -L 64M -n $lv $vg
+lvcreate -L 64m -n $lv $vg
# 'lvextend rejects both size and extents without PVs'
-not lvextend -l 10 -L 64M $vg/$lv 2>err
+not lvextend -l 10 -L 64m $vg/$lv 2>err
grep "^ Please specify either size or extents but not both.\$" err
# 'lvextend rejects both size and extents with PVs'
-not lvextend -l 10 -L 64M $vg/$lv $dev1 2>err
+not lvextend -l 10 -L 64m $vg/$lv $dev1 2>err
grep "^ Please specify either size or extents but not both.\$" err
# 'lvextend accepts no size or extents but one PV - bz154691'
@@ -40,7 +40,7 @@
# 'Reset LV to original size'
lvremove -f $vg/$lv
-lvcreate -L 64M -n $lv $vg
+lvcreate -L 64m -n $lv $vg
# 'lvextend accepts no size but extents 100%PVS and two PVs - bz154691'
lvextend -l +100%PVS $vg/$lv $dev1 $dev2 >out
@@ -72,13 +72,13 @@
create_pvs=`for i in $(seq 0 4 20); do echo -n "\$dev1:$i-$(($i + 1)) "; done`
lvremove -f $vg/$lv
lvcreate -l 12 -n $lv $vg $create_pvs
-check_lv_field_ $vg/$lv lv_size "48.00M"
+check_lv_field_ $vg/$lv lv_size "48.00m"
# 'lvextend with partially allocated PVs and extents 100%PVS with PE ranges'
extend_pvs=`for i in $(seq 0 6 18); do echo -n "\$dev1:$i-$(($i + 2)) "; done`
lvextend -l +100%PVS $vg/$lv $extend_pvs >out
grep "^ Logical volume $lv successfully resized\$" out
-check_lv_field_ $vg/$lv lv_size "72.00M"
+check_lv_field_ $vg/$lv lv_size "72.00m"
# Simple seg_count validation; initially create the LV with half the # of
# extents (should be 1 lv segment), extend it (should go to 2 segments),
@@ -89,7 +89,7 @@
pe1=$(( $pe_count / 2 ))
lvcreate -l $pe1 -n $lv $vg
pesize=$(lvs -ovg_extent_size --units b --nosuffix --noheadings $vg/$lv)
-segsize=$(( $pe1 * $pesize / 1024 / 1024 ))M
+segsize=$(( $pe1 * $pesize / 1024 / 1024 ))m
check_lv_field_ $vg/$lv seg_count 1
check_lv_field_ $vg/$lv seg_start 0
check_lv_field_ $vg/$lv seg_start_pe 0
--- LVM2/test/t-pvcreate-operation-md.sh 2009/09/13 19:28:00 1.2
+++ LVM2/test/t-pvcreate-operation-md.sh 2009/09/30 16:13:53 1.3
@@ -49,14 +49,14 @@
# Test alignment of PV on MD without any MD-aware or topology-aware detection
# - should treat $mddev just like any other block device
-pv_align="192.00K"
+pv_align="192.00k"
pvcreate --metadatasize 128k \
--config 'devices {md_chunk_alignment=0 data_alignment_detection=0 data_alignment_offset_detection=0}' \
$mddev
check_pv_field_ $mddev pe_start $pv_align
# Test md_chunk_alignment independent of topology-aware detection
-pv_align="256.00K"
+pv_align="256.00k"
pvcreate --metadatasize 128k \
--config 'devices {data_alignment_detection=0 data_alignment_offset_detection=0}' \
$mddev
@@ -67,7 +67,7 @@
# Test newer topology-aware alignment detection
if [ $linux_minor -gt 31 ]; then
- pv_align="256.00K"
+ pv_align="256.00k"
pvcreate --metadatasize 128k \
--config 'devices { md_chunk_alignment=0 }' $mddev
check_pv_field_ $mddev pe_start $pv_align
@@ -100,12 +100,12 @@
alignment_offset=0
if [ "$alignment_offset" = "512" ]; then
- pv_align="256.50K"
+ pv_align="256.50k"
pvcreate --metadatasize 128k $mddev_p
check_pv_field_ $mddev_p pe_start $pv_align
pvremove $mddev_p
elif [ "$alignment_offset" = "2048" ]; then
- pv_align="258.00K"
+ pv_align="258.00k"
pvcreate --metadatasize 128k $mddev_p
check_pv_field_ $mddev_p pe_start $pv_align
pvremove $mddev_p
--- LVM2/test/t-pvcreate-usage.sh 2009/08/04 16:02:39 1.12
+++ LVM2/test/t-pvcreate-usage.sh 2009/09/30 16:13:53 1.13
@@ -31,8 +31,8 @@
pvremove $dev1
#Verify vg_mda_size is smaller pv_mda_size
-pvcreate --metadatasize 512K $dev1
-pvcreate --metadatasize 96K $dev2
+pvcreate --metadatasize 512k $dev1
+pvcreate --metadatasize 96k $dev2
vgcreate $vg $dev1 $dev2
compare_two_fields_ vgs $vg vg_mda_size pvs $dev2 pv_mda_size
vgremove -ff $vg
@@ -81,33 +81,33 @@
#COMM 'pvcreate basic dataalignment sanity checks'
not pvcreate --dataalignment -1 $dev1
not pvcreate -M 1 --dataalignment 1 $dev1
-not pvcreate --dataalignment 1E $dev1
+not pvcreate --dataalignment 1e $dev1
#COMM 'pvcreate always rounded up to page size for start of device'
#pvcreate --metadatacopies 0 --dataalignment 1 $dev1
# amuse shell experts
-#check_pv_field_ $dev1 pe_start $(($(getconf PAGESIZE)/1024))".00K"
+#check_pv_field_ $dev1 pe_start $(($(getconf PAGESIZE)/1024))".00k"
#COMM 'pvcreate sets data offset directly'
pvcreate --dataalignment 512k $dev1
-check_pv_field_ $dev1 pe_start 512.00K
+check_pv_field_ $dev1 pe_start 512.00k
#COMM 'vgcreate/vgremove do not modify data offset of existing PV'
vgcreate $vg $dev1 --config 'devices { data_alignment = 1024 }'
-check_pv_field_ $dev1 pe_start 512.00K
+check_pv_field_ $dev1 pe_start 512.00k
vgremove $vg --config 'devices { data_alignment = 1024 }'
-check_pv_field_ $dev1 pe_start 512.00K
+check_pv_field_ $dev1 pe_start 512.00k
#COMM 'pvcreate sets data offset next to mda area'
pvcreate --metadatasize 100k --dataalignment 100k $dev1
-check_pv_field_ $dev1 pe_start 200.00K
+check_pv_field_ $dev1 pe_start 200.00k
# metadata area start is aligned according to pagesize
# pagesize should be 64k or 4k ...
if [ $PAGESIZE -eq 65536 ] ; then
- pv_align="192.50K"
+ pv_align="192.50k"
else
- pv_align="133.00K"
+ pv_align="133.00k"
fi
pvcreate --metadatasize 128k --dataalignment 3.5k $dev1
@@ -118,7 +118,7 @@
# data area is aligned to 64k by default,
# data area start is shifted by the specified alignment_offset
-pv_align="195.50K"
+pv_align="195.50k"
pvcreate --metadatasize 128k --dataalignmentoffset 7s $dev1
check_pv_field_ $dev1 pe_start $pv_align
@@ -131,15 +131,15 @@
#COMM 'pv with LVM1 compatible data alignment can be convereted'
#compatible == LVM1_PE_ALIGN == 64k
pvcreate --dataalignment 256k $dev1
-vgcreate -s 1M $vg $dev1
+vgcreate -s 1m $vg $dev1
vgconvert -M1 $vg
vgconvert -M2 $vg
-check_pv_field_ $dev1 pe_start 256.00K
+check_pv_field_ $dev1 pe_start 256.00k
vgremove $vg
#COMM 'pv with LVM1 incompatible data alignment cannot be convereted'
pvcreate --dataalignment 10k $dev1
-vgcreate -s 1M $vg $dev1
+vgcreate -s 1m $vg $dev1
not vgconvert -M1 $vg
vgremove $vg
--- LVM2/test/t-read-ahead.sh 2009/06/06 16:40:39 1.8
+++ LVM2/test/t-read-ahead.sh 2009/09/30 16:13:53 1.9
@@ -45,7 +45,7 @@
#COMM "read ahead is properly inherited from underlying PV"
blockdev --setra 768 $dev1
-lvcreate -n $lv -L4M $vg $dev1
+lvcreate -n $lv -L4m $vg $dev1
test $(blockdev --getra $G_dev_/$vg/$lv) -eq 768
lvremove -ff $vg
@@ -56,6 +56,6 @@
check_lv_field_ $vg/$lv lv_kernel_read_ahead -1
lvchange -r 512 $vg/$lv
lvchange -ay $vg/$lv
-check_lv_field_ $vg/$lv lv_read_ahead 256.00K
-check_lv_field_ $vg/$lv lv_kernel_read_ahead 256.00K
+check_lv_field_ $vg/$lv lv_read_ahead 256.00k
+check_lv_field_ $vg/$lv lv_kernel_read_ahead 256.00k
lvremove -ff $vg
--- LVM2/test/t-vgcreate-usage.sh 2009/07/14 19:35:35 1.9
+++ LVM2/test/t-vgcreate-usage.sh 2009/09/30 16:13:53 1.10
@@ -17,9 +17,9 @@
pvcreate $dev1 $dev2
pvcreate --metadatacopies 0 $dev3
-#COMM 'vgcreate accepts 8.00M physicalextentsize for VG'
-vgcreate $vg --physicalextentsize 8.00M $dev1 $dev2
-check_vg_field_ $vg vg_extent_size 8.00M
+#COMM 'vgcreate accepts 8.00m physicalextentsize for VG'
+vgcreate $vg --physicalextentsize 8.00m $dev1 $dev2
+check_vg_field_ $vg vg_extent_size 8.00m
vgremove $vg
# try vgck and to remove it again - should fail (but not segfault)
not vgremove $vg
@@ -71,18 +71,18 @@
not vgcreate $vg $dev3
# Test default (4MB) vg_extent_size as well as limits of extent_size
-not vgcreate --physicalextentsize 0K $vg $dev1 $dev2
-vgcreate --physicalextentsize 1K $vg $dev1 $dev2
-check_vg_field_ $vg vg_extent_size 1.00K
+not vgcreate --physicalextentsize 0k $vg $dev1 $dev2
+vgcreate --physicalextentsize 1k $vg $dev1 $dev2
+check_vg_field_ $vg vg_extent_size 1.00k
vgremove -ff $vg
not vgcreate --physicalextentsize 3K $vg $dev1 $dev2
-not vgcreate --physicalextentsize 1024T $vg $dev1 $dev2
+not vgcreate --physicalextentsize 1024t $vg $dev1 $dev2
#not vgcreate --physicalextentsize 1T $vg $dev1 $dev2
# FIXME: vgcreate allows physicalextentsize larger than pv size!
# Test default max_lv, max_pv, extent_size, alloc_policy, clustered
vgcreate $vg $dev1 $dev2
-check_vg_field_ $vg vg_extent_size 4.00M
+check_vg_field_ $vg vg_extent_size 4.00m
check_vg_field_ $vg max_lv 0
check_vg_field_ $vg max_pv 0
check_vg_field_ $vg vg_attr "wz--n-"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-09-30 16:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-09-30 17:47 LVM2/test t-lvcreate-usage.sh t-lvextend-perce mornfall
2009-09-30 16:13 wysochanski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).