mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-18 10:04:20 +03:00
raid_manip: add missing code avoiding MetaLV collocation on the same PV
Adding MetaLVs to given DataLVs (e.g. raid0 -> raid0_meta takeover), _avoid_pvs_with_other_images_of_lv() was missing code to prohibit allocation when called with a just allocated MetaLV to prohibit collaocation of the next allocated MetaLV on the same PV. - resolves rhbz1366738
This commit is contained in:
parent
0973d6e331
commit
6d52b17dfc
@ -176,14 +176,22 @@ static int _activate_sublv_preserving_excl(struct logical_volume *top_lv,
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* HM Helper: prohibit allocation on @pv if @lv already has segments allocated on it */
|
||||||
|
static int _avoid_pv_of_lv(struct logical_volume *lv, struct physical_volume *pv)
|
||||||
|
{
|
||||||
|
if (!lv_is_partial(lv) && lv_is_on_pv(lv, pv))
|
||||||
|
pv->status |= PV_ALLOCATION_PROHIBITED;
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
static int _avoid_pvs_of_lv(struct logical_volume *lv, void *data)
|
static int _avoid_pvs_of_lv(struct logical_volume *lv, void *data)
|
||||||
{
|
{
|
||||||
struct dm_list *allocate_pvs = (struct dm_list *) data;
|
struct dm_list *allocate_pvs = (struct dm_list *) data;
|
||||||
struct pv_list *pvl;
|
struct pv_list *pvl;
|
||||||
|
|
||||||
dm_list_iterate_items(pvl, allocate_pvs)
|
dm_list_iterate_items(pvl, allocate_pvs)
|
||||||
if (!lv_is_partial(lv) && lv_is_on_pv(lv, pvl->pv))
|
_avoid_pv_of_lv(lv, pvl->pv);
|
||||||
pvl->pv->status |= PV_ALLOCATION_PROHIBITED;
|
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -195,7 +203,15 @@ static int _avoid_pvs_of_lv(struct logical_volume *lv, void *data)
|
|||||||
*/
|
*/
|
||||||
static int _avoid_pvs_with_other_images_of_lv(struct logical_volume *lv, struct dm_list *allocate_pvs)
|
static int _avoid_pvs_with_other_images_of_lv(struct logical_volume *lv, struct dm_list *allocate_pvs)
|
||||||
{
|
{
|
||||||
return for_each_sub_lv(lv, _avoid_pvs_of_lv, allocate_pvs);
|
/* HM FIXME: check fails in case we will ever have mixed AREA_PV/AREA_LV segments */
|
||||||
|
if ((seg_type(first_seg(lv), 0) == AREA_PV ? _avoid_pvs_of_lv(lv, allocate_pvs):
|
||||||
|
for_each_sub_lv(lv, _avoid_pvs_of_lv, allocate_pvs)))
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
log_error("Failed to prevent PVs holding image components "
|
||||||
|
"from LV %s being used for allocation.",
|
||||||
|
display_lvname(lv));
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void _clear_allocation_prohibited(struct dm_list *pvs)
|
static void _clear_allocation_prohibited(struct dm_list *pvs)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user