From: Alasdair Kergon <agk@redhat.com>
Date: Thu, 25 Mar 2010 12:14:14 +0000 (+0000)
Subject: more diagnostics
X-Git-Tag: old-v2_02_63~144
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=b8eddf1bdc6f8be822dffcb84bd92f430d1c08da;p=lvm2.git

more diagnostics
---

diff --git a/test/t-mirror-lvconvert.sh b/test/t-mirror-lvconvert.sh
index 24687140f..02dfdfeef 100755
--- a/test/t-mirror-lvconvert.sh
+++ b/test/t-mirror-lvconvert.sh
@@ -21,7 +21,7 @@ mimages_are_redundant_ ()
 
   rm -f out
   for i in $(lvs -odevices --noheadings $lv | sed 's/([^)]*)//g; s/,/ /g'); do
-    lvs -a -odevices --noheadings $vg/$i 
+    lvs -a -o+devices $vg/$i 
     lvs -a -odevices --noheadings $vg/$i | sed 's/([^)]*)//g; s/,/ /g' | \
       sort | uniq >> out
   done
@@ -37,7 +37,7 @@ lv_is_contiguous_ ()
   local lv=$1
 
   # if the lv has multiple segments, it's not contiguous
-  lvs -a --segments --noheadings $lv
+  lvs -a --segments $lv
   [ $(lvs -a --segments --noheadings $lv | wc -l) -ne 1 ] && return 1
 
   return 0
@@ -61,7 +61,7 @@ mirrorlog_is_on_()
   local lv="$1"_mlog
   shift 1
   if ! lvs -a $lv; then return 0; fi # FIXME?
-  lvs -a -odevices --noheadings $lv
+  lvs -a -o+devices $lv
   lvs -a -odevices --noheadings $lv | sed 's/,/\n/g' > out
   for d in $*; do grep "$d(" out || return 1; done
   for d in $*; do grep -v "$d(" out > out2 || true; mv out2 out; done
@@ -103,7 +103,7 @@ wait_conversion_()
 check_no_tmplvs_()
 {
   local lv=$1
-  lvs -a --noheadings -oname $(dirname $lv)
+  lvs -a -oname $(dirname $lv)
   lvs -a --noheadings -oname $(dirname $lv) > out
   ! grep tmp out
 }
@@ -150,10 +150,13 @@ check_and_cleanup_lvs_
 
 # add 1 mirror
 prepare_lvs_
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2
 check_mirror_log_ $vg/$lv1
 lvconvert -m+1 -i1 $vg/$lv1 $dev4
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1
 check_mirror_count_ $vg/$lv1 3
 mimages_are_redundant_ $vg $lv1
@@ -163,10 +166,13 @@ check_and_cleanup_lvs_
 # remove 1 mirror from corelog'ed mirror
 #  should retain 'core' log type
 prepare_lvs_
+lvs -a -o+devices $vg
 lvcreate -l2 -m2 --corelog -n $lv1 $vg
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 3
 not_sh check_mirror_log_ $vg/$lv1
 lvconvert -m -1 -i1 $vg/$lv1
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1
 check_mirror_count_ $vg/$lv1 2
 mimages_are_redundant_ $vg $lv1
@@ -175,10 +181,13 @@ check_and_cleanup_lvs_
 
 # add 2 mirrors
 prepare_lvs_
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2
 check_mirror_log_ $vg/$lv1
 lvconvert -m+2 -i1 $vg/$lv1 $dev4 $dev5
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1
 check_mirror_count_ $vg/$lv1 4
 mimages_are_redundant_ $vg $lv1
@@ -188,10 +197,13 @@ check_and_cleanup_lvs_
 # add 1 mirror to core log mirror,
 #  explicitly keep log as 'core'
 prepare_lvs_
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 --mirrorlog core -n $lv1 $vg $dev1 $dev2
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2
 not_sh check_mirror_log_ $vg/$lv1
 lvconvert -m+1 -i1 --mirrorlog core $vg/$lv1 $dev4 
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1 
 check_mirror_count_ $vg/$lv1 3 
 not_sh check_mirror_log_ $vg/$lv1
@@ -201,10 +213,13 @@ check_and_cleanup_lvs_
 # add 1 mirror to core log mirror, but
 #  implicitly keep log as 'core'
 prepare_lvs_
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 --mirrorlog core -n $lv1 $vg $dev1 $dev2
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2
 not_sh check_mirror_log_ $vg/$lv1
 lvconvert -m +1 -i1 $vg/$lv1
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1
 check_mirror_count_ $vg/$lv1 3
 not_sh check_mirror_log_ $vg/$lv1
@@ -213,10 +228,13 @@ check_and_cleanup_lvs_
 
 # add 2 mirrors to core log mirror" 
 prepare_lvs_ 
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 --mirrorlog core -n $lv1 $vg $dev1 $dev2 
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2 
 not_sh check_mirror_log_ $vg/$lv1 
 lvconvert -m+2 -i1 --mirrorlog core $vg/$lv1 $dev4 $dev5 
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1 
 check_mirror_count_ $vg/$lv1 4 
 not_sh check_mirror_log_ $vg/$lv1
@@ -228,11 +246,15 @@ check_and_cleanup_lvs_
 
 # add 1 mirror then add 1 more mirror during conversion
 prepare_lvs_
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2
 check_mirror_log_ $vg/$lv1
 lvconvert -m+1 -b $vg/$lv1 $dev4
+lvs -a -o+devices $vg
 lvconvert -m+1 -i3 $vg/$lv1 $dev5
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1
 check_mirror_count_ $vg/$lv1 4
 mimages_are_redundant_ $vg $lv1
@@ -244,10 +266,13 @@ check_and_cleanup_lvs_
 
 # "add 1 mirror and disk log" 
 prepare_lvs_ 
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 --mirrorlog core -n $lv1 $vg $dev1 $dev2 
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2 
 not_sh check_mirror_log_ $vg/$lv1 
 lvconvert -m+1 --mirrorlog disk -i1 $vg/$lv1 $dev4 $dev3:0
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1 
 check_mirror_count_ $vg/$lv1 3 
 check_mirror_log_ $vg/$lv1 
@@ -260,13 +285,16 @@ check_and_cleanup_lvs_
 
 # convert inactive mirror and start polling
 prepare_lvs_
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2
 lvchange -an $vg/$lv1
 lvconvert -m+1 $vg/$lv1 $dev4
+lvs -a -o+devices $vg
 lvchange -ay $vg/$lv1
 wait_conversion_ $vg/$lv1
-lvs -a
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1
 check_and_cleanup_lvs_
 
@@ -275,12 +303,17 @@ check_and_cleanup_lvs_
 
 # "remove newly added mirror" 
 prepare_lvs_ 
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2 
 check_mirror_log_ $vg/$lv1 
 lvconvert -m+1 -b $vg/$lv1 $dev4 
+lvs -a -o+devices $vg
 lvconvert -m-1 $vg/$lv1 $dev4 
+lvs -a -o+devices $vg
 wait_conversion_ $vg/$lv1 
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1 
 check_mirror_count_ $vg/$lv1 2 
 mimages_are_redundant_ $vg $lv1 
@@ -289,13 +322,19 @@ check_and_cleanup_lvs_
 
 # "remove one of newly added mirrors" 
 prepare_lvs_ 
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2 
 check_mirror_log_ $vg/$lv1 
 lvconvert -m+2 -b $vg/$lv1 $dev4 $dev5 
+lvs -a -o+devices $vg
 lvconvert -m-1 $vg/$lv1 $dev4 
+lvs -a -o+devices $vg
 lvconvert -i1 $vg/$lv1 
+lvs -a -o+devices $vg
 wait_conversion_ $vg/$lv1 
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1 
 check_mirror_count_ $vg/$lv1 3 
 mimages_are_redundant_ $vg $lv1 
@@ -304,13 +343,19 @@ check_and_cleanup_lvs_
 
 # "remove from original mirror (the original is still mirror)"
 prepare_lvs_ 
+lvs -a -o+devices $vg
 lvcreate -l2 -m2 -n $lv1 $vg $dev1 $dev2 $dev5 $dev3:0
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 3 
 check_mirror_log_ $vg/$lv1 
 lvconvert -m+1 -b $vg/$lv1 $dev4 
+lvs -a -o+devices $vg
 lvconvert -m-1 $vg/$lv1 $dev2 
+lvs -a -o+devices $vg
 lvconvert -i1 $vg/$lv1 
+lvs -a -o+devices $vg
 wait_conversion_ $vg/$lv1 
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1 
 check_mirror_count_ $vg/$lv1 3 
 mimages_are_redundant_ $vg $lv1 
@@ -319,13 +364,19 @@ check_and_cleanup_lvs_
 
 # "remove from original mirror (the original becomes linear)"
 prepare_lvs_ 
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2 
 check_mirror_log_ $vg/$lv1 
 lvconvert -m+1 -b $vg/$lv1 $dev4 
+lvs -a -o+devices $vg
 lvconvert -m-1 $vg/$lv1 $dev2 
+lvs -a -o+devices $vg
 lvconvert -i1 $vg/$lv1 
+lvs -a -o+devices $vg
 wait_conversion_ $vg/$lv1 
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1 
 check_mirror_count_ $vg/$lv1 2 
 mimages_are_redundant_ $vg $lv1 
@@ -336,32 +387,45 @@ check_and_cleanup_lvs_
 
 # "rhbz440405: lvconvert -m0 incorrectly fails if all PEs allocated"
 prepare_lvs_ 
+lvs -a -o+devices $vg
 lvcreate -l`pvs --noheadings -ope_count $dev1` -m1 -n $lv1 $vg $dev1 $dev2 $dev3:0 
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2 
 check_mirror_log_ $vg/$lv1 
 lvconvert -m0 $vg/$lv1 $dev1 
+lvs -a -o+devices $vg
 check_no_tmplvs_ $vg/$lv1 
 check_mirror_count_ $vg/$lv1 1 
 check_and_cleanup_lvs_
 
 # "rhbz264241: lvm mirror doesn't lose it's "M" --nosync attribute after being down and the up converted"
 prepare_lvs_
+lvs -a -o+devices $vg
 lvcreate -l2 -m1 -n$lv1 --nosync $vg 
+lvs -a -o+devices $vg
 lvconvert -m0 $vg/$lv1
+lvs -a -o+devices $vg
 lvconvert -m1 $vg/$lv1
+lvs -a -o+devices $vg
 lvs --noheadings -o attr $vg/$lv1 | grep '^ *m'
 check_and_cleanup_lvs_
 
 # lvconvert from linear (on multiple PVs) to mirror
 prepare_lvs_
+lvs -a -o+devices $vg
 lvcreate -l 8 -n $lv1 $vg $dev1:0-3 $dev2:0-3
+lvs -a -o+devices $vg
 lvconvert -m1 $vg/$lv1
+lvs -a -o+devices $vg
 check_mirror_count_ $vg/$lv1 2
 check_mirror_log_ $vg/$lv1
 check_and_cleanup_lvs_
 
 # BZ 463272: disk log mirror convert option is lost if downconvert option is also given
 prepare_lvs_
+lvs -a -o+devices $vg
 lvcreate -l1 -m2 --corelog -n $lv1 $vg
+lvs -a -o+devices $vg
 lvconvert -m1 --mirrorlog disk $vg/$lv1
+lvs -a -o+devices $vg
 check_mirror_log_ $vg/$lv1