shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

writecache: fix splitcache when origin is raid

Browse Source
This commit is contained in:
David Teigland 2020-02-04 16:05:56 -06:00
parent 9255c7148a
commit 2a6078f961
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/metadata/lv_manip.c
View File

@ -4535,6 +4535,9 @@ static int _for_each_sub_lv(struct logical_volume *lv, int level,
if (!_for_each_sub_lv(seg->pool_lv, level, fn, data))
return_0;
if (!_for_each_sub_lv(seg->writecache, level, fn, data))
return_0;
for (s = 0; s < seg->area_count; s++) {
if (seg_type(seg, s) != AREA_LV)
continue;
@ -6989,7 +6992,7 @@ int move_lv_segments(struct logical_volume *lv_to,
int remove_layer_from_lv(struct logical_volume *lv,
struct logical_volume *layer_lv)
{
static const char _suffixes[][8] = { "_tdata", "_cdata", "_corig", "_vdata" };
static const char _suffixes[][8] = { "_tdata", "_cdata", "_corig", "_wcorig", "_vdata" };
struct logical_volume *parent_lv;
struct lv_segment *parent_seg;
struct segment_type *segtype;
@ -7069,8 +7072,8 @@ int remove_layer_from_lv(struct logical_volume *lv,
* currently supported only for thin data layer
* FIXME: without strcmp it breaks mirrors....
*/
if (!strstr(layer_lv->name, "_mimage"))
for (r = 0; r < DM_ARRAY_SIZE(_suffixes); ++r)
if (!strstr(layer_lv->name, "_mimage")) {
for (r = 0; r < DM_ARRAY_SIZE(_suffixes); ++r) {
if (strstr(layer_lv->name, _suffixes[r]) == 0) {
lv_names.old = layer_lv->name;
lv_names.new = parent_lv->name;
@ -7078,6 +7081,8 @@ int remove_layer_from_lv(struct logical_volume *lv,
return_0;
break;
}
}
}
return 1;
}
@ -7093,7 +7098,7 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd,
uint64_t status,
const char *layer_suffix)
{
static const char _suffixes[][8] = { "_tdata", "_cdata", "_corig", "_vdata" };
static const char _suffixes[][8] = { "_tdata", "_cdata", "_corig", "_wcorig", "_vdata" };
int r;
char name[NAME_LEN];
struct dm_str_list *sl;

17
test/shell/writecache-split.sh
View File

@ -127,6 +127,23 @@ vgextend --restoremissing $vg "$dev3"
vgremove -ff $vg
#
# splitcache when origin is raid
#
vgcreate $vg "$dev1" "$dev2" "$dev3" "$dev4"
lvcreate --type raid1 -m1 -L6 -n $lv1 -an $vg "$dev1" "$dev2"
lvcreate -L6 -n $lv2 -an $vg "$dev3"
lvconvert -y --type writecache --cachevol $lv2 $vg/$lv1
lvchange -ay $vg/$lv1
lvchange -an $vg/$lv1
lvconvert --splitcache $vg/$lv1
lvs $vg/$lv1
lvs $vg/$lv2
vgremove -ff $vg
#
# vgsplit should not separate cachevol from main lv
#