shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

raid: add missing lv_merge_segments() call

Browse Source 
On conversion from striped to raid0, data LVs are created
and all segments and their respective areas of the striped
LV are moved across to new segments allocated for the raid0
image LVs.  This can cause non-canonical segments to be added
to the image LVs.

Add a call to lv_merge_segments() once all segments have been
added to an image LV to compensate for that.  This avoids
unsafe table loads on activation.

Fix comments.
This commit is contained in:
Heinz Mauelshagen 2017-03-09 22:18:34 +01:00
parent 76f6951c3e
commit 66fff1d774
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/metadata/raid_manip.c
View File

@ -3986,6 +3986,10 @@ static int _striped_to_raid0_move_segs_to_raid0_lvs(struct logical_volume *lv,
dlv->le_count = le; dlv->le_count = le;
dlv->size = (uint64_t) le * lv->vg->extent_size; dlv->size = (uint64_t) le * lv->vg->extent_size;
s++; s++;
/* Try merging raid0 rimage sub LV segments */
if (!lv_merge_segments(dlv))
return_0;
} }
/* Remove the empty segments from the striped LV */ /* Remove the empty segments from the striped LV */
@ -5122,7 +5126,7 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
if (!_lv_free_reshape_space(lv)) if (!_lv_free_reshape_space(lv))
return_0; return_0;
/* This helper can be used to convert from striped/raid0* -> raid10 too */ /* This helper can be used to convert from striped/raid0* -> raid10_near too */
if (seg_is_striped_target(seg)) { if (seg_is_striped_target(seg)) {
log_debug_metadata("Converting LV %s from %s to %s.", log_debug_metadata("Converting LV %s from %s to %s.",
display_lvname(lv), SEG_TYPE_NAME_STRIPED, SEG_TYPE_NAME_RAID0); display_lvname(lv), SEG_TYPE_NAME_STRIPED, SEG_TYPE_NAME_RAID0);
@ -5179,7 +5183,7 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
} else if (segtype_is_raid10_near(new_segtype)) { } else if (segtype_is_raid10_near(new_segtype)) {
uint32_t s; uint32_t s;
log_debug_metadata("Reordering areas for raid0 -> raid10 takeover."); log_debug_metadata("Reordering areas for raid0 -> raid10_near takeover.");
if (!_reorder_raid10_near_seg_areas(seg, reorder_to_raid10_near)) if (!_reorder_raid10_near_seg_areas(seg, reorder_to_raid10_near))
return 0; return 0;
/* Set rebuild flags accordingly */ /* Set rebuild flags accordingly */