public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2 ./WHATS_NEW lib/format_text/flags.c lib/m ...
@ 2011-11-30 2:02 jbrassow
0 siblings, 0 replies; 3+ messages in thread
From: jbrassow @ 2011-11-30 2:02 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: jbrassow@sourceware.org 2011-11-30 02:02:12
Modified files:
. : WHATS_NEW
lib/format_text: flags.c
lib/metadata : metadata-exported.h raid_manip.c
lib/raid : raid.c
libdm/ioctl : libdm-iface.c
man : lvconvert.8.in
tools : args.h commands.h lvconvert.c
Log message:
Support the ability to replace specific devices in a RAID array.
RAID is not like traditional LVM mirroring. LVM mirroring required failed
devices to be removed or the logical volume would simply hang. RAID arrays can
keep on running with failed devices. In fact, for RAID types other than RAID1,
removing a device would mean substituting an error target or converting to a
lower level RAID (e.g. RAID6 -> RAID5, or RAID4/5 to RAID0). Therefore, rather
than removing a failed device unconditionally and potentially allocating a
replacement, RAID allows the user to "replace" a device with a new one. This
approach is a 1-step solution vs the current 2-step solution.
example> lvconvert --replace <dev_to_remove> vg/lv [possible_replacement_PVs]
'--replace' can be specified more than once.
example> lvconvert --replace /dev/sdb1 --replace /dev/sdc1 vg/lv
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.2198&r2=1.2199
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/flags.c.diff?cvsroot=lvm2&r1=1.49&r2=1.50
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata-exported.h.diff?cvsroot=lvm2&r1=1.222&r2=1.223
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/raid_manip.c.diff?cvsroot=lvm2&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/raid/raid.c.diff?cvsroot=lvm2&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/ioctl/libdm-iface.c.diff?cvsroot=lvm2&r1=1.129&r2=1.130
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/man/lvconvert.8.in.diff?cvsroot=lvm2&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/args.h.diff?cvsroot=lvm2&r1=1.85&r2=1.86
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/commands.h.diff?cvsroot=lvm2&r1=1.166&r2=1.167
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvconvert.c.diff?cvsroot=lvm2&r1=1.174&r2=1.175
--- LVM2/WHATS_NEW 2011/11/28 20:37:51 1.2198
+++ LVM2/WHATS_NEW 2011/11/30 02:02:10 1.2199
@@ -1,5 +1,6 @@
Version 2.02.89 -
==================================
+ Support the ability to replace specific devices in a RAID array via lvconvert.
Add activation/use_linear_target enabled by default.
Use gcc warning options only with .c to .o compilation.
Move y/n prompts to stderr and repeat if response has both 'n' and 'y'.
--- LVM2/lib/format_text/flags.c 2011/11/15 11:54:16 1.49
+++ LVM2/lib/format_text/flags.c 2011/11/30 02:02:11 1.50
@@ -57,6 +57,7 @@
{PVMOVE, "PVMOVE", STATUS_FLAG},
{LOCKED, "LOCKED", STATUS_FLAG},
{LV_NOTSYNCED, "NOTSYNCED", STATUS_FLAG},
+ {LV_REBUILD, "REBUILD", STATUS_FLAG},
{RAID, NULL, 0},
{RAID_META, NULL, 0},
{RAID_IMAGE, NULL, 0},
--- LVM2/lib/metadata/metadata-exported.h 2011/11/04 22:43:10 1.222
+++ LVM2/lib/metadata/metadata-exported.h 2011/11/30 02:02:11 1.223
@@ -61,7 +61,9 @@
//#define VIRTUAL UINT64_C(0x00010000) /* LV - internal use only */
#define MIRROR_LOG UINT64_C(0x00020000) /* LV */
#define MIRROR_IMAGE UINT64_C(0x00040000) /* LV */
+
#define LV_NOTSYNCED UINT64_C(0x00080000) /* LV */
+#define LV_REBUILD UINT64_C(0x00100000) /* LV - internal use only */
//#define PRECOMMITTED UINT64_C(0x00200000) /* VG - internal use only */
#define CONVERTING UINT64_C(0x00400000) /* LV */
@@ -788,6 +790,8 @@
int lv_raid_merge(struct logical_volume *lv);
int lv_raid_reshape(struct logical_volume *lv,
const struct segment_type *new_segtype);
+int lv_raid_replace(struct logical_volume *lv, struct dm_list *remove_pvs,
+ struct dm_list *allocate_pvs);
/* -- metadata/raid_manip.c */
--- LVM2/lib/metadata/raid_manip.c 2011/10/07 14:56:01 1.17
+++ LVM2/lib/metadata/raid_manip.c 2011/11/30 02:02:11 1.18
@@ -440,7 +440,7 @@
return 0;
}
- status = LVM_READ | LVM_WRITE | LV_NOTSYNCED | type;
+ status = LVM_READ | LVM_WRITE | LV_REBUILD | type;
tmp_lv = lv_create_empty(img_name, NULL, status, ALLOC_INHERIT, lv->vg);
if (!tmp_lv) {
log_error("Failed to allocate new raid component, %s", img_name);
@@ -569,6 +569,7 @@
static int _raid_add_images(struct logical_volume *lv,
uint32_t new_count, struct dm_list *pvs)
{
+ int rebuild_flag_cleared = 0;
uint32_t s;
uint32_t old_count = lv_raid_image_count(lv);
uint32_t count = new_count - old_count;
@@ -588,7 +589,7 @@
*/
if (seg_is_linear(seg)) {
/* A complete resync will be done, no need to mark each sub-lv */
- status_mask = ~(LV_NOTSYNCED);
+ status_mask = ~(LV_REBUILD);
if (!(lvl = dm_pool_alloc(lv->vg->vgmem, sizeof(*lvl)))) {
log_error("Memory allocation failed");
@@ -751,6 +752,27 @@
return 0;
}
+ /*
+ * Now that the 'REBUILD' has made its way to the kernel, we must
+ * remove the flag so that the individual devices are not rebuilt
+ * upon every activation.
+ */
+ seg = first_seg(lv);
+ for (s = 0; s < seg->area_count; s++) {
+ if ((seg_lv(seg, s)->status & LV_REBUILD) ||
+ (seg_metalv(seg, s)->status & LV_REBUILD)) {
+ seg_metalv(seg, s)->status &= ~LV_REBUILD;
+ seg_lv(seg, s)->status &= ~LV_REBUILD;
+ rebuild_flag_cleared = 1;
+ }
+ }
+ if (rebuild_flag_cleared &&
+ (!vg_write(lv->vg) || !vg_commit(lv->vg))) {
+ log_error("Failed to clear REBUILD flag for %s/%s components",
+ lv->vg->name, lv->name);
+ return 0;
+ }
+
return 1;
fail:
@@ -1335,8 +1357,8 @@
log_debug("Adding %s to %s", lvl->lv->name, lv->name);
/* Images are known to be in-sync */
- lvl->lv->status &= ~LV_NOTSYNCED;
- first_seg(lvl->lv)->status &= ~LV_NOTSYNCED;
+ lvl->lv->status &= ~LV_REBUILD;
+ first_seg(lvl->lv)->status &= ~LV_REBUILD;
lv_set_hidden(lvl->lv);
if (!set_lv_segment_area_lv(seg, s, lvl->lv, 0,
@@ -1428,3 +1450,216 @@
seg->segtype->name, new_segtype->name);
return 0;
}
+
+/*
+ * lv_raid_replace
+ * @lv
+ * @replace_pvs
+ * @allocatable_pvs
+ *
+ * Replace the specified PVs.
+ */
+int lv_raid_replace(struct logical_volume *lv,
+ struct dm_list *remove_pvs,
+ struct dm_list *allocate_pvs)
+{
+ uint32_t s, sd, match_count = 0;
+ struct dm_list old_meta_lvs, old_data_lvs;
+ struct dm_list new_meta_lvs, new_data_lvs;
+ struct lv_segment *raid_seg = first_seg(lv);
+ struct lv_list *lvl;
+ char *tmp_names[raid_seg->area_count * 2];
+
+ dm_list_init(&old_meta_lvs);
+ dm_list_init(&old_data_lvs);
+ dm_list_init(&new_meta_lvs);
+ dm_list_init(&new_data_lvs);
+
+ /*
+ * How many sub-LVs are being removed?
+ */
+ for (s = 0; s < raid_seg->area_count; s++) {
+ if ((seg_type(raid_seg, s) == AREA_UNASSIGNED) ||
+ (seg_metatype(raid_seg, s) == AREA_UNASSIGNED)) {
+ log_error("Unable to replace RAID images while the "
+ "array has unassigned areas");
+ return 0;
+ }
+
+ if (_lv_is_on_pvs(seg_lv(raid_seg, s), remove_pvs) ||
+ _lv_is_on_pvs(seg_metalv(raid_seg, s), remove_pvs))
+ match_count++;
+ }
+
+ if (!match_count) {
+ log_verbose("%s/%s does not contain devices specified"
+ " for replacement", lv->vg->name, lv->name);
+ return 1;
+ } else if (match_count == raid_seg->area_count) {
+ log_error("Unable to remove all PVs from %s/%s at once.",
+ lv->vg->name, lv->name);
+ return 0;
+ } else if (raid_seg->segtype->parity_devs &&
+ (match_count > raid_seg->segtype->parity_devs)) {
+ log_error("Unable to replace more than %u PVs from (%s) %s/%s",
+ raid_seg->segtype->parity_devs,
+ raid_seg->segtype->name, lv->vg->name, lv->name);
+ return 0;
+ }
+
+ /*
+ * Allocate the new image components first
+ * - This makes it easy to avoid all currently used devs
+ * - We can immediately tell if there is enough space
+ *
+ * - We need to change the LV names when we insert them.
+ */
+ if (!_alloc_image_components(lv, allocate_pvs, match_count,
+ &new_meta_lvs, &new_data_lvs)) {
+ log_error("Failed to allocate replacement images for %s/%s",
+ lv->vg->name, lv->name);
+ return 0;
+ }
+
+ /*
+ * Remove the old images
+ * - If we did this before the allocate, we wouldn't have to rename
+ * the allocated images, but it'd be much harder to avoid the right
+ * PVs during allocation.
+ */
+ if (!_raid_extract_images(lv, raid_seg->area_count - match_count,
+ remove_pvs, 0,
+ &old_meta_lvs, &old_data_lvs)) {
+ log_error("Failed to remove the specified images from %s/%s",
+ lv->vg->name, lv->name);
+ return 0;
+ }
+
+ /*
+ * Skip metadata operation normally done to clear the metadata sub-LVs.
+ *
+ * The LV_REBUILD flag is set on the new sub-LVs,
+ * so they will be rebuilt and we don't need to clear the metadata dev.
+ */
+
+ for (s = 0; s < raid_seg->area_count; s++) {
+ tmp_names[s] = NULL;
+ sd = s + raid_seg->area_count;
+ tmp_names[sd] = NULL;
+
+ if ((seg_type(raid_seg, s) == AREA_UNASSIGNED) &&
+ (seg_metatype(raid_seg, s) == AREA_UNASSIGNED)) {
+ /* Adjust the new metadata LV name */
+ lvl = dm_list_item(dm_list_first(&new_meta_lvs),
+ struct lv_list);
+ dm_list_del(&lvl->list);
+ tmp_names[s] = dm_pool_alloc(lv->vg->vgmem,
+ strlen(lvl->lv->name) + 1);
+ if (!tmp_names[s])
+ return_0;
+ if (dm_snprintf(tmp_names[s], strlen(lvl->lv->name) + 1,
+ "%s_rmeta_%u", lv->name, s) < 0)
+ return_0;
+ if (!set_lv_segment_area_lv(raid_seg, s, lvl->lv, 0,
+ lvl->lv->status)) {
+ log_error("Failed to add %s to %s",
+ lvl->lv->name, lv->name);
+ return 0;
+ }
+ lv_set_hidden(lvl->lv);
+
+ /* Adjust the new data LV name */
+ lvl = dm_list_item(dm_list_first(&new_data_lvs),
+ struct lv_list);
+ dm_list_del(&lvl->list);
+ tmp_names[sd] = dm_pool_alloc(lv->vg->vgmem,
+ strlen(lvl->lv->name) + 1);
+ if (!tmp_names[sd])
+ return_0;
+ if (dm_snprintf(tmp_names[sd], strlen(lvl->lv->name) + 1,
+ "%s_rimage_%u", lv->name, s) < 0)
+ return_0;
+ if (!set_lv_segment_area_lv(raid_seg, s, lvl->lv, 0,
+ lvl->lv->status)) {
+ log_error("Failed to add %s to %s",
+ lvl->lv->name, lv->name);
+ return 0;
+ }
+ lv_set_hidden(lvl->lv);
+ }
+ }
+
+ if (!vg_write(lv->vg)) {
+ log_error("Failed to write changes to %s in %s",
+ lv->name, lv->vg->name);
+ return 0;
+ }
+
+ if (!suspend_lv(lv->vg->cmd, lv)) {
+ log_error("Failed to suspend %s/%s before committing changes",
+ lv->vg->name, lv->name);
+ return 0;
+ }
+
+ if (!vg_commit(lv->vg)) {
+ log_error("Failed to commit changes to %s in %s",
+ lv->name, lv->vg->name);
+ return 0;
+ }
+
+ if (!resume_lv(lv->vg->cmd, lv)) {
+ log_error("Failed to resume %s/%s after committing changes",
+ lv->vg->name, lv->name);
+ return 0;
+ }
+
+ dm_list_iterate_items(lvl, &old_meta_lvs) {
+ if (!deactivate_lv(lv->vg->cmd, lvl->lv))
+ return_0;
+ if (!lv_remove(lvl->lv))
+ return_0;
+ }
+ dm_list_iterate_items(lvl, &old_data_lvs) {
+ if (!deactivate_lv(lv->vg->cmd, lvl->lv))
+ return_0;
+ if (!lv_remove(lvl->lv))
+ return_0;
+ }
+
+ /* Update new sub-LVs to correct name and clear REBUILD flag */
+ for (s = 0; s < raid_seg->area_count; s++) {
+ sd = s + raid_seg->area_count;
+ if (tmp_names[s] && tmp_names[sd]) {
+ seg_metalv(raid_seg, s)->name = tmp_names[s];
+ seg_lv(raid_seg, s)->name = tmp_names[sd];
+ seg_metalv(raid_seg, s)->status &= ~LV_REBUILD;
+ seg_lv(raid_seg, s)->status &= ~LV_REBUILD;
+ }
+ }
+
+ if (!vg_write(lv->vg)) {
+ log_error("Failed to write changes to %s in %s",
+ lv->name, lv->vg->name);
+ return 0;
+ }
+
+ if (!suspend_lv(lv->vg->cmd, lv)) {
+ log_error("Failed to suspend %s/%s before committing changes",
+ lv->vg->name, lv->name);
+ return 0;
+ }
+
+ if (!vg_commit(lv->vg)) {
+ log_error("Failed to commit changes to %s in %s",
+ lv->name, lv->vg->name);
+ return 0;
+ }
+
+ if (!resume_lv(lv->vg->cmd, lv)) {
+ log_error("Failed to resume %s/%s after committing changes",
+ lv->vg->name, lv->name);
+ return 0;
+ }
+
+ return 1;
+}
--- LVM2/lib/raid/raid.c 2011/09/24 21:19:30 1.12
+++ LVM2/lib/raid/raid.c 2011/11/30 02:02:11 1.13
@@ -183,7 +183,7 @@
}
for (s = 0; s < seg->area_count; s++)
- if (seg_lv(seg, s)->status & LV_NOTSYNCED)
+ if (seg_lv(seg, s)->status & LV_REBUILD)
rebuilds |= 1 << s;
if (!dm_tree_node_add_raid_target(node, len, _raid_name(seg),
--- LVM2/libdm/ioctl/libdm-iface.c 2011/11/18 19:34:03 1.129
+++ LVM2/libdm/ioctl/libdm-iface.c 2011/11/30 02:02:12 1.130
@@ -1653,10 +1653,10 @@
_cmd_data_v4[dmt->type].name,
strerror(errno));
else
- log_error("device-mapper: %s ioctl "
+ log_error("device-mapper: %s ioctl on %s "
"failed: %s",
_cmd_data_v4[dmt->type].name,
- strerror(errno));
+ dmi->name, strerror(errno));
/*
* It's sometimes worth retrying after EBUSY in case
--- LVM2/man/lvconvert.8.in 2011/10/25 13:24:23 1.23
+++ LVM2/man/lvconvert.8.in 2011/11/30 02:02:12 1.24
@@ -52,6 +52,14 @@
[\-\-version]
LogicalVolume[Path] [PhysicalVolume[Path]...]
+.br
+.B lvconvert
+\-\-replace PhysicalVolume
+[\-h|\-?|\-\-help]
+[\-v|\-\-verbose]
+[\-\-version]
+LogicalVolume[Path] [PhysicalVolume[Path]...]
+
.SH DESCRIPTION
lvconvert is used to change the segment type (i.e. linear, mirror, etc) or
characteristics of a logical volume. For example, it can add or remove the
@@ -181,6 +189,14 @@
viz. activation/mirror_log_fault_policy or
activation/mirror_device_fault_policy.
.br
+
+.TP
+.I \-\-replace PhysicalVolume
+Remove the specified device (PhysicalVolume) and replace it with one that is
+available in the volume group or from the specific list provided. This option
+is only available to RAID segment types (e.g. "raid1", "raid5", etc).
+.br
+
.SH Examples
"lvconvert -m1 vg00/lvol1"
.br
@@ -270,6 +286,14 @@
the '\-\-trackchanges' argument back into its original mirror and
bring its contents back up-to-date.
+.br
+"lvconvert --replace /dev/sdb1 vg00/my_raid1 /dev/sdf1"
+.br
+Replace the physical volume "/dev/sdb1" in the RAID1 logical volume "my_raid1"
+with the specified physical volume "/dev/sdf1". Had the argument "/dev/sdf1"
+been left out, lvconvert would attempt to find a suitable device from those
+available in the volume group.
+
.SH SEE ALSO
.BR lvm (8),
.BR vgcreate (8),
--- LVM2/tools/args.h 2011/11/04 22:43:11 1.85
+++ LVM2/tools/args.h 2011/11/30 02:02:12 1.86
@@ -55,6 +55,7 @@
arg(mirrorlog_ARG, '\0', "mirrorlog", string_arg, 0)
arg(splitmirrors_ARG, '\0', "splitmirrors", int_arg, 0)
arg(trackchanges_ARG, '\0', "trackchanges", NULL, 0)
+arg(replace_ARG, '\0', "replace", string_arg, ARG_GROUPABLE)
arg(repair_ARG, '\0', "repair", NULL, 0)
arg(use_policies_ARG, '\0', "use-policies", NULL, 0)
arg(monitor_ARG, '\0', "monitor", yes_no_arg, 0)
--- LVM2/tools/commands.h 2011/11/04 22:43:11 1.166
+++ LVM2/tools/commands.h 2011/11/30 02:02:12 1.167
@@ -100,6 +100,7 @@
"[-m|--mirrors Mirrors [{--mirrorlog {disk|core|mirrored}|--corelog}]]\n"
"\t[--type SegmentType]\n"
"\t[--repair [--use-policies]]\n"
+ "\t[--replace PhysicalVolume]\n"
"\t[-R|--regionsize MirrorLogRegionSize]\n"
"\t[--alloc AllocationPolicy]\n"
"\t[-b|--background]\n"
@@ -141,8 +142,8 @@
alloc_ARG, background_ARG, chunksize_ARG, corelog_ARG, interval_ARG,
merge_ARG, mirrorlog_ARG, mirrors_ARG, name_ARG, noudevsync_ARG,
- regionsize_ARG, repair_ARG, snapshot_ARG, splitmirrors_ARG, trackchanges_ARG,
- type_ARG, stripes_long_ARG, stripesize_ARG, test_ARG,
+ regionsize_ARG, repair_ARG, replace_ARG, snapshot_ARG, splitmirrors_ARG,
+ trackchanges_ARG, type_ARG, stripes_long_ARG, stripesize_ARG, test_ARG,
use_policies_ARG, yes_ARG, force_ARG, zero_ARG)
xx(lvcreate,
--- LVM2/tools/lvconvert.c 2011/10/07 14:56:01 1.174
+++ LVM2/tools/lvconvert.c 2011/11/30 02:02:12 1.175
@@ -48,6 +48,10 @@
char **pvs;
struct dm_list *pvh;
+ int replace_pv_count;
+ char **replace_pvs;
+ struct dm_list *replace_pvh;
+
struct logical_volume *lv_to_poll;
};
@@ -122,6 +126,9 @@
static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd,
int argc, char **argv)
{
+ int i;
+ const char *tmp_str;
+ struct arg_value_group_list *group;
int region_size;
int pagesize = lvm_getpagesize();
@@ -243,7 +250,27 @@
SEG_CANNOT_BE_ZEROED) ?
"n" : "y"), "n");
- } else { /* Mirrors */
+ } else if (arg_count(cmd, replace_ARG)) { /* RAID device replacement */
+ lp->replace_pv_count = arg_count(cmd, replace_ARG);
+ lp->replace_pvs = dm_pool_alloc(cmd->mem, sizeof(char *) * lp->replace_pv_count);
+ if (!lp->replace_pvs)
+ return_0;
+
+ i = 0;
+ dm_list_iterate_items(group, &cmd->arg_value_groups) {
+ if (!grouped_arg_is_set(group->arg_values, replace_ARG))
+ continue;
+ if (!(tmp_str = grouped_arg_str_value(group->arg_values,
+ replace_ARG,
+ NULL))) {
+ log_error("Failed to get '--replace' argument");
+ return 0;
+ }
+ if (!(lp->replace_pvs[i++] = dm_pool_strdup(cmd->mem,
+ tmp_str)))
+ return_0;
+ }
+ } else { /* Mirrors (and some RAID functions) */
if (arg_count(cmd, chunksize_ARG)) {
log_error("--chunksize is only available with "
"snapshots");
@@ -309,7 +336,7 @@
return_0;
}
- if (activation() && lp->segtype->ops->target_present &&
+ if (activation() && lp->segtype && lp->segtype->ops->target_present &&
!lp->segtype->ops->target_present(cmd, NULL, NULL)) {
log_error("%s: Required device-mapper target(s) not "
"detected in your kernel", lp->segtype->name);
@@ -1455,6 +1482,9 @@
if (arg_count(cmd, type_ARG))
return lv_raid_reshape(lv, lp->segtype);
+ if (arg_count(cmd, replace_ARG))
+ return lv_raid_replace(lv, lp->replace_pvh, lp->pvh);
+
log_error("Conversion operation not yet supported.");
return 0;
}
@@ -1646,6 +1676,9 @@
return ECMD_FAILED;
}
+ if (!lp->segtype)
+ lp->segtype = first_seg(lv)->segtype;
+
if (lp->merge) {
if (!lv_is_cow(lv)) {
log_error("Logical volume \"%s\" is not a snapshot",
@@ -1785,6 +1818,12 @@
} else
lp->pvh = &lv->vg->pvs;
+ if (lp->replace_pv_count &&
+ !(lp->replace_pvh = create_pv_list(cmd->mem, lv->vg,
+ lp->replace_pv_count,
+ lp->replace_pvs, 0)))
+ goto_bad;
+
lp->lv_to_poll = lv;
ret = _lvconvert_single(cmd, lv, lp);
bad:
^ permalink raw reply [flat|nested] 3+ messages in thread
* LVM2 ./WHATS_NEW lib/format_text/flags.c lib/m ...
@ 2009-04-25 1:18 agk
0 siblings, 0 replies; 3+ messages in thread
From: agk @ 2009-04-25 1:18 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2009-04-25 01:18:00
Modified files:
. : WHATS_NEW
lib/format_text: flags.c
lib/metadata : metadata-exported.h metadata.h snapshot_manip.c
lib/report : columns.h report.c
man : lvcreate.8.in lvs.8.in
tools : args.h commands.h lvchange.c lvcreate.c
lvremove.c toollib.c
Log message:
Add sparse devices: lvcreate -s --virtualoriginsize (hidden zero origin).
Add lvs origin_size field.
Fix linux configure --enable-debug to exclude -O2.
Still a few rough edges, but hopefully usable now:
lvcreate -s vg1 -L 100M --virtualoriginsize 1T
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1095&r2=1.1096
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/flags.c.diff?cvsroot=lvm2&r1=1.35&r2=1.36
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata-exported.h.diff?cvsroot=lvm2&r1=1.64&r2=1.65
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.h.diff?cvsroot=lvm2&r1=1.191&r2=1.192
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/snapshot_manip.c.diff?cvsroot=lvm2&r1=1.34&r2=1.35
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/columns.h.diff?cvsroot=lvm2&r1=1.33&r2=1.34
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/report/report.c.diff?cvsroot=lvm2&r1=1.96&r2=1.97
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/man/lvcreate.8.in.diff?cvsroot=lvm2&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/man/lvs.8.in.diff?cvsroot=lvm2&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/args.h.diff?cvsroot=lvm2&r1=1.62&r2=1.63
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/commands.h.diff?cvsroot=lvm2&r1=1.124&r2=1.125
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvchange.c.diff?cvsroot=lvm2&r1=1.98&r2=1.99
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvcreate.c.diff?cvsroot=lvm2&r1=1.182&r2=1.183
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvremove.c.diff?cvsroot=lvm2&r1=1.56&r2=1.57
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/toollib.c.diff?cvsroot=lvm2&r1=1.151&r2=1.152
--- LVM2/WHATS_NEW 2009/04/23 16:56:22 1.1095
+++ LVM2/WHATS_NEW 2009/04/25 01:17:59 1.1096
@@ -1,5 +1,8 @@
Version 2.02.46 -
================================
+ Add sparse devices: lvcreate -s --virtualoriginsize (hidden zero origin).
+ Add lvs origin_size field.
+ Fix linux configure --enable-debug to exclude -O2.
Implement lvconvert --repair, for repairing partially failed mirrors.
Fix vgreduce --removemissing failure exit code.
Fix remote metadata backup for clvmd.
--- LVM2/lib/format_text/flags.c 2008/09/19 06:41:58 1.35
+++ LVM2/lib/format_text/flags.c 2009/04/25 01:17:59 1.36
@@ -65,6 +65,7 @@
{CONVERTING, NULL, 0},
{PARTIAL_LV, NULL, 0},
{POSTORDER_FLAG, NULL, 0},
+ {VIRTUAL_ORIGIN, NULL, 0},
{0, NULL, 0}
};
--- LVM2/lib/metadata/metadata-exported.h 2009/04/10 09:59:19 1.64
+++ LVM2/lib/metadata/metadata-exported.h 2009/04/25 01:17:59 1.65
@@ -77,6 +77,7 @@
//#define POSTORDER_FLAG 0x02000000U /* Not real flags, reserved for
//#define POSTORDER_OPEN_FLAG 0x04000000U temporary use inside vg_read_internal. */
+//#define VIRTUAL_ORIGIN 0x08000000U /* LV - internal use only */
#define LVM_READ 0x00000100U /* LV VG */
#define LVM_WRITE 0x00000200U /* LV VG */
@@ -531,6 +532,7 @@
* Useful functions for managing snapshots.
*/
int lv_is_origin(const struct logical_volume *lv);
+int lv_is_virtual_origin(const struct logical_volume *lv);
int lv_is_cow(const struct logical_volume *lv);
int lv_is_visible(const struct logical_volume *lv);
--- LVM2/lib/metadata/metadata.h 2009/04/10 09:59:19 1.191
+++ LVM2/lib/metadata/metadata.h 2009/04/25 01:18:00 1.192
@@ -81,6 +81,7 @@
#define POSTORDER_FLAG 0x02000000U /* Not real flags, reserved for */
#define POSTORDER_OPEN_FLAG 0x04000000U /* temporary use inside vg_read_internal. */
+#define VIRTUAL_ORIGIN 0x08000000U /* LV - internal use only */
//#define LVM_READ 0x00000100U /* LV VG */
//#define LVM_WRITE 0x00000200U /* LV VG */
--- LVM2/lib/metadata/snapshot_manip.c 2009/03/16 14:34:58 1.34
+++ LVM2/lib/metadata/snapshot_manip.c 2009/04/25 01:18:00 1.35
@@ -44,6 +44,12 @@
return (lv->status & VISIBLE_LV) || lv_is_cow(lv) ? 1 : 0;
}
+int lv_is_virtual_origin(const struct logical_volume *lv)
+{
+ return (lv->status & VIRTUAL_ORIGIN) ? 1 : 0;
+}
+
+
/* Given a cow LV, return the snapshot lv_segment that uses it */
struct lv_segment *find_cow(const struct logical_volume *lv)
{
@@ -105,6 +111,10 @@
cow->status &= ~VISIBLE_LV;
+ /* FIXME Assumes an invisible origin belongs to a sparse device */
+ if (!lv_is_visible(origin))
+ origin->status |= VIRTUAL_ORIGIN;
+
dm_list_add(&origin->snapshot_segs, &seg->origin_list);
return 1;
--- LVM2/lib/report/columns.h 2009/04/23 16:27:58 1.33
+++ LVM2/lib/report/columns.h 2009/04/25 01:18:00 1.34
@@ -53,7 +53,7 @@
*/
/* *INDENT-OFF* */
-FIELD(LVS, lv, STR, "LV UUID", lvid.id[1], 38, uuid, "lv_uuid", "Unique identifier")
+FIELD(LVS, lv, STR, "LV UUID", lvid.id[1], 38, uuid, "lv_uuid", "Unique identifier.")
FIELD(LVS, lv, STR, "LV", lvid, 4, lvname, "lv_name", "Name. LVs created for internal use are enclosed in brackets.")
FIELD(LVS, lv, STR, "Attr", lvid, 4, lvstatus, "lv_attr", "Various attributes - see man page.")
FIELD(LVS, lv, NUM, "Maj", major, 3, int32, "lv_major", "Persistent major number or -1 if not persistent.")
@@ -64,11 +64,12 @@
FIELD(LVS, lv, NUM, "KRahead", lvid, 7, lvkreadahead, "lv_kernel_read_ahead", "Currently-in-use read ahead setting in current units.")
FIELD(LVS, lv, NUM, "LSize", size, 5, size64, "lv_size", "Size of LV in current units.")
FIELD(LVS, lv, NUM, "#Seg", lvid, 4, lvsegcount, "seg_count", "Number of segments in LV.")
-FIELD(LVS, lv, STR, "Origin", lvid, 6, origin, "origin", "For snapshots, the origin device of this LV")
+FIELD(LVS, lv, STR, "Origin", lvid, 6, origin, "origin", "For snapshots, the origin device of this LV.")
+FIELD(LVS, lv, NUM, "OSize", lvid, 5, originsize, "origin_size", "For snapshots, the size of the origin device of this LV.")
FIELD(LVS, lv, NUM, "Snap%", lvid, 6, snpercent, "snap_percent", "For snapshots, the percentage full if LV is active.")
FIELD(LVS, lv, NUM, "Copy%", lvid, 6, copypercent, "copy_percent", "For mirrors and pvmove, current percentage in-sync.")
-FIELD(LVS, lv, STR, "Move", lvid, 4, movepv, "move_pv", "For pvmove, Source PV of temporary LV created by pvmove")
-FIELD(LVS, lv, STR, "Convert", lvid, 7, convertlv, "convert_lv", "For lvconvert, Name of temporary LV created by lvconvert")
+FIELD(LVS, lv, STR, "Move", lvid, 4, movepv, "move_pv", "For pvmove, Source PV of temporary LV created by pvmove.")
+FIELD(LVS, lv, STR, "Convert", lvid, 7, convertlv, "convert_lv", "For lvconvert, Name of temporary LV created by lvconvert.")
FIELD(LVS, lv, STR, "LV Tags", tags, 7, tags, "lv_tags", "Tags, if any.")
FIELD(LVS, lv, STR, "Log", lvid, 3, loglv, "mirror_log", "For mirrors, the LV holding the synchronisation log.")
FIELD(LVS, lv, STR, "Modules", lvid, 7, modules, "modules", "Kernel device-mapper modules required for this LV.")
@@ -111,7 +112,7 @@
FIELD(VGS, vg, NUM, "VMdaFree", cmd, 9, vgmdafree, "vg_mda_free", "Free metadata area space for this VG in current units.")
FIELD(VGS, vg, NUM, "VMdaSize", cmd, 9, vgmdasize, "vg_mda_size", "Size of smallest metadata area for this VG in current units.")
-FIELD(SEGS, seg, STR, "Type", list, 4, segtype, "segtype", "Type of LV segment")
+FIELD(SEGS, seg, STR, "Type", list, 4, segtype, "segtype", "Type of LV segment.")
FIELD(SEGS, seg, NUM, "#Str", area_count, 4, uint32, "stripes", "Number of stripes or mirror legs.")
FIELD(SEGS, seg, NUM, "Stripe", stripe_size, 6, size32, "stripesize", "For stripes, amount of data placed on one device before switching to the next.")
FIELD(SEGS, seg, NUM, "Stripe", stripe_size, 6, size32, "stripe_size", "For stripes, amount of data placed on one device before switching to the next.")
--- LVM2/lib/report/report.c 2009/02/09 09:45:49 1.96
+++ LVM2/lib/report/report.c 2009/04/25 01:18:00 1.97
@@ -471,20 +471,6 @@
return 1;
}
-static int _origin_disp(struct dm_report *rh, struct dm_pool *mem __attribute((unused)),
- struct dm_report_field *field,
- const void *data, void *private __attribute((unused)))
-{
- const struct logical_volume *lv = (const struct logical_volume *) data;
-
- if (lv_is_cow(lv))
- return dm_report_field_string(rh, field,
- (const char **) &origin_from_cow(lv)->name);
-
- dm_report_field_set_value(field, "", NULL);
- return 1;
-}
-
static int _loglv_disp(struct dm_report *rh, struct dm_pool *mem __attribute((unused)),
struct dm_report_field *field,
const void *data, void *private __attribute((unused)))
@@ -537,6 +523,19 @@
return 1;
}
+static int _origin_disp(struct dm_report *rh, struct dm_pool *mem,
+ struct dm_report_field *field,
+ const void *data, void *private)
+{
+ const struct logical_volume *lv = (const struct logical_volume *) data;
+
+ if (lv_is_cow(lv))
+ return _lvname_disp(rh, mem, field, origin_from_cow(lv), private);
+
+ dm_report_field_set_value(field, "", NULL);
+ return 1;
+}
+
static int _movepv_disp(struct dm_report *rh, struct dm_pool *mem __attribute((unused)),
struct dm_report_field *field,
const void *data, void *private __attribute((unused)))
@@ -723,7 +722,24 @@
if (lv_is_cow(seg->lv))
size = (uint64_t) find_cow(seg->lv)->chunk_size;
else
- size = 0;
+ size = UINT64_C(0);
+
+ return _size64_disp(rh, mem, field, &size, private);
+}
+
+static int _originsize_disp(struct dm_report *rh, struct dm_pool *mem,
+ struct dm_report_field *field,
+ const void *data, void *private)
+{
+ const struct logical_volume *lv = (const struct logical_volume *) data;
+ uint64_t size;
+
+ if (lv_is_cow(lv))
+ size = (uint64_t) find_cow(lv)->len * lv->vg->extent_size;
+ else if (lv_is_origin(lv))
+ size = lv->size;
+ else
+ size = UINT64_C(0);
return _size64_disp(rh, mem, field, &size, private);
}
--- LVM2/man/lvcreate.8.in 2008/11/12 15:01:36 1.3
+++ LVM2/man/lvcreate.8.in 2009/04/25 01:18:00 1.4
@@ -25,7 +25,9 @@
{\-l|\-\-extents LogicalExtentsNumber[%{VG|FREE}] |
\-L|\-\-size LogicalVolumeSize[kKmMgGtT]}
[\-c|\-\-chunksize ChunkSize]
-\-s|\-\-snapshot \-n|\-\-name SnapshotLogicalVolumeName OriginalLogicalVolumePath
+\-n|\-\-name SnapshotLogicalVolumeName
+\-s|\-\-snapshot
+[OriginalLogicalVolumePath | VolumeGroupName \-\-virtualoriginsize VirtualOriginSize]
.SH DESCRIPTION
lvcreate creates a new logical volume in a volume group ( see
.B vgcreate(8), vgchange(8)
@@ -144,6 +146,19 @@
as well. Run
.B lvdisplay(8)
on the snapshot in order to check how much data is allocated to it.
+Note that a small amount of the space you allocate to the snapshot is
+used to track the locations of the chunks of data, so you should
+allocate slightly more space than you actually need and monitor the
+rate at which the snapshot data is growing so you can avoid running out
+of space.
+.TP
+.I \-\-virtualoriginsize VirtualOriginSize
+In conjunction with \-\-snapshot, create a sparse device of the given size
+(in MB by default). Anything written to the device will be returned when
+reading from it. Reading from other areas of the device will return
+blocks of zeros. It is implemented by creating a hidden virtual device of the
+requested size using the zero target. A suffix of _vorigin is used for
+this device.
.TP
.I \-Z, \-\-zero y|n
Controls zeroing of the first KB of data in the new logical volume.
@@ -180,6 +195,11 @@
arbitrary directory in order to access the contents of the filesystem to run
a backup while the original filesystem continues to get updated.
+"lvcreate --virtualoriginsize 1T --size 100M --snapshot --name sparse vg1"
+.br
+creates a sparse device named /dev/vg1/sparse of size 1TB with space for just
+under 100MB of actual data on it.
+
.SH SEE ALSO
.BR lvm (8),
.BR vgcreate (8),
--- LVM2/man/lvs.8.in 2009/01/20 17:39:08 1.6
+++ LVM2/man/lvs.8.in 2009/04/25 01:18:00 1.7
@@ -39,7 +39,7 @@
to the default selection of columns instead of replacing it. Column names are:
lv_uuid, lv_name, lv_attr, lv_major, lv_minor, lv_kernel_major, lv_kernel_minor,
lv_size, seg_count, origin, snap_percent,
-copy_percent, move_pv, lv_tags,
+copy_percent, move_pv, lv_tags, origin_size,
segtype, stripes,
stripesize, chunksize, seg_start, seg_size, seg_tags, devices,
regionsize, mirror_log, modules.
--- LVM2/tools/args.h 2009/04/23 16:56:22 1.62
+++ LVM2/tools/args.h 2009/04/25 01:18:00 1.63
@@ -58,6 +58,7 @@
arg(unquoted_ARG, '\0', "unquoted", NULL, 0)
arg(rows_ARG, '\0', "rows", NULL, 0)
arg(dataalignment_ARG, '\0', "dataalignment", size_kb_arg, 0)
+arg(virtualoriginsize_ARG, '\0', "virtualoriginsize", size_mb_arg, 0)
/* Allow some variations */
arg(resizable_ARG, '\0', "resizable", yes_no_arg, 0)
--- LVM2/tools/commands.h 2009/04/23 16:56:22 1.124
+++ LVM2/tools/commands.h 2009/04/25 01:18:00 1.125
@@ -163,13 +163,15 @@
"\t[-t|--test]\n"
"\t[-v|--verbose]\n"
"\t[--version]\n"
- "\tOriginalLogicalVolume[Path] [PhysicalVolumePath...]\n\n",
+ "\t[OriginalLogicalVolume[Path] |\n"
+ "\t VolumeGroupName[Path] --virtualoriginsize VirtualOriginSize]]\n"
+ "\t[PhysicalVolumePath...]\n\n",
addtag_ARG, alloc_ARG, autobackup_ARG, chunksize_ARG, contiguous_ARG,
corelog_ARG, extents_ARG, major_ARG, minor_ARG, mirrorlog_ARG, mirrors_ARG,
name_ARG, nosync_ARG, permission_ARG, persistent_ARG, readahead_ARG,
regionsize_ARG, size_ARG, snapshot_ARG, stripes_ARG, stripesize_ARG,
- test_ARG, type_ARG, zero_ARG)
+ test_ARG, type_ARG, virtualoriginsize_ARG, zero_ARG)
xx(lvdisplay,
"Display information about a logical volume",
--- LVM2/tools/lvchange.c 2009/04/22 12:46:25 1.98
+++ LVM2/tools/lvchange.c 2009/04/25 01:18:00 1.99
@@ -559,7 +559,8 @@
return ECMD_FAILED;
}
- if (lv_is_cow(lv)) {
+ if (lv_is_cow(lv) && !lv_is_virtual_origin(origin_from_cow(lv)) &&
+ arg_count(cmd, available_ARG)) {
log_error("Can't change snapshot logical volume \"%s\"",
lv->name);
return ECMD_FAILED;
--- LVM2/tools/lvcreate.c 2009/04/21 14:31:58 1.182
+++ LVM2/tools/lvcreate.c 2009/04/25 01:18:00 1.183
@@ -43,6 +43,8 @@
/* size */
uint32_t extents;
uint64_t size;
+ uint32_t voriginextents;
+ uint64_t voriginsize;
percent_t percent;
uint32_t permission;
@@ -64,7 +66,7 @@
if (arg_count(cmd, name_ARG))
lp->lv_name = arg_value(cmd, name_ARG);
- if (lp->snapshot) {
+ if (lp->snapshot && !arg_count(cmd, virtualoriginsize_ARG)) {
if (!argc) {
log_err("Please specify a logical volume to act as "
"the snapshot origin.");
@@ -175,6 +177,20 @@
lp->percent = PERCENT_NONE;
}
+ /* Size returned in kilobyte units; held in sectors */
+ if (arg_count(cmd, virtualoriginsize_ARG)) {
+ if (arg_sign_value(cmd, virtualoriginsize_ARG, 0) == SIGN_MINUS) {
+ log_error("Negative virtual origin size is invalid");
+ return 0;
+ }
+ lp->voriginsize = arg_uint64_value(cmd, virtualoriginsize_ARG,
+ UINT64_C(0));
+ if (!lp->voriginsize) {
+ log_error("Virtual origin size may not be zero");
+ return 0;
+ }
+ }
+
return 1;
}
@@ -390,6 +406,10 @@
log_error("-c is only available with snapshots");
return 0;
}
+ if (arg_count(cmd, virtualoriginsize_ARG)) {
+ log_error("--virtualoriginsize is only available with snapshots");
+ return 0;
+ }
}
if (lp->mirrors > 1) {
@@ -511,12 +531,73 @@
return 1;
}
+static uint64_t _extents_from_size(struct cmd_context *cmd, uint64_t size,
+ uint32_t extent_size)
+{
+ if (size % extent_size) {
+ size += extent_size - size % extent_size;
+ log_print("Rounding up size to full physical extent %s",
+ display_size(cmd, size));
+ }
+
+ if (size > (uint64_t) UINT32_MAX * extent_size) {
+ log_error("Volume too large (%s) for extent size %s. "
+ "Upper limit is %s.",
+ display_size(cmd, size),
+ display_size(cmd, (uint64_t) extent_size),
+ display_size(cmd, (uint64_t) UINT32_MAX *
+ extent_size));
+ return 0;
+ }
+
+ return (uint64_t) size / extent_size;
+}
+
+static struct logical_volume *_create_virtual_origin(struct cmd_context *cmd,
+ struct volume_group *vg,
+ const char *lv_name,
+ uint32_t permission,
+ uint64_t voriginextents)
+{
+ const struct segment_type *segtype;
+ size_t len;
+ char *vorigin_name;
+ struct logical_volume *lv;
+
+ if (!(segtype = get_segtype_from_string(cmd, "zero"))) {
+ log_error("Zero segment type for virtual origin not found");
+ return 0;
+ }
+
+ len = strlen(lv_name) + 32;
+ if (!(vorigin_name = alloca(len)) ||
+ dm_snprintf(vorigin_name, len, "%s_vorigin", lv_name) < 0) {
+ log_error("Virtual origin name allocation failed.");
+ return 0;
+ }
+
+ if (!(lv = lv_create_empty(vorigin_name, NULL, permission,
+ ALLOC_INHERIT, 0, vg)))
+ return_0;
+
+ if (!lv_extend(lv, segtype, 1, 0, 1, voriginextents, NULL, 0u, 0u,
+ NULL, ALLOC_INHERIT))
+ return_0;
+
+ /* store vg on disk(s) */
+ if (!vg_write(vg) || !vg_commit(vg))
+ return_0;
+
+ backup(vg);
+
+ return lv;
+}
+
static int _lvcreate(struct cmd_context *cmd, struct volume_group *vg,
struct lvcreate_params *lp)
{
uint32_t size_rest;
uint32_t status = 0;
- uint64_t tmp_size;
struct logical_volume *lv, *org = NULL;
struct dm_list *pvh;
const char *tag = NULL;
@@ -562,28 +643,14 @@
return 0;
}
- if (lp->size) {
- /* No of 512-byte sectors */
- tmp_size = lp->size;
-
- if (tmp_size % vg->extent_size) {
- tmp_size += vg->extent_size - tmp_size %
- vg->extent_size;
- log_print("Rounding up size to full physical extent %s",
- display_size(cmd, tmp_size));
- }
-
- if (tmp_size > (uint64_t) UINT32_MAX * vg->extent_size) {
- log_error("Volume too large (%s) for extent size %s. "
- "Upper limit is %s.",
- display_size(cmd, tmp_size),
- display_size(cmd, (uint64_t) vg->extent_size),
- display_size(cmd, (uint64_t) UINT32_MAX *
- vg->extent_size));
- return 0;
- }
- lp->extents = (uint64_t) tmp_size / vg->extent_size;
- }
+ if (lp->size &&
+ !(lp->extents = _extents_from_size(cmd, lp->size, vg->extent_size)))
+ return_0;
+
+ if (lp->voriginsize &&
+ !(lp->voriginextents = _extents_from_size(cmd, lp->voriginsize,
+ vg->extent_size)))
+ return_0;
/*
* Create the pv list.
@@ -645,37 +712,49 @@
log_error("Clustered snapshots are not yet supported.");
return 0;
}
- if (!(org = find_lv(vg, lp->origin))) {
- log_err("Couldn't find origin volume '%s'.",
- lp->origin);
- return 0;
- }
- if (lv_is_cow(org)) {
- log_error("Snapshots of snapshots are not supported "
- "yet.");
- return 0;
- }
- if (org->status & LOCKED) {
- log_error("Snapshots of locked devices are not "
- "supported yet");
- return 0;
- }
- if (org->status & MIRROR_IMAGE ||
- org->status & MIRROR_LOG ||
- org->status & MIRRORED) {
- log_error("Snapshots and mirrors may not yet be mixed.");
- return 0;
- }
/* Must zero cow */
status |= LVM_WRITE;
- if (!lv_info(cmd, org, &info, 0, 0)) {
- log_error("Check for existence of snapshot origin "
- "'%s' failed.", org->name);
- return 0;
+ if (arg_count(cmd, virtualoriginsize_ARG))
+ origin_active = 1;
+ else {
+
+ if (!(org = find_lv(vg, lp->origin))) {
+ log_error("Couldn't find origin volume '%s'.",
+ lp->origin);
+ return 0;
+ }
+ if (lv_is_virtual_origin(lv)) {
+ log_error("Can't share virtual origins. "
+ "Use --virtualoriginsize.");
+ return 0;
+ }
+ if (lv_is_cow(org)) {
+ log_error("Snapshots of snapshots are not "
+ "supported yet.");
+ return 0;
+ }
+ if (org->status & LOCKED) {
+ log_error("Snapshots of locked devices are not "
+ "supported yet");
+ return 0;
+ }
+ if (org->status & MIRROR_IMAGE ||
+ org->status & MIRROR_LOG ||
+ org->status & MIRRORED) {
+ log_error("Snapshots and mirrors may not yet "
+ "be mixed.");
+ return 0;
+ }
+
+ if (!lv_info(cmd, org, &info, 0, 0)) {
+ log_error("Check for existence of snapshot "
+ "origin '%s' failed.", org->name);
+ return 0;
+ }
+ origin_active = info.exists;
}
- origin_active = info.exists;
}
if (!lp->extents) {
@@ -828,6 +907,15 @@
return 0;
}
+ if (lp->voriginsize &&
+ !(org = _create_virtual_origin(cmd, vg, lv->name,
+ lp->permission,
+ lp->voriginextents))) {
+ log_error("Couldn't create virtual origin for LV %s",
+ lv->name);
+ goto deactivate_and_revert_new_lv;
+ }
+
/* cow LV remains active and becomes snapshot LV */
if (!vg_add_snapshot(NULL, org, lv, NULL,
--- LVM2/tools/lvremove.c 2008/11/17 18:20:14 1.56
+++ LVM2/tools/lvremove.c 2009/04/25 01:18:00 1.57
@@ -18,6 +18,14 @@
static int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv,
void *handle __attribute((unused)))
{
+ struct logical_volume *origin;
+
+ /*
+ * If this is a sparse device, remove its origin too.
+ */
+ if (lv_is_cow(lv) && lv_is_virtual_origin(origin = origin_from_cow(lv)))
+ lv = origin;
+
if (!lv_remove_with_dependencies(cmd, lv, arg_count(cmd, force_ARG)))
return ECMD_FAILED;
--- LVM2/tools/toollib.c 2009/04/23 16:45:30 1.151
+++ LVM2/tools/toollib.c 2009/04/25 01:18:00 1.152
@@ -1229,6 +1229,12 @@
return 0;
}
+ if (strstr(name, "_vorigin")) {
+ log_error("Names including \"_vorigin\" are reserved. "
+ "Please choose a different LV name.");
+ return 0;
+ }
+
return 1;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* LVM2 ./WHATS_NEW lib/format_text/flags.c lib/m ...
@ 2006-05-11 20:03 agk
0 siblings, 0 replies; 3+ messages in thread
From: agk @ 2006-05-11 20:03 UTC (permalink / raw)
To: lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2006-05-11 20:03:40
Modified files:
. : WHATS_NEW
lib/format_text: flags.c
lib/metadata : metadata.h
tools : commands.h lvconvert.c lvcreate.c lvmcmdline.c
Log message:
Add --nosync to lvcreate with LV flag NOTSYNCED.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.385&r2=1.386
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/flags.c.diff?cvsroot=lvm2&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.h.diff?cvsroot=lvm2&r1=1.145&r2=1.146
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/commands.h.diff?cvsroot=lvm2&r1=1.82&r2=1.83
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvconvert.c.diff?cvsroot=lvm2&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvcreate.c.diff?cvsroot=lvm2&r1=1.118&r2=1.119
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvmcmdline.c.diff?cvsroot=lvm2&r1=1.29&r2=1.30
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-30 2:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-30 2:02 LVM2 ./WHATS_NEW lib/format_text/flags.c lib/m jbrassow
-- strict thread matches above, loose matches on Subject: below --
2009-04-25 1:18 agk
2006-05-11 20:03 agk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).