|
 |
22b171 |
lib/misc/lvm-string.c | 1 -
|
|
|
22b171 |
lib/writecache/writecache.c | 2 +-
|
|
|
22b171 |
test/shell/writecache.sh | 36 ++++++++++++++++++++++++++++++++++++
|
|
|
22b171 |
3 files changed, 37 insertions(+), 2 deletions(-)
|
|
|
22b171 |
|
|
|
22b171 |
diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c
|
|
|
22b171 |
index 0ee3403..d8b27cb 100644
|
|
|
22b171 |
--- a/lib/misc/lvm-string.c
|
|
|
22b171 |
+++ b/lib/misc/lvm-string.c
|
|
|
22b171 |
@@ -251,7 +251,6 @@ char *build_dm_uuid(struct dm_pool *mem, const struct logical_volume *lv,
|
|
|
22b171 |
*/
|
|
|
22b171 |
/* Suffixes used here MUST match lib/activate/dev_manager.c */
|
|
|
22b171 |
layer = lv_is_cache_origin(lv) ? "real" :
|
|
|
22b171 |
- lv_is_writecache_origin(lv) ? "real" :
|
|
|
22b171 |
(lv_is_cache(lv) && lv_is_pending_delete(lv)) ? "real" :
|
|
|
22b171 |
lv_is_cache_pool_data(lv) ? "cdata" :
|
|
|
22b171 |
lv_is_cache_pool_metadata(lv) ? "cmeta" :
|
|
|
22b171 |
diff --git a/lib/writecache/writecache.c b/lib/writecache/writecache.c
|
|
|
22b171 |
index 130922a..08a306e 100644
|
|
|
22b171 |
--- a/lib/writecache/writecache.c
|
|
|
22b171 |
+++ b/lib/writecache/writecache.c
|
|
|
22b171 |
@@ -260,7 +260,7 @@ static int _writecache_add_target_line(struct dev_manager *dm,
|
|
|
22b171 |
if ((pmem = lv_on_pmem(seg->writecache)) < 0)
|
|
|
22b171 |
return_0;
|
|
|
22b171 |
|
|
|
22b171 |
- if (!(origin_uuid = build_dm_uuid(mem, seg_lv(seg, 0), "real")))
|
|
|
22b171 |
+ if (!(origin_uuid = build_dm_uuid(mem, seg_lv(seg, 0), NULL)))
|
|
|
22b171 |
return_0;
|
|
|
22b171 |
|
|
|
22b171 |
if (!(fast_uuid = build_dm_uuid(mem, seg->writecache, "cvol")))
|
|
|
22b171 |
diff --git a/test/shell/writecache.sh b/test/shell/writecache.sh
|
|
|
22b171 |
index 6cd4665..0a7f694 100644
|
|
|
22b171 |
--- a/test/shell/writecache.sh
|
|
|
22b171 |
+++ b/test/shell/writecache.sh
|
|
|
22b171 |
@@ -127,5 +127,41 @@ umount $mount_dir
|
|
|
22b171 |
lvchange -an $vg/$lv1
|
|
|
22b171 |
lvchange -an $vg/$lv2
|
|
|
22b171 |
|
|
|
22b171 |
+
|
|
|
22b171 |
+# test3: attach writecache to an active LV
|
|
|
22b171 |
+
|
|
|
22b171 |
+lvchange -ay $vg/$lv1
|
|
|
22b171 |
+
|
|
|
22b171 |
+mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg/$lv1"
|
|
|
22b171 |
+
|
|
|
22b171 |
+mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
|
|
|
22b171 |
+
|
|
|
22b171 |
+cp pattern1 $mount_dir/pattern1
|
|
|
22b171 |
+ls -l $mount_dir
|
|
|
22b171 |
+
|
|
|
22b171 |
+lvconvert --yes --type writecache --cachevol $lv2 $vg/$lv1
|
|
|
22b171 |
+
|
|
|
22b171 |
+check lv_field $vg/$lv1 segtype writecache
|
|
|
22b171 |
+
|
|
|
22b171 |
+lvs -a $vg/${lv2}_cvol --noheadings -o segtype >out
|
|
|
22b171 |
+grep linear out
|
|
|
22b171 |
+
|
|
|
22b171 |
+cp pattern1 $mount_dir/pattern1.after
|
|
|
22b171 |
+
|
|
|
22b171 |
+diff pattern1 $mount_dir/pattern1
|
|
|
22b171 |
+diff pattern1 $mount_dir/pattern1.after
|
|
|
22b171 |
+
|
|
|
22b171 |
+umount $mount_dir
|
|
|
22b171 |
+lvchange -an $vg/$lv1
|
|
|
22b171 |
+lvchange -ay $vg/$lv1
|
|
|
22b171 |
+mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir
|
|
|
22b171 |
+
|
|
|
22b171 |
+diff pattern1 $mount_dir/pattern1
|
|
|
22b171 |
+diff pattern1 $mount_dir/pattern1.after
|
|
|
22b171 |
+
|
|
|
22b171 |
+umount $mount_dir
|
|
|
22b171 |
+lvchange -an $vg/$lv1
|
|
|
22b171 |
+lvremove $vg/$lv1
|
|
|
22b171 |
+
|
|
|
22b171 |
vgremove -ff $vg
|
|
|
22b171 |
|