summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2019-10-16 11:57:04 -0500
committerDavid Teigland <teigland@redhat.com>2019-10-16 11:57:04 -0500
commit66229c5ef7f8abcd2fc6dd40217280c5ec1556e0 (patch)
treec6265b131006178b1f30f50d70a2afbdc5a521f9
parent98c20136978752d0e22808c94d2ecf5d5f028c7b (diff)
downloadlvm2-66229c5ef7f8abcd2fc6dd40217280c5ec1556e0.tar.gz
tests: cache-single-repair cvol suffix
-rw-r--r--test/shell/cache-single-repair.sh26
1 files changed, 13 insertions, 13 deletions
diff --git a/test/shell/cache-single-repair.sh b/test/shell/cache-single-repair.sh
index f465e366a..54060f50b 100644
--- a/test/shell/cache-single-repair.sh
+++ b/test/shell/cache-single-repair.sh
@@ -71,7 +71,7 @@ lvconvert -y --type cache --cachevol $lv2 --cachemode writethrough $vg/$lv1
mkfs_mount_umount $lv1
-lvconvert -y --repaircachevol $lv2 $vg/$lv3
+lvconvert -y --repaircachevol ${lv2}_cvol $vg/$lv3
# new cache is valid since it was just copied from existing
lvchange -ay $vg/$lv3
@@ -79,7 +79,7 @@ cache_check "$DM_DEV_DIR/$vg/$lv3"
lvchange -an $vg/$lv3
# use new cache for main lv
-lvconvert -y --replacecachevol $lv2 $vg/$lv3
+lvconvert -y --replacecachevol ${lv2}_cvol $vg/$lv3
# old cache is valid since it was never damaged
lvchange -ay $vg/$lv2
@@ -104,7 +104,7 @@ lvconvert -y --type cache --cachevol $lv2 --cachemode writeback $vg/$lv1
mkfs_mount_umount $lv1
-lvconvert -y --repaircachevol $lv2 $vg/$lv3
+lvconvert -y --repaircachevol ${lv2}_cvol $vg/$lv3
# new cache is valid since it was just copied from existing
lvchange -ay $vg/$lv3
@@ -112,7 +112,7 @@ cache_check "$DM_DEV_DIR/$vg/$lv3"
lvchange -an $vg/$lv3
# use new cache for main lv
-lvconvert -y --replacecachevol $lv2 $vg/$lv3
+lvconvert -y --replacecachevol ${lv2}_cvol $vg/$lv3
# old cache is valid since it was never damaged
lvchange -ay $vg/$lv2
@@ -142,14 +142,14 @@ mkfs_mount_umount $lv1
dd if=/dev/zero of="$dev3" bs=1M count=1 seek=1 oflag=direct
# verify it's not repairable
lvs -a $vg
-lvchange -y -ay $vg/$lv2
+lvchange -y -ay $vg/${lv2}_cvol
lvs -a $vg
-ls "$DM_DEV_DIR/mapper/$vg-$lv2"
-not cache_check "$DM_DEV_DIR/mapper/$vg-$lv2"
-lvchange -an $vg/$lv2
+ls "$DM_DEV_DIR/mapper/$vg-${lv2}_cvol"
+not cache_check "$DM_DEV_DIR/mapper/$vg-${lv2}_cvol"
+lvchange -an $vg/${lv2}_cvol
# cache_repair fails
-not lvconvert -y --repaircachevol $lv2 $vg/$lv3
+not lvconvert -y --repaircachevol ${lv2}_cvol $vg/$lv3
# drop the cache
lvconvert --splitcache $vg/$lv1
@@ -177,11 +177,11 @@ mkfs_mount_umount $lv1
dd if=/dev/zero of="$dev3" bs=1M count=1 seek=1 oflag=direct
# verify it's not repairable
lvs -a $vg
-lvchange -y -ay $vg/$lv2
+lvchange -y -ay $vg/${lv2}_cvol
lvs -a $vg
-ls "$DM_DEV_DIR/mapper/$vg-$lv2"
-not cache_check "$DM_DEV_DIR/mapper/$vg-$lv2"
-lvchange -an $vg/$lv2
+ls "$DM_DEV_DIR/mapper/$vg-${lv2}_cvol"
+not cache_check "$DM_DEV_DIR/mapper/$vg-${lv2}_cvol"
+lvchange -an $vg/${lv2}_cvol
# cache_repair fails
not lvconvert -y --repaircachevol $lv2 $vg/$lv3