Attachment 595841 Details for Bug 834703 – Fix version 2 - still not perfect.

[patch] Fix version 2 - still not perfect.

resize-raid456.patch (text/plain), 2.09 KB, created by Jonathan Earl Brassow on 2012-07-03 00:06:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Earl Brassow

Created: 2012-07-03 00:06:29 UTC

Size: 2.09 KB

patch

obsolete

>Index: lvm2/lib/metadata/lv_manip.c
>===================================================================
>--- lvm2.orig/lib/metadata/lv_manip.c
>+++ lvm2/lib/metadata/lv_manip.c
>@@ -697,6 +697,13 @@ static uint32_t _calc_area_multiple(cons
> 	if (segtype_is_striped(segtype))
> 		return area_count;
> 
>+	/* Parity RAID (e.g. RAID 4/5/6) */
>+	if (segtype_is_raid(segtype) && segtype->parity_devs) {
>+	log_error("Entering '_calc_area_multiple with area_count = %u",
>+		  area_count);
>+
>+		return area_count - segtype->parity_devs;
>+	}
> 	/* Mirrored stripes */
> 	if (stripes)
> 		return stripes;
>@@ -829,7 +836,15 @@ static struct alloc_handle *_alloc_init(
> 	ah->parity_count = parity_count;
> 	ah->region_size = region_size;
> 	ah->alloc = alloc;
>-	ah->area_multiple = _calc_area_multiple(segtype, area_count, stripes);
>+
>+	/*
>+	 * For the purposes of allocation, area_count and parity_count are
>+	 * kept separately.  However, the 'area_count' field in an
>+	 * lv_segment includes both; and this is what '_calc_area_multiple'
>+	 * is calculated from.  So, we must pass in the total count to get
>+	 * a correct area_multiple.
>+	 */
>+	ah->area_multiple = _calc_area_multiple(segtype, area_count + parity_count, stripes);
> 	ah->mirror_logs_separate = find_config_tree_bool(cmd, "allocation/mirror_logs_require_separate_pvs",
> 							 DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS);
> 
>Index: lvm2/tools/lvresize.c
>===================================================================
>--- lvm2.orig/tools/lvresize.c
>+++ lvm2/tools/lvresize.c
>@@ -598,11 +598,12 @@ static int _lvresize(struct cmd_context
> 		 *       and data LV could be any type (i.e. mirror)) */
> 		dm_list_iterate_items(seg, seg_mirrors ? &seg_lv(mirr_seg, 0)->segments :
> 				      lv_is_thin_pool(lv) ? &seg_lv(first_seg(lv), 0)->segments : &lv->segments) {
>-			if (!seg_is_striped(seg))
>+			if (!seg_is_striped(seg) &&
>+			    (!seg_is_raid(seg) || seg_is_mirrored(seg)))
> 				continue;
> 
> 			sz = seg->stripe_size;
>-			str = seg->area_count;
>+			str = seg->area_count - lp->segtype->parity_devs;
> 
> 			if ((seg_stripesize && seg_stripesize != sz &&
> 			     sz && !lp->stripe_size) ||

Actions: View | Diff

Attachments on bug 834703: 595823 | 595841