Attachment 192151 Details for Bug 154691 – Updated patch against upstream LVM2 to add "%PV" option

[patch] Updated patch against upstream LVM2 to add "%PV" option

lvm2-make-extents-optional-when-pvs-on-cmdline.patch3 (text/plain), 12.72 KB, created by Dave Wysochanski on 2007-09-10 22:12:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Wysochanski

Created: 2007-09-10 22:12:34 UTC

Size: 12.72 KB

patch

obsolete

>Add '%PV' extent option to lvextend, lvresize and lvcreate.  This simplifies
>adding new space to an LV for a newly added PV without the user having to do
>any extent math.  For example, suppose we have vg0, lv0, and we want to
>add new space in /dev/loop3.  We can now do the following to add all free
>space on /dev/loop3:
>
># pvcreate /dev/loop3
># vgextend vg0 /dev/loop3
># lvextend -l +100%PV vg0/lv0 /dev/loop3
>
>Another cleaner cmdline is to forgo '-l' altogether and just assume a
>"-l +100%PV" if there are PVs on the cmdline.  However, expressing this
>usage clearly on the man page synopsis seems impossible.  We could just
>state it in the description though, and it might be worth the ambiguity
>to have the cleaner cmdline that would match vgextend.
>
>--
>Index: LVM2/tools/lvresize.c
>===================================================================
>--- LVM2.orig/tools/lvresize.c	2007-09-06 18:44:01.000000000 -0400
>+++ LVM2/tools/lvresize.c	2007-09-10 17:05:34.000000000 -0400
>@@ -246,6 +246,7 @@ static int _lvresize(struct cmd_context 
> 	uint32_t seg_mirrors = 0;
> 	uint32_t extents_used = 0;
> 	uint32_t size_rest;
>+	uint32_t pv_extent_count = 0;
> 	alloc_policy_t alloc;
> 	struct logical_volume *lock_lv;
> 	struct lv_list *lvl;
>@@ -319,6 +320,15 @@ static int _lvresize(struct cmd_context 
> 		lp->extents = lp->size / vg->extent_size;
> 	}
> 
>+	if (lp->resize == LV_REDUCE) {
>+		if (lp->argc)
>+			log_print("Ignoring PVs on command line when reducing");
>+	} else if (!(pvh = lp->argc ? create_pv_list(cmd->mem, vg, lp->argc,
>+						     lp->argv, 1) : &vg->pvs)) {
>+		stack;
>+		return ECMD_FAILED;
>+	}
>+
> 	switch(lp->percent) {
> 		case PERCENT_VG:
> 			lp->extents = lp->extents * vg->extent_count / 100;
>@@ -329,6 +339,21 @@ static int _lvresize(struct cmd_context 
> 		case PERCENT_LV:
> 			lp->extents = lp->extents * lv->le_count / 100;
> 			break;
>+		case PERCENT_PV:
>+			/*
>+			 * FIXME: Handle case where we 'lvresize' with a
>+			 * negative value - harder since we might not know
>+			 * we are reducing until later when we apply all the
>+			 * constraints
>+			 */
>+			if (lp->resize == LV_REDUCE) {
>+				log_error("Cannot use %%PV when reducing.");
>+				return EINVALID_CMD_LINE;
>+			}
>+			pv_extent_count = pv_list_size_free(pvh);
>+			lp->extents = lp->extents * pv_extent_count / 100;
>+			log_print("Setting extents to %d...", lp->extents);
>+			break;
> 		case PERCENT_NONE:
> 			break;
> 	}
>@@ -536,15 +561,6 @@ static int _lvresize(struct cmd_context 
> 		}
> 	}
> 
>-	if (lp->resize == LV_REDUCE) {
>-		if (lp->argc)
>-			log_warn("Ignoring PVs on command line when reducing");
>-	} else if (!(pvh = lp->argc ? create_pv_list(cmd->mem, vg, lp->argc,
>-						     lp->argv, 1) : &vg->pvs)) {
>-		stack;
>-		return ECMD_FAILED;
>-	}
>-
> 	if (lp->resize == LV_REDUCE || lp->resizefs) {
> 		if (!confirm_resizefs_reduce(cmd, vg, lv, lp))
> 			return ECMD_FAILED;
>Index: LVM2/tools/lvmcmdline.c
>===================================================================
>--- LVM2.orig/tools/lvmcmdline.c	2007-09-06 18:44:01.000000000 -0400
>+++ LVM2/tools/lvmcmdline.c	2007-09-06 18:44:02.000000000 -0400
>@@ -269,6 +269,8 @@ int int_arg_with_sign_and_percent(struct
> 		a->percent = PERCENT_VG;
> 	else if (!strcasecmp(ptr, "L") || !strcasecmp(ptr, "LV"))
> 		a->percent = PERCENT_LV;
>+	else if (!strcasecmp(ptr, "P") || !strcasecmp(ptr, "PV"))
>+		a->percent = PERCENT_PV;
> 	else if (!strcasecmp(ptr, "F") || !strcasecmp(ptr, "FR") ||
> 		 !strcasecmp(ptr, "FREE"))
> 		a->percent = PERCENT_FREE;
>Index: LVM2/tools/tools.h
>===================================================================
>--- LVM2.orig/tools/tools.h	2007-09-06 18:44:01.000000000 -0400
>+++ LVM2/tools/tools.h	2007-09-06 18:44:02.000000000 -0400
>@@ -83,7 +83,8 @@ typedef enum {
> 	PERCENT_NONE = 0,
> 	PERCENT_VG,
> 	PERCENT_FREE,
>-	PERCENT_LV
>+	PERCENT_LV,
>+	PERCENT_PV
> } percent_t;
> 
> enum {
>Index: LVM2/man/lvresize.8
>===================================================================
>--- LVM2.orig/man/lvresize.8	2007-09-06 18:44:01.000000000 -0400
>+++ LVM2/man/lvresize.8	2007-09-06 18:44:02.000000000 -0400
>@@ -6,7 +6,7 @@ lvresize \- resize a logical volume
> [\-\-alloc AllocationPolicy]
> [\-A/\-\-autobackup y/n] [\-d/\-\-debug] [\-h/\-?/\-\-help]
> [\-i/\-\-stripes Stripes [\-I/\-\-stripesize StripeSize]]
>-{\-l/\-\-extents [+]LogicalExtentsNumber[%{VG|LV|FREE}] |
>+{\-l/\-\-extents [+]LogicalExtentsNumber[%{VG|LV|PV|FREE}] |
> \-L/\-\-size [+]LogicalVolumeSize[kKmMgGtT]}
> [\-t/\-\-test]
> [\-v/\-\-verbose] LogicalVolumePath [PhysicalVolumePath...]
>@@ -25,14 +25,16 @@ volume use 
> .SH OPTIONS
> See \fBlvm\fP for common options.
> .TP
>-.I \-l, \-\-extents [+/-]LogicalExtentsNumber[%{VG|LV|FREE}]
>+.I \-l, \-\-extents [+/-]LogicalExtentsNumber[%{VG|LV|PV|FREE}]
> Change or set the logical volume size in units of logical extents.
> With the + or - sign the value is added to or subtracted from the actual size
> of the logical volume and without it, the value is taken as an absolute one.
> The number can also be expressed as a percentage of the total space
>-in the Volume Group with the suffix %VG or relative to the existing
>-size of the Logical Volume with the suffix %LV or as a percentage of the remaining 
>-free space in the Volume Group with the suffix %FREE.
>+in the Volume Group with the suffix %VG, relative to the existing
>+size of the Logical Volume with the suffix %LV, as a percentage of
>+the remaining free space of the PhysicalVolumes on the command line with the
>+suffix %PV, or as a percentage of the remaining free space in the
>+Volume Group with the suffix %FREE.
> .TP
> .I \-L, \-\-size [+/-]LogicalVolumeSize[kKmMgGtTpPeE]
> Change or set the logical volume size in units of megabytes.
>Index: LVM2/tools/lvcreate.c
>===================================================================
>--- LVM2.orig/tools/lvcreate.c	2007-09-06 18:51:37.000000000 -0400
>+++ LVM2/tools/lvcreate.c	2007-09-10 17:05:18.000000000 -0400
>@@ -505,6 +505,7 @@ static int _lvcreate(struct cmd_context 
> 	char lv_name_buf[128];
> 	const char *lv_name;
> 	struct lvinfo info;
>+	uint32_t pv_extent_count;
> 
> 	status |= lp->permission | VISIBLE_LV;
> 
>@@ -589,6 +590,15 @@ static int _lvcreate(struct cmd_context 
> 		case PERCENT_FREE:
> 			lp->extents = lp->extents * vg->free_count / 100;
> 			break;
>+		case PERCENT_PV:
>+			if (!lp->pv_count) {
>+				log_error("Please specify physical volume(s) "
>+					  "with %%PV");
>+				return 0;
>+			}
>+			pv_extent_count = pv_list_size_free(pvh);
>+			lp->extents = lp->extents * pv_extent_count / 100;
>+			break;
> 		case PERCENT_LV:
> 			log_error("Please express size as %%VG or %%FREE.");
> 			return 0;
>Index: LVM2/man/lvcreate.8
>===================================================================
>--- LVM2.orig/man/lvcreate.8	2007-08-30 15:34:19.000000000 -0400
>+++ LVM2/man/lvcreate.8	2007-09-06 19:04:32.000000000 -0400
>@@ -8,7 +8,7 @@ lvcreate \- create a logical volume in a
> [\-A/\-\-autobackup y/n] [\-C/\-\-contiguous y/n] [\-d/\-\-debug]
> [\-h/\-?/\-\-help]
> [\-i/\-\-stripes Stripes [\-I/\-\-stripesize StripeSize]]
>-{\-l/\-\-extents LogicalExtentsNumber[%{VG|FREE}] |
>+{\-l/\-\-extents LogicalExtentsNumber[%{VG|PV|FREE}] |
>  \-L/\-\-size LogicalVolumeSize[kKmMgGtT]}
> [\-M/\-\-persistent y/n] [\-\-minor minor]
> [\-m/\-\-mirrors Mirrors [\-\-nosync] [\-\-mirrorlog {disk|log}] [\-\-corelog]
>@@ -63,12 +63,13 @@ StripeSize must be 2^n (n = 2 to 9) for 
> For metadata in LVM2 format, the stripe size may be a larger
> power of 2 but must not exceed the physical extent size.
> .TP
>-.I \-l, \-\-extents LogicalExtentsNumber[%{VG|FREE}]
>+.I \-l, \-\-extents LogicalExtentsNumber[%{VG|PV|FREE}]
> Gives the number of logical extents to allocate for the new
> logical volume.
> This can also be expressed as a percentage of the total space
>-in the Volume Group with the suffix %VG or of the remaining free space
>-with the suffix %FREE.
>+in the Volume Group with the suffix %VG, of the remaining free
>+extents for the specified PhysicalVolume(s) with the suffix %PV,
>+or of the remaining free space with the suffix %FREE.
> .TP
> .I \-L, \-\-size LogicalVolumeSize[kKmMgGtTpPeE]
> Gives the size to allocate for the new logical volume.
>Index: LVM2/man/lvextend.8
>===================================================================
>--- LVM2.orig/man/lvextend.8	2007-09-06 19:29:57.000000000 -0400
>+++ LVM2/man/lvextend.8	2007-09-07 15:41:22.000000000 -0400
>@@ -6,7 +6,7 @@ lvextend \- extend the size of a logical
> [\-\-alloc AllocationPolicy]
> [\-A/\-\-autobackup y/n] [\-d/\-\-debug] [\-h/\-?/\-\-help]
> [\-i/\-\-stripes Stripes [\-I/\-\-stripesize StripeSize]]
>-{\-l/\-\-extents [+]LogicalExtentsNumber[%{VG|LV|FREE}] |
>+{\-l/\-\-extents [+]LogicalExtentsNumber[%{VG|LV|PV|FREE}] |
> \-L/\-\-size [+]LogicalVolumeSize[kKmMgGtT]}
> [\-t/\-\-test]
> [\-v/\-\-verbose] LogicalVolumePath [PhysicalVolumePath...]
>@@ -21,14 +21,16 @@ volume use 
> .SH OPTIONS
> See \fBlvm\fP for common options.
> .TP
>-.I \-l, \-\-extents [+]LogicalExtentsNumber[%{VG|LV|FREE}]
>+.I \-l, \-\-extents [+]LogicalExtentsNumber[%{VG|LV|PV|FREE}]
> Extend or set the logical volume size in units of logical extents.
> With the + sign the value is added to the actual size
> of the logical volume and without it, the value is taken as an absolute one.
> The number can also be expressed as a percentage of the total space
>-in the Volume Group with the suffix %VG or relative to the existing
>-size of the Logical Volume with the suffix %LV or as a percentage of the remaining
>-free space in the Volume Group with the suffix %FREE.
>+in the Volume Group with the suffix %VG, relative to the existing
>+size of the Logical Volume with the suffix %LV, of the remaining
>+free extents for the specified PhysicalVolume(s) with the suffix %PV,
>+or as a percentage of the remaining free space in the Volume Group
>+with the suffix %FREE.
> .TP
> .I \-L, \-\-size [+]LogicalVolumeSize[kKmMgGtTpPeE]
> Extend or set the logical volume size in units of megabytes.
>Index: LVM2/tools/commands.h
>===================================================================
>--- LVM2.orig/tools/commands.h	2007-09-07 14:58:13.000000000 -0400
>+++ LVM2/tools/commands.h	2007-09-07 14:59:40.000000000 -0400
>@@ -144,7 +144,7 @@ xx(lvcreate,
>    "\t[-d|--debug]\n"
>    "\t[-h|-?|--help]\n"
>    "\t[-i|--stripes Stripes [-I|--stripesize StripeSize]]\n"
>-   "\t{-l|--extents LogicalExtentsNumber[%{VG|LV|FREE}] |\n"
>+   "\t{-l|--extents LogicalExtentsNumber[%{VG|LV|PV|FREE}] |\n"
>    "\t -L|--size LogicalVolumeSize[kKmMgGtTpPeE]}\n"
>    "\t[-M|--persistent {y|n}] [--major major] [--minor minor]\n"
>    "\t[-n|--name LogicalVolumeName]\n"
>@@ -209,7 +209,7 @@ xx(lvextend,
>    "\t[-d|--debug]\n"
>    "\t[-h|--help]\n"
>    "\t[-i|--stripes Stripes [-I|--stripesize StripeSize]]\n"
>-   "\t{-l|--extents [+]LogicalExtentsNumber[%{VG|FREE}] |\n"
>+   "\t{-l|--extents [+]LogicalExtentsNumber[%{VG|PV|FREE}] |\n"
>    "\t -L|--size [+]LogicalVolumeSize[kKmMgGtTpPeE]}\n"
>    "\t[-m|--mirrors Mirrors]\n"
>    "\t[-n|--nofsck]\n"
>@@ -323,7 +323,7 @@ xx(lvresize,
>    "\t[-d|--debug]\n"
>    "\t[-h|--help]\n"
>    "\t[-i|--stripes Stripes [-I|--stripesize StripeSize]]\n"
>-   "\t{-l|--extents [+|-]LogicalExtentsNumber[%{VG|LV|FREE}] |\n"
>+   "\t{-l|--extents [+|-]LogicalExtentsNumber[%{VG|LV|PV|FREE}] |\n"
>    "\t -L|--size [+|-]LogicalVolumeSize[kKmMgGtTpPeE]}\n"
>    "\t[-n|--nofsck]\n"
>    "\t[-r|--resizefs]\n"
>Index: LVM2/tools/toollib.c
>===================================================================
>--- LVM2.orig/tools/toollib.c	2007-09-07 17:32:21.000000000 -0400
>+++ LVM2/tools/toollib.c	2007-09-10 18:07:09.000000000 -0400
>@@ -874,6 +874,50 @@ char *default_vgname(struct cmd_context 
> 	return dm_pool_strdup(cmd->mem, vg_path);
> }
> 
>+#ifndef max
>+#define max(X,Y) (X > Y ? X : Y)
>+#endif
>+#ifndef min
>+#define min(X,Y) (X < Y ? X : Y)
>+#endif
>+
>+static uint32_t find_overlap_pe_size(struct pv_segment *pvseg,
>+				     struct pe_range *per)
>+{
>+	uint32_t start;
>+	uint32_t end;
>+
>+	start = max(pvseg->pe, per->start);
>+	end = min(pvseg->pe + pvseg->len, per->start + per->count);
>+	if (end < start)
>+		return 0;
>+	else
>+		return end - start;
>+}
>+
>+/*
>+ * Returns: number of free PEs in a struct pv_list
>+ */
>+uint32_t pv_list_size_free(struct list *pvh)
>+{
>+	struct pv_list *pvl;
>+	struct pe_range *per;
>+	uint32_t count = 0;
>+	struct pv_segment *pvseg;
>+
>+	list_iterate_items(pvl, pvh) {
>+		list_iterate_items(per, pvl->pe_ranges) {
>+			list_iterate_items(pvseg, &pvl->pv->segments) {
>+				if (!pvseg->lvseg) /* free space */
>+					count += find_overlap_pe_size(
>+						pvseg, per);
>+			}
>+		}
>+	}
>+
>+	return count;
>+}
>+
> /*
>  * Process physical extent range specifiers
>  */
>Index: LVM2/tools/toollib.h
>===================================================================
>--- LVM2.orig/tools/toollib.h	2007-08-22 10:38:18.000000000 -0400
>+++ LVM2/tools/toollib.h	2007-09-10 17:04:04.000000000 -0400
>@@ -112,4 +112,6 @@ struct logical_volume *create_mirror_log
> int set_lv(struct cmd_context *cmd, struct logical_volume *lv,
> 	   uint64_t sectors, int value);
> 
>+uint32_t pv_list_size_free(struct list *pvh);
>+
> #endif

Actions: View | Diff

Attachments on bug 154691: 144160 | 192151 | 200201