|
 |
cdbae0 |
test/shell/lvconvert-thin.sh | 2 +-
|
|
|
cdbae0 |
test/shell/lvcreate-cache.sh | 12 +++++-------
|
|
|
cdbae0 |
test/shell/lvcreate-thin-big.sh | 10 +++++-----
|
|
|
cdbae0 |
3 files changed, 11 insertions(+), 13 deletions(-)
|
|
|
cdbae0 |
|
|
|
cdbae0 |
diff --git a/test/shell/lvconvert-thin.sh b/test/shell/lvconvert-thin.sh
|
|
|
cdbae0 |
index 1319655..ee85691 100644
|
|
|
cdbae0 |
--- a/test/shell/lvconvert-thin.sh
|
|
|
cdbae0 |
+++ b/test/shell/lvconvert-thin.sh
|
|
|
cdbae0 |
@@ -128,7 +128,7 @@ lvcreate -L1T -n $lv1 $vg
|
|
|
cdbae0 |
lvcreate -L32G -n $lv2 $vg
|
|
|
cdbae0 |
# Warning about bigger then needed
|
|
|
cdbae0 |
lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 2>&1 | tee err
|
|
|
cdbae0 |
-grep "WARNING: Maximum" err
|
|
|
cdbae0 |
+grep -i "maximum" err
|
|
|
cdbae0 |
lvremove -f $vg
|
|
|
cdbae0 |
|
|
|
cdbae0 |
|
|
|
cdbae0 |
diff --git a/test/shell/lvcreate-cache.sh b/test/shell/lvcreate-cache.sh
|
|
|
cdbae0 |
index 2c46e21..4d9d75e 100644
|
|
|
cdbae0 |
--- a/test/shell/lvcreate-cache.sh
|
|
|
cdbae0 |
+++ b/test/shell/lvcreate-cache.sh
|
|
|
cdbae0 |
@@ -27,7 +27,6 @@ aux prepare_vg 5 80000
|
|
|
cdbae0 |
|
|
|
cdbae0 |
aux lvmconf 'global/cache_disabled_features = [ "policy_smq" ]'
|
|
|
cdbae0 |
|
|
|
cdbae0 |
-
|
|
|
cdbae0 |
#######################
|
|
|
cdbae0 |
# Cache_Pool creation #
|
|
|
cdbae0 |
#######################
|
|
|
cdbae0 |
@@ -173,17 +172,16 @@ dmsetup table ${vg}-$lv1 | grep cache # ensure it is loaded in kernel
|
|
|
cdbae0 |
|
|
|
cdbae0 |
lvremove -f $vg
|
|
|
cdbae0 |
|
|
|
cdbae0 |
-
|
|
|
cdbae0 |
# Check minimum cache pool metadata size
|
|
|
cdbae0 |
-lvcreate -l 1 --type cache-pool --poolmetadatasize 1 $vg 2>out
|
|
|
cdbae0 |
-grep "WARNING: Minimum" out
|
|
|
cdbae0 |
+lvcreate -l 1 --type cache-pool --poolmetadatasize 1 $vg 2>&1 | tee out
|
|
|
cdbae0 |
+grep -i "minimal" out
|
|
|
cdbae0 |
+
|
|
|
cdbae0 |
|
|
|
cdbae0 |
# FIXME: This test is failing in allocator with smaller VG sizes
|
|
|
cdbae0 |
-lvcreate -l 1 --type cache-pool --poolmetadatasize 17G $vg 2>out
|
|
|
cdbae0 |
-grep "WARNING: Maximum" out
|
|
|
cdbae0 |
+lvcreate -l 1 --type cache-pool --poolmetadatasize 17G $vg 2>&1 | tee out
|
|
|
cdbae0 |
+grep -i "maximum" out
|
|
|
cdbae0 |
|
|
|
cdbae0 |
lvremove -f $vg
|
|
|
cdbae0 |
-
|
|
|
cdbae0 |
########################################
|
|
|
cdbae0 |
# Cache conversion and r/w permissions #
|
|
|
cdbae0 |
########################################
|
|
|
cdbae0 |
diff --git a/test/shell/lvcreate-thin-big.sh b/test/shell/lvcreate-thin-big.sh
|
|
|
cdbae0 |
index 0b622b7..2549035 100644
|
|
|
cdbae0 |
--- a/test/shell/lvcreate-thin-big.sh
|
|
|
cdbae0 |
+++ b/test/shell/lvcreate-thin-big.sh
|
|
|
cdbae0 |
@@ -31,14 +31,14 @@ vgcreate $SHARED -s 64K "$vg" "${DEVICES[@]}"
|
|
|
cdbae0 |
|
|
|
cdbae0 |
# Size 0 is not valid
|
|
|
cdbae0 |
invalid lvcreate -L4M --chunksize 128 --poolmetadatasize 0 -T $vg/pool1 2>out
|
|
|
cdbae0 |
-lvcreate -Zn -L4M --chunksize 128 --poolmetadatasize 16k -T $vg/pool1 2>out
|
|
|
cdbae0 |
-grep "WARNING: Minimum" out
|
|
|
cdbae0 |
+lvcreate -Zn -L4M --chunksize 128 --poolmetadatasize 16k -T $vg/pool1 2>&1 >out
|
|
|
cdbae0 |
+grep -i "minimal" out
|
|
|
cdbae0 |
# FIXME: metadata allocation fails, if PV doesn't have at least 16GB
|
|
|
cdbae0 |
# i.e. pool metadata device cannot be multisegment
|
|
|
cdbae0 |
-lvcreate -Zn -L4M --chunksize 64k --poolmetadatasize 17G -T $vg/pool2 2>out
|
|
|
cdbae0 |
-grep "WARNING: Maximum" out
|
|
|
cdbae0 |
+lvcreate -Zn -L4M --chunksize 64k --poolmetadatasize 17G -T $vg/pool2 2>&1 >out
|
|
|
cdbae0 |
+grep "maximum" out
|
|
|
cdbae0 |
check lv_field $vg/pool1_tmeta size "2.00m"
|
|
|
cdbae0 |
-check lv_field $vg/pool2_tmeta size "15.81g"
|
|
|
cdbae0 |
+check lv_field $vg/pool2_tmeta size "<15.88g"
|
|
|
cdbae0 |
|
|
|
cdbae0 |
# Check we do report correct percent values.
|
|
|
cdbae0 |
lvcreate --type zero -L3G $vg -n pool3
|