28 Feb '17
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7a064303fe1a14e205a50…
Commit: 7a064303fe1a14e205a50abc5a54e38467fcb455
Parent: 964114950ce3ce0539a47b966494868285679ef8
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Tue Feb 28 23:29:03 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Tue Feb 28 23:29:03 2017 +0100
lvconvert: add missing reshape_len initialization
An initialization was missing when converting striped to raid0(_meta)
causing unitialized reshape_len in the new component LVs first segment.
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index b8447a0..6cc1c12 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -4166,6 +4166,10 @@ static struct lv_segment *_convert_striped_to_raid0(struct logical_volume *lv,
if (alloc_metadata_devs && !_raid0_add_or_remove_metadata_lvs(lv, 0, allocate_pvs, NULL))
return NULL;
+ /* Initialize reshape len properly after adding the image component list */
+ if (!_lv_set_reshape_len(lv, 0))
+ return_0;
+
if (update_and_reload && !lv_update_and_reload(lv))
return NULL;
1
0
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=964114950ce3ce0539a47…
Commit: 964114950ce3ce0539a47b966494868285679ef8
Parent: 1828822bd8ad773d57d90841cb4036b49f3653b1
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Tue Feb 28 23:09:30 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Tue Feb 28 23:10:37 2017 +0100
lvconvert: adjust mininum region size check
The imposed minimum region size can cause rejection on
disk removing reshapes. Lower it to avoid that.
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 34e8856..b8447a0 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -106,7 +106,7 @@ static int _check_region_size_constraints(struct logical_volume *lv,
return 0;
}
- if (region_size * 8 > lv->size) {
+ if (region_size > lv->size) {
log_error("Regionsize too large for %s LV %s.",
segtype->name, display_lvname(lv));
return 0;
1
0
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1828822bd8ad773d57d90…
Commit: 1828822bd8ad773d57d90841cb4036b49f3653b1
Parent: ce1e5b99915cf45530e25628f02537136045c938
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 28 15:57:30 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 28 15:58:14 2017 -0600
help: print full usage for lvm help all
---
tools/lvmcmdline.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 9b20d9f..d440987 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1732,7 +1732,7 @@ static void _usage_all(void)
for (i = 0; i < MAX_COMMAND_NAMES; i++) {
if (!command_names[i].name)
break;
- _usage(command_names[i].name, 0);
+ _usage(command_names[i].name, 1);
}
}
1
0
28 Feb '17
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ce1e5b99915cf45530e25…
Commit: ce1e5b99915cf45530e25628f02537136045c938
Parent: 80a6de616a19e1be2e4125878ee904e5a1eeedf9
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Tue Feb 28 22:46:25 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Tue Feb 28 22:46:25 2017 +0100
lvconvert: adjust reshaping check to target version
https://git.kernel.org/cgit/linux/kernel/git/device-mapper/linux-dm.git/com…
sets the dm-raid target version to 1.10.1.
Adjust the condition to set RAID_RESHAPE_FEATURE to it.
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/segtype.h | 2 +-
lib/raid/raid.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h
index bea7141..a7a3857 100644
--- a/lib/metadata/segtype.h
+++ b/lib/metadata/segtype.h
@@ -286,7 +286,7 @@ struct segment_type *init_unknown_segtype(struct cmd_context *cmd,
#define RAID_FEATURE_RAID0 (1U << 1) /* version 1.7 */
#define RAID_FEATURE_RESHAPING (1U << 2) /* version 1.8 */
#define RAID_FEATURE_RAID4 (1U << 3) /* ! version 1.8 or 1.9.0 */
-#define RAID_FEATURE_RESHAPE (1U << 4) /* version 1.10.2 */
+#define RAID_FEATURE_RESHAPE (1U << 4) /* version 1.10.1 */
#ifdef RAID_INTERNAL
int init_raid_segtypes(struct cmd_context *cmd, struct segtype_library *seglib);
diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index 9ab2e6c..6815454 100644
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -496,7 +496,7 @@ static int _raid_target_present(struct cmd_context *cmd,
SEG_TYPE_NAME_RAID4);
if (maj > 1 ||
- (maj == 1 && (min > 10 || (min == 10 && patchlevel >= 2))))
+ (maj == 1 && (min > 10 || (min == 10 && patchlevel >= 1))))
_raid_attrs |= RAID_FEATURE_RESHAPE;
}
1
0
28 Feb '17
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=80a6de616a19e1be2e412…
Commit: 80a6de616a19e1be2e4125878ee904e5a1eeedf9
Parent: 21456dcf7fc062518202f133ad27594eda4278fb
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Tue Feb 28 22:34:00 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Tue Feb 28 22:34:00 2017 +0100
lvconvert: libdm RAID API compatibility versioning
Commit 27384c52cf6a lowered the maximum number of devices
back to 64 for compatibility.
Because more members have been added to the API in
'struct dm_tree_node_raid_params *', we have to version
the public libdm RAID API to not break any existing users.
Changes:
- keep the previous 'struct dm_tree_node_raid_params' and
dm_tree_node_add_raid_target_with_params()/dm_tree_node_add_raid_target()
in order to expose the already released public RAID API
- introduce 'struct dm_tree_node_raid_params_v2' and additional functions
dm_tree_node_add_raid_target_with_params_v2()/dm_tree_node_add_raid_target_v2()
to be used by the new lvm2 lib reshape extentions
With this new API, the bitfields for rebuild/writemostly legs in
'struct dm_tree_node_raid_params_v2' can be raised to 256 bits
again (253 legs maximum supported in MD kernel).
Mind that we can limit the maximum usable number via the
DEFAULT_RAID{1}_MAX_IMAGES definition in defaults.h.
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/raid/raid.c | 4 +-
libdm/.exported_symbols.DM_1_02_138 | 2 +
libdm/libdevmapper.h | 63 +++++++++++++++++++++++++-----
libdm/libdm-deptree.c | 73 +++++++++++++++++++++++++++++++---
4 files changed, 123 insertions(+), 19 deletions(-)
diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index 59db437..9ab2e6c 100644
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -242,7 +242,7 @@ static int _raid_add_target_line(struct dev_manager *dm __attribute__((unused)),
uint64_t flags = 0;
uint64_t rebuilds[RAID_BITMAP_SIZE];
uint64_t writemostly[RAID_BITMAP_SIZE];
- struct dm_tree_node_raid_params params;
+ struct dm_tree_node_raid_params_v2 params;
memset(¶ms, 0, sizeof(params));
memset(&rebuilds, 0, sizeof(rebuilds));
@@ -333,7 +333,7 @@ static int _raid_add_target_line(struct dev_manager *dm __attribute__((unused)),
params.stripe_size = seg->stripe_size;
params.flags = flags;
- if (!dm_tree_node_add_raid_target_with_params(node, len, ¶ms))
+ if (!dm_tree_node_add_raid_target_with_params_v2(node, len, ¶ms))
return_0;
return add_areas_line(dm, seg, node, 0u, seg->area_count);
diff --git a/libdm/.exported_symbols.DM_1_02_138 b/libdm/.exported_symbols.DM_1_02_138
index 3ebc59d..43e4111 100644
--- a/libdm/.exported_symbols.DM_1_02_138
+++ b/libdm/.exported_symbols.DM_1_02_138
@@ -3,3 +3,5 @@ dm_bit_get_prev
dm_stats_update_regions_from_fd
dm_bitset_parse_list
dm_stats_bind_from_fd
+dm_tree_node_add_raid_target_v2
+dm_tree_node_add_raid_target_with_params_v2
diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 7136261..b515f6d 100644
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
* Copyright (C) 2006 Rackable Systems All rights reserved.
*
* This file is part of the device-mapper userspace tools.
@@ -1720,9 +1720,18 @@ int dm_tree_node_add_raid_target(struct dm_tree_node *node,
const char *raid_type,
uint32_t region_size,
uint32_t stripe_size,
- uint64_t *rebuilds,
+ uint64_t rebuilds,
uint64_t flags);
+/* Version 2 coping with 253 (MD kernel limitation) devices */
+int dm_tree_node_add_raid_target_v2(struct dm_tree_node *node,
+ uint64_t size,
+ const char *raid_type,
+ uint32_t region_size,
+ uint32_t stripe_size,
+ uint64_t *rebuilds,
+ uint64_t flags);
+
/*
* Defines below are based on kernel's dm-cache.c defines
* DM_CACHE_MIN_DATA_BLOCK_SIZE (32 * 1024 >> SECTOR_SHIFT)
@@ -1742,13 +1751,7 @@ int dm_tree_node_add_raid_target(struct dm_tree_node *node,
/*
* Define number of elements in rebuild and writemostly arrays
* 'of struct dm_tree_node_raid_params'.
- *
- * Set to one to keep the current libdm API!
- *
- * If we ever raise the maximum number of RAID devices past 64 thus
- * changing the API, we have to version it for backwards API compatibility.
*/
-#define RAID_BITMAP_SIZE 1
struct dm_tree_node_raid_params {
const char *raid_type;
@@ -1758,6 +1761,42 @@ struct dm_tree_node_raid_params {
uint32_t region_size;
uint32_t stripe_size;
+ /*
+ * 'rebuilds' and 'writemostly' are bitfields that signify
+ * which devices in the array are to be rebuilt or marked
+ * writemostly. The kernel supports up to 253 legs.
+ * We limit ourselves by choosing a lower value
+ * for DEFAULT_RAID{1}_MAX_IMAGES in defaults.h.
+ */
+ uint64_t rebuilds;
+ uint64_t writemostly;
+ uint32_t writebehind; /* I/Os (kernel default COUNTER_MAX / 2) */
+ uint32_t sync_daemon_sleep; /* ms (kernel default = 5sec) */
+ uint32_t max_recovery_rate; /* kB/sec/disk */
+ uint32_t min_recovery_rate; /* kB/sec/disk */
+ uint32_t stripe_cache; /* sectors */
+
+ uint64_t flags; /* [no]sync */
+ uint32_t reserved2;
+};
+
+/*
+ * Version 2 of above node raid params struct to keeep API compatibility.
+ *
+ * Extended for more than 64 legs (max 253 in the MD kernel runtime!),
+ * delta_disks for disk add/remove reshaping,
+ * data_offset for out-of-place reshaping
+ * and data_copies for odd number of raid10 legs.
+ */
+#define RAID_BITMAP_SIZE 4 /* 4 * 64 bit elements in rebuilds/writemostly arrays */
+struct dm_tree_node_raid_params_v2 {
+ const char *raid_type;
+
+ uint32_t stripes;
+ uint32_t mirrors;
+ uint32_t region_size;
+ uint32_t stripe_size;
+
int delta_disks; /* +/- number of disks to add/remove (reshaping) */
int data_offset; /* data offset to set (out-of-place reshaping) */
@@ -1771,20 +1810,24 @@ struct dm_tree_node_raid_params {
uint64_t rebuilds[RAID_BITMAP_SIZE];
uint64_t writemostly[RAID_BITMAP_SIZE];
uint32_t writebehind; /* I/Os (kernel default COUNTER_MAX / 2) */
+ uint32_t data_copies; /* RAID # of data copies */
uint32_t sync_daemon_sleep; /* ms (kernel default = 5sec) */
uint32_t max_recovery_rate; /* kB/sec/disk */
uint32_t min_recovery_rate; /* kB/sec/disk */
- uint32_t data_copies; /* RAID # of data copies */
uint32_t stripe_cache; /* sectors */
uint64_t flags; /* [no]sync */
- uint64_t reserved2;
};
int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node,
uint64_t size,
const struct dm_tree_node_raid_params *p);
+/* Version 2 API function taking dm_tree_node_raid_params_v2 for aforementioned extensions. */
+int dm_tree_node_add_raid_target_with_params_v2(struct dm_tree_node *node,
+ uint64_t size,
+ const struct dm_tree_node_raid_params_v2 *p);
+
/* Cache feature_flags */
#define DM_CACHE_FEATURE_WRITEBACK 0x00000001
#define DM_CACHE_FEATURE_WRITETHROUGH 0x00000002
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index a26cfcc..79117d2 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -3314,14 +3314,13 @@ int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node,
seg->region_size = p->region_size;
seg->stripe_size = p->stripe_size;
seg->area_count = 0;
- seg->delta_disks = p->delta_disks;
- seg->data_offset = p->data_offset;
- memcpy(seg->rebuilds, p->rebuilds, sizeof(seg->rebuilds));
- memcpy(seg->writemostly, p->writemostly, sizeof(seg->writemostly));
+ memset(seg->rebuilds, 0, sizeof(seg->rebuilds));
+ seg->rebuilds[0] = p->rebuilds;
+ memset(seg->writemostly, 0, sizeof(seg->writemostly));
+ seg->writemostly[0] = p->writemostly;
seg->writebehind = p->writebehind;
seg->min_recovery_rate = p->min_recovery_rate;
seg->max_recovery_rate = p->max_recovery_rate;
- seg->data_copies = p->data_copies;
seg->flags = p->flags;
return 1;
@@ -3332,19 +3331,79 @@ int dm_tree_node_add_raid_target(struct dm_tree_node *node,
const char *raid_type,
uint32_t region_size,
uint32_t stripe_size,
- uint64_t *rebuilds,
+ uint64_t rebuilds,
uint64_t flags)
{
struct dm_tree_node_raid_params params = {
.raid_type = raid_type,
.region_size = region_size,
.stripe_size = stripe_size,
+ .rebuilds = rebuilds,
+ .flags = flags
+ };
+
+ return dm_tree_node_add_raid_target_with_params(node, size, ¶ms);
+}
+
+/*
+ * Version 2 of dm_tree_node_add_raid_target() allowing for:
+ *
+ * - maximum 253 legs in a raid set (MD kernel limitation)
+ * - delta_disks for disk add/remove reshaping
+ * - data_offset for out-of-place reshaping
+ * - data_copies to cope witth odd numbers of raid10 disks
+ */
+int dm_tree_node_add_raid_target_with_params_v2(struct dm_tree_node *node,
+ uint64_t size,
+ const struct dm_tree_node_raid_params_v2 *p)
+{
+ unsigned i;
+ struct load_segment *seg = NULL;
+
+ for (i = 0; i < DM_ARRAY_SIZE(_dm_segtypes) && !seg; ++i)
+ if (!strcmp(p->raid_type, _dm_segtypes[i].target))
+ if (!(seg = _add_segment(node,
+ _dm_segtypes[i].type, size)))
+ return_0;
+ if (!seg) {
+ log_error("Unsupported raid type %s.", p->raid_type);
+ return 0;
+ }
+
+ seg->region_size = p->region_size;
+ seg->stripe_size = p->stripe_size;
+ seg->area_count = 0;
+ seg->delta_disks = p->delta_disks;
+ seg->data_offset = p->data_offset;
+ memcpy(seg->rebuilds, p->rebuilds, sizeof(seg->rebuilds));
+ memcpy(seg->writemostly, p->writemostly, sizeof(seg->writemostly));
+ seg->writebehind = p->writebehind;
+ seg->data_copies = p->data_copies;
+ seg->min_recovery_rate = p->min_recovery_rate;
+ seg->max_recovery_rate = p->max_recovery_rate;
+ seg->flags = p->flags;
+
+ return 1;
+}
+
+int dm_tree_node_add_raid_target_v2(struct dm_tree_node *node,
+ uint64_t size,
+ const char *raid_type,
+ uint32_t region_size,
+ uint32_t stripe_size,
+ uint64_t *rebuilds,
+ uint64_t flags)
+{
+ struct dm_tree_node_raid_params_v2 params = {
+ .raid_type = raid_type,
+ .region_size = region_size,
+ .stripe_size = stripe_size,
.flags = flags
};
memcpy(params.rebuilds, rebuilds, sizeof(params.rebuilds));
- return dm_tree_node_add_raid_target_with_params(node, size, ¶ms);
+ return dm_tree_node_add_raid_target_with_params_v2(node, size, ¶ms);
}
int dm_tree_node_add_cache_target(struct dm_tree_node *node,
1
0
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=21456dcf7fc062518202f…
Commit: 21456dcf7fc062518202f133ad27594eda4278fb
Parent: 89661981e829d2cb228e3db6f8127d14526ea025
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 28 13:47:46 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 28 13:47:46 2017 -0600
commands: include lvconvert cache options as group
---
tools/command-lines.in | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 26c2deb..1727bbb 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -310,6 +310,9 @@ OO_LVCONVERT_RAID: --mirrors SNumber, --stripes_long Number,
OO_LVCONVERT_POOL: --poolmetadata LV, --poolmetadatasize SizeMB,
--poolmetadataspare Bool, --readahead Readahead, --chunksize SizeKB
+OO_LVCONVERT_CACHE: --cachemode CacheMode, --cachepolicy String,
+--cachesettings String, --zero Bool
+
OO_LVCONVERT: --alloc Alloc, --background, --force, --noudevsync
---
@@ -434,16 +437,14 @@ RULE: all not lv_is_locked
---
lvconvert --type cache --cachepool LV LV_linear_striped_raid_thinpool
-OO: --cache, --cachemode CacheMode, --cachepolicy String,
---cachesettings String, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
+OO: --cache, OO_LVCONVERT_CACHE, OO_LVCONVERT_POOL, OO_LVCONVERT
ID: lvconvert_to_cache_vol
DESC: Convert LV to type cache.
RULE: all and lv_is_visible
# alternate form of lvconvert --type cache
lvconvert --cache --cachepool LV LV_linear_striped_raid_thinpool
-OO: --type cache, --cachemode CacheMode, --cachepolicy String,
---cachesettings String, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
+OO: --type cache, OO_LVCONVERT_CACHE, OO_LVCONVERT_POOL, OO_LVCONVERT
ID: lvconvert_to_cache_vol
DESC: Convert LV to type cache (variant, infers --type cache).
FLAGS: SECONDARY_SYNTAX
@@ -494,8 +495,7 @@ FLAGS: PREVIOUS_SYNTAX
---
lvconvert --type cache-pool LV_linear_striped_raid
-OO: OO_LVCONVERT_POOL, OO_LVCONVERT,
---cachemode CacheMode, --cachepolicy String, --cachesettings String
+OO: OO_LVCONVERT_CACHE, OO_LVCONVERT_POOL, OO_LVCONVERT
OP: PV ...
ID: lvconvert_to_cachepool
DESC: Convert LV to type cache-pool.
@@ -523,8 +523,7 @@ DESC: Convert LV to type cache-pool.
# of creating a pool or swapping metadata should be used.
lvconvert --cachepool LV_linear_striped_raid_cachepool
-OO: --type cache-pool, OO_LVCONVERT_POOL, OO_LVCONVERT,
---cachemode CacheMode, --cachepolicy String, --cachesettings String
+OO: --type cache-pool, OO_LVCONVERT_CACHE, OO_LVCONVERT_POOL, OO_LVCONVERT
OP: PV ...
ID: lvconvert_to_cachepool_or_swap_metadata
DESC: Convert LV to type cache-pool (variant, use --type cache-pool).
1
0
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=89661981e829d2cb228e3…
Commit: 89661981e829d2cb228e3db6f8127d14526ea025
Parent: 4a14617dc4413911b3af0cfea38cd5c2fe45afa8
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 28 12:22:12 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 28 12:22:12 2017 -0600
man: fix syntax for PV ranges
---
tools/command.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 59818f9..a8c38ba 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -2733,8 +2733,8 @@ void print_man_all_positions_desc(struct command_name *cname)
printf("Physical Volume name, a device path under /dev.\n"
"For commands managing physical extents, a PV positional arg\n"
"generally accepts a suffix indicating a range of physical extents.\n"
- "Start and end range (inclusive): \\fIPV\\fP[:\\fIPE\\fP[-\\fIPE\\fP].\n"
- "Start and length range (counting from 0): \\fIPV\\fP[:\\fIPE\\fP[+\\fIPE\\fP].\n");
+ "Start and end range (inclusive): \\fIPV\\fP[\\fB:\\fP\\fIPE\\fP[\\fB-\\fP\\fIPE\\fP]].\n"
+ "Start and length range (counting from 0): \\fIPV\\fP[\\fB:\\fP\\fIPE\\fP[\\fB+\\fP\\fIPE\\fP]].\n");
}
if (has_tag_val) {
1
0
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4a14617dc4413911b3af0…
Commit: 4a14617dc4413911b3af0cfea38cd5c2fe45afa8
Parent: f9d28f1aeccaa923dfe31fda982d2a5fd5ef0f2d
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 27 17:06:08 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 27 17:06:08 2017 -0600
commands: remove lvconvert raid rule
A raid0 LV also needs to be converted to other
raid levels, so this rule should be removed entirely.
---
tools/command-lines.in | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 3105966..26c2deb 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -347,7 +347,6 @@ OP: PV ...
ID: lvconvert_raid_types
DESC: Convert LV to raid or change raid layout.
RULE: all not lv_is_locked lv_is_pvmove
-RULE: LV_raid not LV_raid0
lvconvert --mirrors SNumber LV
OO: OO_LVCONVERT_RAID, OO_LVCONVERT, --mirrorlog MirrorLog
1
0
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f9d28f1aeccaa923dfe31…
Commit: f9d28f1aeccaa923dfe31fda982d2a5fd5ef0f2d
Parent: 998151e83e5f1673266ffad213a35b377c3a999b
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 27 17:05:20 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 27 17:05:20 2017 -0600
man: mention regionsize default is in lvm.conf
---
tools/args.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index dd25007..f4eec0b 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -1230,7 +1230,9 @@ arg(resizefs_ARG, 'r', "resizefs", 0, 0, 0,
arg(reset_ARG, 'R', "reset", 0, 0, 0, NULL)
arg(regionsize_ARG, 'R', "regionsize", regionsize_VAL, 0, 0,
- "Size of each raid or mirror synchronization region.\n")
+ "Size of each raid or mirror synchronization region.\n"
+ "lvm.conf activation/raid_region_size can be used to\n"
+ "configure a default.\n")
arg(physicalextentsize_ARG, 's', "physicalextentsize", sizemb_VAL, 0, 0,
"#vgcreate\n"
1
0
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=998151e83e5f1673266ff…
Commit: 998151e83e5f1673266ffad213a35b377c3a999b
Parent: 8d0df0c011f23095cf028c556db15b531ca91ea5
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 27 16:33:38 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 27 16:33:38 2017 -0600
commands: fix lvconvert raid rule
Recent rule change was incorrect.
We want to allow 'lvconvert --type raid' on raid1 LVs.
---
tools/command-lines.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index f8e0db7..3105966 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -347,7 +347,7 @@ OP: PV ...
ID: lvconvert_raid_types
DESC: Convert LV to raid or change raid layout.
RULE: all not lv_is_locked lv_is_pvmove
-RULE: LV_raid not LV_raid0 LV_raid1
+RULE: LV_raid not LV_raid0
lvconvert --mirrors SNumber LV
OO: OO_LVCONVERT_RAID, OO_LVCONVERT, --mirrorlog MirrorLog
1
0
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8d0df0c011f23095cf028…
Commit: 8d0df0c011f23095cf028c556db15b531ca91ea5
Parent: 27384c52cf6a55ec7c8d64deecff2a81536193c7
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 24 16:43:05 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 27 14:44:00 2017 -0600
commands: fixes for recent raid changes
- Combine the equivalent lvconvert --type raid defs.
(Two cmd defs must be different without relying
on LV type, which are not known at the time the
cmd def is matched.)
- Remove unused optional options from lvconvert --stripes,
and lvconvert --stripesize.
- Use Number for --stripes_long val type.
- Combine the cmd def for raid reshape cleanup into the
existing start_poll cmd def (they were duplicate defs).
Calls into the raid code from a poll opertion will be
added.
---
tools/command-lines.in | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index c3d684e..f8e0db7 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -338,19 +338,16 @@ ID: lvconvert_raid_types
DESC: Convert LV to type mirror (also see type raid1).
RULE: all not lv_is_locked lv_is_pvmove
+# When LV is already raid, this changes the raid layout
+# (changing layout of raid0 and raid1 not allowed.)
+
lvconvert --type raid LV
OO: OO_LVCONVERT_RAID, OO_LVCONVERT
OP: PV ...
ID: lvconvert_raid_types
-DESC: Convert LV to raid.
-RULE: all not lv_is_locked lv_is_pvmove
-
-lvconvert --type raid LV_raid
-OO: OO_LVCONVERT_RAID, OO_LVCONVERT
-ID: lvconvert_raid_types
-DESC: Convert raid LV to different layout algorithm.
+DESC: Convert LV to raid or change raid layout.
RULE: all not lv_is_locked lv_is_pvmove
-RULE: all not LV_raid0 LV_raid1
+RULE: LV_raid not LV_raid0 LV_raid1
lvconvert --mirrors SNumber LV
OO: OO_LVCONVERT_RAID, OO_LVCONVERT, --mirrorlog MirrorLog
@@ -359,8 +356,8 @@ ID: lvconvert_raid_types
DESC: Convert LV to raid1 or mirror, or change number of mirror images.
RULE: all not lv_is_locked lv_is_pvmove
-lvconvert --stripes_long SNumber LV_raid
-OO: OO_LVCONVERT_RAID, OO_LVCONVERT
+lvconvert --stripes_long Number LV_raid
+OO: OO_LVCONVERT, --interval Number, --regionsize RegionSize, --stripesize SizeKB
OP: PV ...
ID: lvconvert_raid_types
DESC: Convert raid LV to change number of stripe images.
@@ -368,7 +365,7 @@ RULE: all not lv_is_locked lv_is_pvmove
RULE: all not LV_raid0 LV_raid1
lvconvert --stripesize SizeKB LV_raid
-OO: OO_LVCONVERT_RAID, OO_LVCONVERT
+OO: OO_LVCONVERT, --interval Number, --regionsize RegionSize
ID: lvconvert_raid_types
DESC: Convert raid LV to change the stripe size.
RULE: all not lv_is_locked lv_is_pvmove
@@ -381,13 +378,6 @@ DESC: Change the region size of an LV.
RULE: all not lv_is_locked lv_is_pvmove
RULE: all not LV_raid0
-lvconvert LV_mirror_raid
-OO: OO_LVCONVERT
-ID: lvconvert_raid_types
-DESC: Remove out-of-place reshape space
-RULE: all not lv_is_locked lv_is_pvmove
-RULE: all not LV_raid0 LV_raid1
-
---
# lvconvert raid-related utilities
@@ -677,7 +667,7 @@ RULE: all not lv_is_locked lv_is_pvmove
# This command just (re)starts the polling process on the LV
# to continue a previous conversion.
-lvconvert --startpoll LV_mirror
+lvconvert --startpoll LV_mirror_raid
OO: OO_LVCONVERT
ID: lvconvert_start_poll
DESC: Poll LV to continue conversion.
@@ -685,7 +675,7 @@ RULE: all and lv_is_converting
# alternate form of lvconvert --startpoll, this is only kept
# for compat since this was how it used to be done.
-lvconvert LV_mirror
+lvconvert LV_mirror_raid
OO: OO_LVCONVERT
ID: lvconvert_start_poll
DESC: Poll LV to continue conversion.
1
0
27 Feb '17
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=27384c52cf6a55ec7c8d6…
Commit: 27384c52cf6a55ec7c8d64deecff2a81536193c7
Parent: c41e99948819e896d9d06b4a8192ec7a63facf65
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Mon Feb 27 21:42:15 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Mon Feb 27 21:42:15 2017 +0100
lvconvert: limit libdm to maximum of 64 RAID devices
Commit 64a2fad5d6c6 raised the maximum number of RAID devices to 64.
Commit e2354ea344c2 introduced RAID_BITMAP_SIZE as 4 to have
256 bits (4 * 64 bit array members), thus changing the libdm API
unnecessarilly for the time being.
To not change the API, reduce RAID_BITMAP_SIZE to 1.
Remove an unneeded definition of it from libdm-common.h.
If we ever decide to raise past 64, we'll version the API.
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
libdm/libdevmapper.h | 11 ++++++++++-
libdm/libdm-common.h | 2 --
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 7fccac5..7136261 100644
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -1739,7 +1739,16 @@ int dm_tree_node_add_raid_target(struct dm_tree_node *node,
*/
#define DM_CACHE_METADATA_MAX_SECTORS DM_THIN_METADATA_MAX_SECTORS
-#define RAID_BITMAP_SIZE 4
+/*
+ * Define number of elements in rebuild and writemostly arrays
+ * 'of struct dm_tree_node_raid_params'.
+ *
+ * Set to one to keep the current libdm API!
+ *
+ * If we ever raise the maximum number of RAID devices past 64 thus
+ * changing the API, we have to version it for backwards API compatibility.
+ */
+#define RAID_BITMAP_SIZE 1
struct dm_tree_node_raid_params {
const char *raid_type;
diff --git a/libdm/libdm-common.h b/libdm/libdm-common.h
index a064db8..4dc1870 100644
--- a/libdm/libdm-common.h
+++ b/libdm/libdm-common.h
@@ -23,8 +23,6 @@
#define DEV_NAME(dmt) (dmt->mangled_dev_name ? : dmt->dev_name)
#define DEV_UUID(DMT) (dmt->mangled_uuid ? : dmt->uuid)
-#define RAID_BITMAP_SIZE 4
-
int mangle_string(const char *str, const char *str_name, size_t len,
char *buf, size_t buf_len, dm_string_mangling_t mode);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c41e99948819e896…
Commit: c41e99948819e896d9d06b4a8192ec7a63facf65
Parent: 4f7631b4adb9c6fff5cd47b5bd733ee716d05c8f
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Mon Feb 27 13:52:51 2017 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Mon Feb 27 14:05:50 2017 +0000
git: Upstream repository moved to sourceware.org
The fedorahosted git repository shuts down tomorrow:
https://communityblog.fedoraproject.org/fedorahosted-sunset-2017-02-28/
Our upstream git repository has moved back to sourceware.org.
Mailing list hosting is not changing.
Gitweb:
https://www.sourceware.org/git/?p=lvm2
Git:
git://sourceware.org/git/lvm2.git
ssh://sourceware.org/git/lvm2.git
http://sourceware.org/git/lvm2.git
Example command to change the origin of a repository clone:
Public:
git remote set-url origin git://sourceware.org/git/lvm2.git
Committers:
git remote set-url origin git+ssh://sourceware.org/git/lvm2.git
---
README | 5 +++--
WHATS_NEW | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/README b/README
index a0e3c9e..c7e267e 100644
--- a/README
+++ b/README
@@ -6,11 +6,12 @@ Installation instructions are in INSTALL.
There is no warranty - see COPYING and COPYING.LIB.
Tarballs are available from:
+ ftp://sourceware.org/pub/lvm2/
ftp://sources.redhat.com/pub/lvm2/
The source code is stored in git:
- http://git.fedorahosted.org/git/lvm2.git
- git clone git://git.fedorahosted.org/git/lvm2.git
+ https://sourceware.org/git/?p=lvm2.git
+ git clone git://sourceware.org/git/lvm2.git
Mailing list for general discussion related to LVM2:
linux-lvm(a)redhat.com
diff --git a/WHATS_NEW b/WHATS_NEW
index d2e750b..63cc2d2 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Upstream git moved to https://sourceware.org/git/?p=lvm2
Support conversion of raid type, stripesize and number of disks
Reject writemostly/writebehind in lvchange during resynchronization.
Deactivate active origin first before removal for improved workflow.
1
0
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c41e99948819e896d9d06…
Commit: c41e99948819e896d9d06b4a8192ec7a63facf65
Parent: 4f7631b4adb9c6fff5cd47b5bd733ee716d05c8f
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Mon Feb 27 13:52:51 2017 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Mon Feb 27 14:05:50 2017 +0000
git: Upstream repository moved to sourceware.org
The fedorahosted git repository shuts down tomorrow:
https://communityblog.fedoraproject.org/fedorahosted-sunset-2017-02-28/
Our upstream git repository has moved back to sourceware.org.
Mailing list hosting is not changing.
Gitweb:
https://www.sourceware.org/git/?p=lvm2
Git:
git://sourceware.org/git/lvm2.git
ssh://sourceware.org/git/lvm2.git
http://sourceware.org/git/lvm2.git
Example command to change the origin of a repository clone:
Public:
git remote set-url origin git://sourceware.org/git/lvm2.git
Committers:
git remote set-url origin git+ssh://sourceware.org/git/lvm2.git
---
README | 5 +++--
WHATS_NEW | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/README b/README
index a0e3c9e..c7e267e 100644
--- a/README
+++ b/README
@@ -6,11 +6,12 @@ Installation instructions are in INSTALL.
There is no warranty - see COPYING and COPYING.LIB.
Tarballs are available from:
+ ftp://sourceware.org/pub/lvm2/
ftp://sources.redhat.com/pub/lvm2/
The source code is stored in git:
- http://git.fedorahosted.org/git/lvm2.git
- git clone git://git.fedorahosted.org/git/lvm2.git
+ https://sourceware.org/git/?p=lvm2.git
+ git clone git://sourceware.org/git/lvm2.git
Mailing list for general discussion related to LVM2:
linux-lvm(a)redhat.com
diff --git a/WHATS_NEW b/WHATS_NEW
index d2e750b..63cc2d2 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Upstream git moved to https://sourceware.org/git/?p=lvm2
Support conversion of raid type, stripesize and number of disks
Reject writemostly/writebehind in lvchange during resynchronization.
Deactivate active origin first before removal for improved workflow.
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4f7631b4adb9c6ff…
Commit: 4f7631b4adb9c6fff5cd47b5bd733ee716d05c8f
Parent: 5f6bdf707db24e882b3c3f86f8a5f2e2d2007c98
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 24 15:11:18 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 24 15:11:18 2017 -0600
man: change option sorting in synopsis
The options list was sorted as:
- options with both long and short forms, alphabetically
- options with only long form, alphabetically
This was done only for the visual effect. Change to
sort alphabetically by long opt, without regard to
short forms.
---
tools/command.c | 55 +++++++------------------------------------------------
1 files changed, 7 insertions(+), 48 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 5dd0298..59818f9 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -2533,10 +2533,7 @@ static void print_man_option_desc(struct command_name *cname, int opt_enum)
}
/*
- * Print a list of all options names for a given
- * command name, listed by:
- * options with short+long names, alphabetically,
- * then options with only long names, alphabetically
+ * Print a list of all options names for a given command name.
*/
void print_man_all_options_list(struct command_name *cname)
@@ -2545,63 +2542,25 @@ void print_man_all_options_list(struct command_name *cname)
int sep = 0;
int i;
- /* print those with both short and long opts */
for (i = 0; i < ARG_COUNT; i++) {
opt_enum = opt_names_alpha[i]->opt_enum;
-
if (!cname->all_options[opt_enum])
continue;
- if (!opt_names[opt_enum].short_opt)
- continue;
-
if (sep)
printf(".br\n");
printf(".ad l\n");
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cname->name, opt_enum));
-
- val_enum = opt_names[opt_enum].val_enum;
-
- if (!val_names[val_enum].fn) {
- /* takes no arg */
- } else if (!val_names[val_enum].usage) {
- printf(" ");
- printf("\\fI");
- printf("%s", val_names[val_enum].name);
- printf("\\fP");
+ if (opt_names[opt_enum].short_opt) {
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cname->name, opt_enum));
} else {
- printf(" ");
- print_val_man(val_names[val_enum].usage);
+ /* spaces for alignment without short opt */
+ printf(" \\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
}
- printf("\n.ad b\n");
-
- sep = 1;
- }
-
- /* print those without short opts */
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
- if (!cname->all_options[opt_enum])
- continue;
-
- if (opt_names[opt_enum].short_opt)
- continue;
-
- if (sep)
- printf(".br\n");
- printf(".ad l\n");
-
- /* space alignment without short opt */
- printf(" ");
-
- printf(" \\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
-
val_enum = opt_names[opt_enum].val_enum;
if (!val_names[val_enum].fn) {
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5f6bdf707db24e88…
Commit: 5f6bdf707db24e882b3c3f86f8a5f2e2d2007c98
Parent: 84cceaf9b9f0f323c78e9818c2b54c97d71b392f
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 24 15:05:17 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 24 15:05:17 2017 -0600
man: add ENVIRONMENT VARIABLES section
---
tools/command.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 4e7c009..5dd0298 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -2825,8 +2825,7 @@ void print_man_all_positions_desc(struct command_name *cname)
"(This should not be confused with the output control --units, where\n"
"capital letters mean multiple of 1000.)\n");
- printf("\n.HP\n");
- printf("Environment");
+ printf(".SH ENVIRONMENT VARIABLES");
printf("\n");
printf(".br\n");
printf("See \\fBlvm\\fP(8) for information about environment variables used by lvm.\n"
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=84cceaf9b9f0f323…
Commit: 84cceaf9b9f0f323c78e9818c2b54c97d71b392f
Parent: 74ba326007205ebbb5afca7c8f74a8b19e9dcb50
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 24 14:17:58 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 24 14:17:58 2017 -0600
lvconvert: fix handling args in combining snapshots
Fixes commit 286d39ee3c433, which was correct except
for a reversed strstr. Now uses strchr, and modifies
a copy of the name so the original argv is preserved.
---
tools/lvconvert.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 183421a..c82dab2 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -3668,8 +3668,9 @@ static int _lvconvert_combine_split_snapshot_single(struct cmd_context *cmd,
int lvconvert_combine_split_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv)
{
const char *vgname = NULL;
- const char *lvname1;
- const char *lvname2;
+ const char *lvname1_orig;
+ const char *lvname2_orig;
+ const char *lvname1_split;
char *vglv;
int vglv_sz;
@@ -3687,20 +3688,25 @@ int lvconvert_combine_split_snapshot_cmd(struct cmd_context *cmd, int argc, char
* This is the only instance in all commands.
*/
- lvname1 = cmd->position_argv[0];
- lvname2 = cmd->position_argv[1];
+ lvname1_orig = cmd->position_argv[0];
+ lvname2_orig = cmd->position_argv[1];
- if (strstr("/", lvname1) && !strstr("/", lvname2) && !getenv("LVM_VG_NAME")) {
- if (!validate_lvname_param(cmd, &vgname, &lvname1))
+ if (strchr(lvname1_orig, '/') && !strchr(lvname2_orig, '/') && !getenv("LVM_VG_NAME")) {
+ if (!(lvname1_split = dm_pool_strdup(cmd->mem, lvname1_orig)))
return_ECMD_FAILED;
- vglv_sz = strlen(vgname) + strlen(lvname2) + 2;
+ if (!validate_lvname_param(cmd, &vgname, &lvname1_split))
+ return_ECMD_FAILED;
+
+ vglv_sz = strlen(vgname) + strlen(lvname2_orig) + 2;
if (!(vglv = dm_pool_alloc(cmd->mem, vglv_sz)) ||
- dm_snprintf(vglv, vglv_sz, "%s/%s", vgname, lvname2) < 0) {
+ dm_snprintf(vglv, vglv_sz, "%s/%s", vgname, lvname2_orig) < 0) {
log_error("vg/lv string alloc failed.");
return_ECMD_FAILED;
}
+ /* vglv is now vgname/lvname2 and replaces lvname2_orig */
+
cmd->position_argv[1] = vglv;
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=74ba326007205ebb…
Commit: 74ba326007205ebbb5afca7c8f74a8b19e9dcb50
Parent: 189fa647931834b0d9cb30c20d16785b8e8923c9
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 24 13:44:05 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 24 13:44:05 2017 -0600
man: use Size variable for a number with unit
Define a separate variable type Size to represent
a number that takes an optional UNIT.
---
tools/args.h | 2 +-
tools/command.c | 25 +++++++++++++++----------
tools/lvmcmdline.c | 4 ++--
tools/tools.h | 2 +-
tools/vals.h | 22 +++++++++++-----------
5 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index 036aa87..dd25007 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -987,7 +987,7 @@ arg(logicalvolume_ARG, 'l', "logicalvolume", uint32_VAL, 0, 0,
arg(maxlogicalvolumes_ARG, 'l', "maxlogicalvolumes", uint32_VAL, 0, 0,
"Sets the maximum number of LVs allowed in a VG.\n")
-arg(extents_ARG, 'l', "extents", numsignedper_VAL, 0, 0,
+arg(extents_ARG, 'l', "extents", extents_VAL, 0, 0,
"#lvcreate\n"
"Specifies the size of the new LV in logical extents.\n"
"The --size and --extents options are alternate methods of specifying size.\n"
diff --git a/tools/command.c b/tools/command.c
index 8d5a96b..4e7c009 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -79,7 +79,7 @@ static inline int size_mb_arg_with_percent(struct cmd_context *cmd, struct arg_v
static inline int int_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
static inline int uint32_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
static inline int int_arg_with_sign(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int int_arg_with_sign_and_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int extents_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
static inline int major_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
static inline int minor_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
static inline int string_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
@@ -1792,13 +1792,13 @@ static void print_val_man(const char *str)
* that isn't already obvious.
*/
- if (!strcmp(str, "Number[k|UNIT]")) {
- printf("\\fINumber\\fP[k|UNIT]");
+ if (!strcmp(str, "Size[k|UNIT]")) {
+ printf("\\fISize\\fP[k|UNIT]");
return;
}
- if (!strcmp(str, "Number[m|UNIT]")) {
- printf("\\fINumber\\fP[m|UNIT]");
+ if (!strcmp(str, "Size[m|UNIT]")) {
+ printf("\\fISize\\fP[m|UNIT]");
return;
}
@@ -2807,16 +2807,21 @@ void print_man_all_positions_desc(struct command_name *cname)
printf(".br\n");
printf("See the option description for information about the string content.\n");
- /* Nearly every command uses a number arg somewhere. */
+ /*
+ * We could possibly check if the command accepts any option that
+ * uses Size, and only print this in those cases, but this seems
+ * so common that we should probably always print it.
+ */
printf("\n.HP\n");
- printf("\\fINumber\\fP, UNIT");
+ printf("\\fISize\\fP[UNIT]");
printf("\n");
printf(".br\n");
- printf("Input units are always treated as base two values, regardless of unit\n"
+ printf("Size is an input number that accepts an optional unit.\n"
+ "Input units are always treated as base two values, regardless of\n"
"capitalization, e.g. 'k' and 'K' both refer to 1024.\n"
- "The default input unit is specified by letter, followed by |UNIT\n"
- "which represents other possible input units: \\fBbBsSkKmMgGtTpPeE\\fP.\n"
+ "The default input unit is specified by letter, followed by |UNIT.\n"
+ "UNIT represents other possible input units: \\fBbBsSkKmMgGtTpPeE\\fP.\n"
"(This should not be confused with the output control --units, where\n"
"capital letters mean multiple of 1000.)\n");
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 02266c9..9b20d9f 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -672,8 +672,8 @@ int int_arg_with_sign(struct cmd_context *cmd __attribute__((unused)), struct ar
return 1;
}
-int int_arg_with_sign_and_percent(struct cmd_context *cmd __attribute__((unused)),
- struct arg_values *av)
+int extents_arg(struct cmd_context *cmd __attribute__((unused)),
+ struct arg_values *av)
{
char *ptr;
diff --git a/tools/tools.h b/tools/tools.h
index 62db506..1e1e7f1 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -188,7 +188,7 @@ int size_mb_arg_with_percent(struct cmd_context *cmd, struct arg_values *av);
int int_arg(struct cmd_context *cmd, struct arg_values *av);
int uint32_arg(struct cmd_context *cmd, struct arg_values *av);
int int_arg_with_sign(struct cmd_context *cmd, struct arg_values *av);
-int int_arg_with_sign_and_percent(struct cmd_context *cmd, struct arg_values *av);
+int extents_arg(struct cmd_context *cmd, struct arg_values *av);
int major_arg(struct cmd_context *cmd, struct arg_values *av);
int minor_arg(struct cmd_context *cmd, struct arg_values *av);
int string_arg(struct cmd_context *cmd, struct arg_values *av);
diff --git a/tools/vals.h b/tools/vals.h
index a94f81b..d485926 100644
--- a/tools/vals.h
+++ b/tools/vals.h
@@ -79,13 +79,13 @@
* options included in the usage text below that should
* be removed? Should "lvm1" be removed?
*
- * For Number args that take optional units, a full usage
- * could be "Number[bBsSkKmMgGtTpPeE]" (with implied |),
- * but repeating this full specification produces cluttered
- * output, and doesn't indicate which unit is the default.
- * "Number[Units]" would be cleaner, as would a subset of
- * common units, e.g. "Number[kmg...]", but neither helps
- * with default. "Number[k|UNIT]" and "Number[m|UNIT]" show
+ * Size is a Number that takes an optional unit.
+ * A full usage could be "Size[b|B|s|S|k|K|m|M|g|G|t|T|p|P|e|E]"
+ * but repeating this full specification produces long and
+ * cluttered output, and doesn't indicate which unit is the default.
+ * "Size[Units]" would be cleaner, as would a subset of
+ * common units, e.g. "Size[kmg...]", but neither helps
+ * with default. "Size[k|UNIT]" and "Size[m|UNIT]" show
* the default, and "UNIT" indicates that other units
* are possible without listing them all. This also
* suggests using the preferred lower case letters, because
@@ -115,11 +115,11 @@ val(activation_VAL, activation_arg, "Active", "y|n|ay")
val(cachemode_VAL, cachemode_arg, "CacheMode", "writethrough|writeback")
val(discards_VAL, discards_arg, "Discards", "passdown|nopassdown|ignore")
val(mirrorlog_VAL, mirrorlog_arg, "MirrorLog", "core|disk")
-val(sizekb_VAL, size_kb_arg, "SizeKB", "Number[k|UNIT]")
-val(sizemb_VAL, size_mb_arg, "SizeMB", "Number[m|UNIT]")
-val(regionsize_VAL, regionsize_arg, "RegionSize", "Number[m|UNIT]")
+val(sizekb_VAL, size_kb_arg, "SizeKB", "Size[k|UNIT]")
+val(sizemb_VAL, size_mb_arg, "SizeMB", "Size[m|UNIT]")
+val(regionsize_VAL, regionsize_arg, "RegionSize", "Size[m|UNIT]")
val(numsigned_VAL, int_arg_with_sign, "SNumber", "[+|-]Number")
-val(numsignedper_VAL, int_arg_with_sign_and_percent, "SNumberP", "[+|-]Number[%VG|%PVS|%FREE]")
+val(extents_VAL, extents_arg, "Extents", "[+|-]Number[%VG|%PVS|%FREE]")
val(permission_VAL, permission_arg, "Permission", "rw|r")
val(metadatatype_VAL, metadatatype_arg, "MetadataType", "lvm2|lvm1")
val(units_VAL, string_arg, "Units", "r|R|h|H|b|B|s|S|k|K|m|M|g|G|t|T|p|P|e|E")
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=189fa647931834b0…
Commit: 189fa647931834b0d9cb30c20d16785b8e8923c9
Parent: 3bdc4045c2abbf9ea11000b76eeefab9fed16033
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 07:27:43 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 07:27:43 2017 +0100
lvconvert: impose region size constraints
When requesting a regionsize change during conversions, check
for constraints or the command may fail in the kernel n case
the region size is too smalle or too large thus leaving any
new SubLVs behind.
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 86 +++++++++++++++++++++++++++++++-------------
tools/lvconvert.c | 2 +
2 files changed, 62 insertions(+), 26 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 34567bd..34e8856 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -94,6 +94,27 @@ uint32_t raid_ensure_min_region_size(const struct logical_volume *lv, uint64_t r
return region_size;
}
+/* check constraints on region size vs. stripe and LV size on @lv */
+static int _check_region_size_constraints(struct logical_volume *lv,
+ const struct segment_type *segtype,
+ uint32_t region_size,
+ uint32_t stripe_size)
+{
+ if (region_size < stripe_size) {
+ log_error("Regionsize may not be smaller than stripe size on %s LV %s.",
+ segtype->name, display_lvname(lv));
+ return 0;
+ }
+
+ if (region_size * 8 > lv->size) {
+ log_error("Regionsize too large for %s LV %s.",
+ segtype->name, display_lvname(lv));
+ return 0;
+ }
+
+ return 1;
+}
+
/*
* Check for maximum number of raid devices.
* Constrained by kernel MD maximum device limits _and_ dm-raid superblock
@@ -2142,6 +2163,9 @@ static int _raid_reshape(struct logical_volume *lv,
if (!_check_max_raid_devices(new_image_count))
return_0;
+ if (!_check_region_size_constraints(lv, new_segtype, new_region_size, new_stripe_size))
+ return 0;
+
if (!_raid_in_sync(lv)) {
log_error("Unable to convert %s while it is not in-sync.",
display_lvname(lv));
@@ -4772,6 +4796,9 @@ static int _takeover_downconvert_wrapper(TAKEOVER_FN_ARGS)
return 0;
}
+ if (!_check_region_size_constraints(lv, new_segtype, new_region_size, new_stripe_size))
+ return 0;
+
if (seg_is_any_raid10(seg) && (seg->area_count % seg->data_copies)) {
log_error("Can't convert %s LV %s to %s with odd number of stripes.",
lvseg_name(seg), display_lvname(lv), new_segtype->name);
@@ -4853,7 +4880,8 @@ static int _takeover_downconvert_wrapper(TAKEOVER_FN_ARGS)
seg->region_size = 0;
if (!(seg->segtype = get_segtype_from_flag(lv->vg->cmd, SEG_RAID0_META)))
return_0;
- }
+ } else
+ seg->region_size = new_region_size;
if (segtype_is_striped_target(new_segtype)) {
if (!_convert_raid0_to_striped(lv, 0, &removal_lvs))
@@ -5035,6 +5063,11 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
new_stripe_size = 128;
}
+ region_size = seg->region_size;
+
+ if (!_check_region_size_constraints(lv, new_segtype, new_region_size, new_stripe_size))
+ return 0;
+
/* Archive metadata */
if (!archive(lv->vg))
return_0;
@@ -5065,7 +5098,6 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
extents_copied = seg->extents_copied;
- region_size = seg->region_size;
seg_len = seg->len;
stripe_size = seg->stripe_size;
@@ -5221,21 +5253,24 @@ static int _takeover_from_raid0_to_raid10(TAKEOVER_FN_ARGS)
{
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count * 2 /* new_image_count */,
- 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ 2 /* data_copies */, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_to_raid45(TAKEOVER_FN_ARGS)
{
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count + 1 /* new_image_count */,
- 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ 2 /* data_copies */, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_to_raid6(TAKEOVER_FN_ARGS)
{
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count + 2 /* new_image_count */,
- 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ 3 /* data_copies */, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_to_striped(TAKEOVER_FN_ARGS)
@@ -5273,21 +5308,24 @@ static int _takeover_from_raid0_meta_to_raid10(TAKEOVER_FN_ARGS)
{
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count * 2 /* new_image_count */,
- 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ 2 /* data_copies */, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_meta_to_raid45(TAKEOVER_FN_ARGS)
{
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count + 1 /* new_image_count */,
- 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ 2 /* data_copies */, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_meta_to_raid6(TAKEOVER_FN_ARGS)
{
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count + 2 /* new_image_count */,
- 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ 3 /* data_copies */, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_meta_to_striped(TAKEOVER_FN_ARGS)
@@ -5332,7 +5370,8 @@ static int _takeover_from_raid1_to_raid5(TAKEOVER_FN_ARGS)
{
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count /* unchanged new_image_count */,
- 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ 2 /* data_copies */, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
static int _takeover_from_raid1_to_striped(TAKEOVER_FN_ARGS)
@@ -5369,7 +5408,7 @@ static int _takeover_from_raid5_to_raid1(TAKEOVER_FN_ARGS)
{
return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count,
- 2 /* data_copies */, 0, 0, 0, allocate_pvs);
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid45_to_raid54(TAKEOVER_FN_ARGS)
@@ -5390,7 +5429,8 @@ static int _takeover_from_raid45_to_raid6(TAKEOVER_FN_ARGS)
}
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count + 1 /* new_image_count */,
- 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ 3 /* data_copies */, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
static int _takeover_from_raid45_to_striped(TAKEOVER_FN_ARGS)
@@ -5411,14 +5451,14 @@ static int _takeover_from_raid6_to_raid0_meta(TAKEOVER_FN_ARGS)
{
return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count - 2,
- 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_raid45(TAKEOVER_FN_ARGS)
{
return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count - 1,
- 2 /* data_copies */, 0, 0, 0, allocate_pvs);
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid6_to_striped(TAKEOVER_FN_ARGS)
@@ -5453,20 +5493,23 @@ static int _takeover_from_striped_to_raid10(TAKEOVER_FN_ARGS)
{
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count * 2 /* new_image_count */,
- 2 /* FIXME: variable data_copies */, 0, 0, new_region_size, allocate_pvs);
+ 2 /* FIXME: variable data_copies */, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
static int _takeover_from_striped_to_raid45(TAKEOVER_FN_ARGS)
{
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count + 1,
- 2 /* data_copies*/, 0, 0, new_region_size, allocate_pvs);
+ 2 /* data_copies*/, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
static int _takeover_from_striped_to_raid6(TAKEOVER_FN_ARGS)
{
return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count + 2 /* new_image_count */,
- 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ 3 /* data_copies */, 0, new_stripe_size,
+ new_region_size, allocate_pvs);
}
/*
@@ -5725,17 +5768,8 @@ static int _region_size_change_requested(struct logical_volume *lv, int yes, con
return 1;
}
- if (region_size * 8 > lv->size) {
- log_error("Requested region size too large for LV %s size %s.",
- display_lvname(lv), display_size(lv->vg->cmd, lv->size));
+ if (!_check_region_size_constraints(lv, seg->segtype, region_size, seg->stripe_size))
return 0;
- }
-
- if (region_size < seg->stripe_size) {
- log_error("Requested region size for LV %s is smaller than stripe size.",
- display_lvname(lv));
- return 0;
- }
if (!_raid_in_sync(lv)) {
log_error("Unable to change region size on %s LV %s while it is not in-sync.",
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 0db10cb..183421a 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1401,6 +1401,8 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
lp->stripes = 0;
if (!arg_is_set(cmd, type_ARG))
lp->segtype = NULL;
+ if (!arg_is_set(cmd, regionsize_ARG))
+ lp->region_size = 0;
if (!lv_raid_convert(lv, lp->segtype,
lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size,
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3bdc4045c2abbf9e…
Commit: 3bdc4045c2abbf9ea11000b76eeefab9fed16033
Parent: d768fbe010914161e3e7bfff6e4e6e0e2cd3907d
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 05:58:45 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:58:45 2017 +0100
lvconvert: fix 2 issues identified in intesting
Allow regionsize on upconvert from linear:
fix related commit 2574d3257ad41 to actually work
Related: rhbz1394427
Remove setting raid5_n on conversions from raid1
as of commit 932db3db5357 because any raid5 mapping
may be requested.
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index ab0bfab..34567bd 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -2696,12 +2696,14 @@ static int _raid_add_images(struct logical_volume *lv,
int commit, int use_existing_area_len)
{
int rebuild_flag_cleared = 0;
- struct lv_segment *seg;
- uint32_t s;
+ struct lv_segment *seg = first_seg(lv);
+ uint32_t region_size = seg->region_size, s;
if (!_raid_add_images_without_commit(lv, new_count, pvs, use_existing_area_len))
return_0;
+ first_seg(lv)->region_size = region_size;
+
if (!commit)
return 1;
@@ -5623,7 +5625,7 @@ static uint64_t _raid_seg_flag_6_to_5(const struct lv_segment *seg)
return _get_r56_flag(seg, 1);
}
-/* Change segtype for raid4 <-> raid5 <-> raid6 or raid1 <-> raid5 takeover where necessary. */
+/* Change segtype for raid4 <-> raid5 <-> raid6 where necessary. */
static int _set_convenient_raid1456_segtype_to(const struct lv_segment *seg_from,
const struct segment_type **segtype,
int yes)
@@ -5650,12 +5652,6 @@ static int _set_convenient_raid1456_segtype_to(const struct lv_segment *seg_from
goto replaced;
}
- /* raid1 -> raid5_n with 2 areas */
- } else if (seg_is_raid1(seg_from) && seg_from->area_count == 2 &&
- segtype_is_any_raid5(*segtype) && !segtype_is_raid5_n(*segtype)) {
- seg_flag = SEG_RAID5_N;
- goto replaced;
-
/* raid4 -> raid5_n */
} else if (seg_is_raid4(seg_from) && segtype_is_any_raid5(*segtype)) {
seg_flag = SEG_RAID5_N;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d768fbe010914161…
Commit: d768fbe010914161e3e7bfff6e4e6e0e2cd3907d
Parent: 76f60cc4306deda481c45de7ebcde02a40668d85
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 05:24:59 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:24:59 2017 +0100
WHATS_NEW: add entry
---
WHATS_NEW | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 14109fb..d2e750b 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Support conversion of raid type, stripesize and number of disks
Reject writemostly/writebehind in lvchange during resynchronization.
Deactivate active origin first before removal for improved workflow.
Fix regression of accepting options --type and -m with lvresize (2.02.158).
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=76f60cc4306deda4…
Commit: 76f60cc4306deda481c45de7ebcde02a40668d85
Parent: 2574d3257ad41cad8dcbad3332774172e86f05da
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 05:16:21 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:59 2017 +0100
lvconvert: add missed new test scripts for reshaping
Add aforementioned but forgotten new test scripts
lvconvert-raid-reshape-linear_to_striped.sh,
lvconvert-raid-reshape-striped_to_linear.sh and
lvconvert-raid-reshape.sh
Those presume dm-raid target version 1.10.2
provided by a following kernel patch.
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
.../lvconvert-raid-reshape-linear_to_striped.sh | 64 +++++++
.../lvconvert-raid-reshape-striped_to_linear.sh | 84 ++++++++
test/shell/lvconvert-raid-reshape.sh | 199 ++++++++++++++++++++
3 files changed, 347 insertions(+), 0 deletions(-)
diff --git a/test/shell/lvconvert-raid-reshape-linear_to_striped.sh b/test/shell/lvconvert-raid-reshape-linear_to_striped.sh
new file mode 100644
index 0000000..3b6120c
--- /dev/null
+++ b/test/shell/lvconvert-raid-reshape-linear_to_striped.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA
+
+SKIP_WITH_LVMLOCKD=1
+SKIP_WITH_LVMPOLLD=1
+
+. lib/inittest
+
+which mkfs.ext4 || skip
+aux have_raid 1 10 2 || skip
+
+aux prepare_vg 5
+
+#
+# Test single step linear -> striped conversion
+#
+
+# Create linear LV
+lvcreate -aey -L 16M -n $lv1 $vg
+check lv_field $vg/$lv1 segtype "linear"
+check lv_field $vg/$lv1 stripes 1
+echo y|mkfs -t ext4 $DM_DEV_DIR/$vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+# Convert linear -> raid1
+lvconvert -y -m 1 $vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+check lv_field $vg/$lv1 segtype "raid1"
+check lv_field $vg/$lv1 stripes 2
+check lv_field $vg/$lv1 regionsize "512.00k"
+aux wait_for_sync $vg $lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+# Convert raid1 -> raid5_n
+lvconvert -y --ty raid5_n $vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+check lv_field $vg/$lv1 segtype "raid5_n"
+check lv_field $vg/$lv1 stripes 2
+check lv_field $vg/$lv1 stripesize "64.00k"
+check lv_field $vg/$lv1 regionsize "512.00k"
+
+# Convert raid5_n adding stripes
+lvconvert -y --stripes 4 $vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+check lv_first_seg_field $vg/$lv1 segtype "raid5_n"
+check lv_first_seg_field $vg/$lv1 stripes 5
+check lv_first_seg_field $vg/$lv1 stripesize "64.00k"
+check lv_first_seg_field $vg/$lv1 regionsize "512.00k"
+aux wait_for_sync $vg $lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+# Convert raid5_n -> striped
+lvconvert -y --type striped $vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+vgremove -ff $vg
diff --git a/test/shell/lvconvert-raid-reshape-striped_to_linear.sh b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
new file mode 100644
index 0000000..fc87caf
--- /dev/null
+++ b/test/shell/lvconvert-raid-reshape-striped_to_linear.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA
+
+SKIP_WITH_LVMLOCKD=1
+SKIP_WITH_LVMPOLLD=1
+
+. lib/inittest
+
+which mkfs.ext4 || skip
+aux have_raid 1 10 2 || skip
+
+aux prepare_vg 5
+
+#
+# Test single step linear -> striped conversion
+#
+
+# Create 4-way striped LV
+lvcreate -aey -i 4 -I 32k -L 16M -n $lv1 $vg
+check lv_field $vg/$lv1 segtype "striped"
+check lv_field $vg/$lv1 stripes 4
+check lv_field $vg/$lv1 stripesize "32.00k"
+echo y|mkfs -t ext4 $DM_DEV_DIR/$vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+# Convert striped -> raid5(_n)
+lvconvert -y --ty raid5 -R 128k $vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+check lv_field $vg/$lv1 segtype "raid5_n"
+check lv_field $vg/$lv1 stripes 5
+check lv_field $vg/$lv1 stripesize "32.00k"
+check lv_field $vg/$lv1 regionsize "128.00k"
+aux wait_for_sync $vg $lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+# Extend raid5_n LV by factor 4 to keep size once linear
+lvresize -y -L 64 $vg/$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+# Convert raid5_n LV to 1 stripe (2 legs total),
+# 64k stripesize and 1024k regionsize
+# FIXME: "--type" superfluous (cli fix needed)
+lvconvert -y -f --ty raid5_n --stripes 1 -I 64k -R 1024k $vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+check lv_first_seg_field $vg/$lv1 segtype "raid5_n"
+check lv_first_seg_field $vg/$lv1 stripes 5
+check lv_first_seg_field $vg/$lv1 stripesize "64.00k"
+check lv_first_seg_field $vg/$lv1 regionsize "1.00m"
+aux wait_for_sync $vg $lv1 1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+# Remove the now freed legs
+lvconvert --stripes 1 $vg/$lv1
+check lv_first_seg_field $vg/$lv1 segtype "raid5_n"
+check lv_first_seg_field $vg/$lv1 stripes 2
+check lv_first_seg_field $vg/$lv1 stripesize "64.00k"
+check lv_first_seg_field $vg/$lv1 regionsize "1.00m"
+
+# Convert raid5_n to raid1
+lvconvert -y --type raid1 $vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+check lv_first_seg_field $vg/$lv1 segtype "raid1"
+check lv_first_seg_field $vg/$lv1 stripes 2
+check lv_first_seg_field $vg/$lv1 stripesize "0"
+check lv_first_seg_field $vg/$lv1 regionsize "1.00m"
+
+# Convert raid5_n -> striped
+lvconvert -y --type linear $vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+check lv_first_seg_field $vg/$lv1 segtype "linear"
+check lv_first_seg_field $vg/$lv1 stripes 1
+check lv_first_seg_field $vg/$lv1 stripesize "0"
+check lv_first_seg_field $vg/$lv1 regionsize "0"
+
+vgremove -ff $vg
diff --git a/test/shell/lvconvert-raid-reshape.sh b/test/shell/lvconvert-raid-reshape.sh
new file mode 100644
index 0000000..2c302dd
--- /dev/null
+++ b/test/shell/lvconvert-raid-reshape.sh
@@ -0,0 +1,199 @@
+#!/bin/sh
+# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA
+
+SKIP_WITH_LVMLOCKD=1
+SKIP_WITH_LVMPOLLD=1
+
+. lib/inittest
+
+which mkfs.ext4 || skip
+aux have_raid 1 10 2 || skip
+
+aux prepare_vg 64
+
+function _lvcreate
+{
+ local level=$1
+ local req_stripes=$2
+ local stripes=$3
+ local size=$4
+ local vg=$5
+ local lv=$6
+
+ lvcreate -y -aey --type $level -i $req_stripes -L $size -n $lv $vg
+ check lv_first_seg_field $vg/$lv segtype "$level"
+ check lv_first_seg_field $vg/$lv stripes $stripes
+ mkfs.ext4 "$DM_DEV_DIR/$vg/$lv"
+ fsck -fn "$DM_DEV_DIR/$vg/$lv"
+}
+
+function _lvconvert
+{
+ local req_level=$1
+ local level=$2
+ local stripes=$3
+ local vg=$4
+ local lv=$5
+ local region_size=$6
+ local wait_and_check=1
+ local R=""
+
+ [ -n "$region_size" ] && R="-R $region_size"
+ [ "${level:0:7}" = "striped" ] && wait_and_check=0
+ [ "${level:0:5}" = "raid0" ] && wait_and_check=0
+
+ lvconvert -y --ty $req_level $R $vg/$lv
+ [ $? -ne 0 ] && return $?
+ check lv_first_seg_field $vg/$lv segtype "$level"
+ check lv_first_seg_field $vg/$lv stripes $stripes
+ [ -n "$region_size" ] && check lv_field $vg/$lv regionsize $region_size
+ if [ "$wait_and_check" -eq 1 ]
+ then
+ fsck -fn "$DM_DEV_DIR/$vg/$lv"
+ aux wait_for_sync $vg $lv
+ fi
+ fsck -fn "$DM_DEV_DIR/$vg/$lv"
+}
+
+function _reshape_layout
+{
+ local type=$1
+ shift
+ local stripes=$1
+ shift
+ local vg=$1
+ shift
+ local lv=$1
+ shift
+ local opts="$*"
+ local ignore_a_chars=0
+
+ [[ "$opts" =~ "--stripes" ]] && ignore_a_chars=1
+
+ lvconvert -vvvv -y --ty $type $opts $vg/$lv
+ check lv_first_seg_field $vg/$lv segtype "$type"
+ check lv_first_seg_field $vg/$lv stripes $stripes
+ aux wait_for_sync $vg $lv $ignore_a_chars
+ fsck -fn "$DM_DEV_DIR/$vg/$lv"
+}
+
+# Delay leg so that rebuilding status characters
+# can be read before resync finished too quick.
+# aux delay_dev "$dev1" 1
+
+#
+# Start out with raid5(_ls)
+#
+
+# Create 3-way striped raid5 (4 legs total)
+_lvcreate raid5_ls 3 4 16M $vg $lv1
+check lv_first_seg_field $vg/$lv1 segtype "raid5_ls"
+aux wait_for_sync $vg $lv1
+
+# Reshape it to 256K stripe size
+_reshape_layout raid5_ls 4 $vg $lv1 --stripesize 256K
+check lv_first_seg_field $vg/$lv1 stripesize "256.00k"
+
+# Convert raid5(_n) -> striped
+not _lvconvert striped striped 3 $vg $lv1 512k
+_reshape_layout raid5_n 4 $vg $lv1
+_lvconvert striped striped 3 $vg $lv1
+
+# Convert striped -> raid5_n
+_lvconvert raid5_n raid5_n 4 $vg $lv1 "" 1
+
+# Convert raid5_n -> raid5_ls
+_reshape_layout raid5_ls 4 $vg $lv1
+
+# Convert raid5_ls to 5 stripes
+_reshape_layout raid5_ls 6 $vg $lv1 --stripes 5
+
+# Convert raid5_ls back to 3 stripes
+_reshape_layout raid5_ls 6 $vg $lv1 --stripes 3 --force
+_reshape_layout raid5_ls 4 $vg $lv1 --stripes 3
+
+# Convert raid5_ls to 7 stripes
+_reshape_layout raid5_ls 8 $vg $lv1 --stripes 7
+
+# Convert raid5_ls to 9 stripes
+_reshape_layout raid5_ls 10 $vg $lv1 --stripes 9
+
+# Convert raid5_ls to 14 stripes
+_reshape_layout raid5_ls 15 $vg $lv1 --stripes 14
+
+# Convert raid5_ls to 63 stripes
+_reshape_layout raid5_ls 64 $vg $lv1 --stripes 63
+
+# Convert raid5_ls back to 27 stripes
+_reshape_layout raid5_ls 64 $vg $lv1 --stripes 27 --force
+_reshape_layout raid5_ls 28 $vg $lv1 --stripes 27
+
+# Convert raid5_ls back to 4 stripes
+_reshape_layout raid5_ls 28 $vg $lv1 --stripes 4 --force
+_reshape_layout raid5_ls 5 $vg $lv1 --stripes 4
+
+# Convert raid5_ls back to 3 stripes
+_reshape_layout raid5_ls 5 $vg $lv1 --stripes 3 --force
+_reshape_layout raid5_ls 4 $vg $lv1 --stripes 3
+
+# Convert raid5_ls -> raid5_rs
+_reshape_layout raid5_rs 4 $vg $lv1
+
+# Convert raid5_rs -> raid5_la
+_reshape_layout raid5_la 4 $vg $lv1
+
+# Convert raid5_la -> raid5_ra
+_reshape_layout raid5_ra 4 $vg $lv1
+
+# Convert raid5_ra -> raid6_ra_6
+_lvconvert raid6_ra_6 raid6_ra_6 5 $vg $lv1 "4.00m" 1
+
+# Convert raid5_la -> raid6(_zr)
+_reshape_layout raid6 5 $vg $lv1
+
+# Convert raid6(_zr) -> raid6_nc
+_reshape_layout raid6_nc 5 $vg $lv1
+
+# Convert raid6(_nc) -> raid6_nr
+_reshape_layout raid6_nr 5 $vg $lv1
+
+# Convert raid6_nr) -> raid6_rs_6
+_reshape_layout raid6_rs_6 5 $vg $lv1
+
+# Convert raid6_rs_6 to 5 stripes
+_reshape_layout raid6_rs_6 7 $vg $lv1 --stripes 5
+
+# Convert raid6_rs_6 to 4 stripes
+_reshape_layout raid6_rs_6 7 $vg $lv1 --stripes 4 --force
+_reshape_layout raid6_rs_6 6 $vg $lv1 --stripes 4
+check lv_first_seg_field $vg/$lv1 stripesize "256.00k"
+
+# Convert raid6_rs_6 to raid6_n_6
+_reshape_layout raid6_n_6 6 $vg $lv1
+
+# Convert raid6_n_6 -> striped
+_lvconvert striped striped 4 $vg $lv1
+check lv_first_seg_field $vg/$lv1 stripesize "256.00k"
+
+# Convert striped -> raid10(_near)
+_lvconvert raid10 raid10 8 $vg $lv1
+
+# Convert raid10 to 10 stripes and 64K stripesize
+# FIXME: change once we support odd numbers of raid10 stripes
+not _reshape_layout raid10 9 $vg $lv1 --stripes 9 --stripesize 64K
+_reshape_layout raid10 10 $vg $lv1 --stripes 10 --stripesize 64K
+check lv_first_seg_field $vg/$lv1 stripesize "64.00k"
+
+# Convert raid6_n_6 -> striped
+_lvconvert striped striped 5 $vg $lv1
+check lv_first_seg_field $vg/$lv1 stripesize "64.00k"
+
+vgremove -ff $vg
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2574d3257ad41cad…
Commit: 2574d3257ad41cad8dcbad3332774172e86f05da
Parent: 64a2fad5d6c65e81269251408dff10854f0ace7e
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 05:00:55 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: allow regionsize on upconvert from linear
Allow to provide regionsize with "lvconvert -m1 -R N " on
upconverts from linear and on N -> M raid1 leg conversions.
Resolves: rhbz1394427
---
lib/metadata/metadata-exported.h | 1 +
lib/metadata/raid_manip.c | 13 ++++++++++---
tools/lvconvert.c | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 11fb247..376fee9 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -1213,6 +1213,7 @@ int lv_is_raid_with_tracking(const struct logical_volume *lv);
uint32_t lv_raid_image_count(const struct logical_volume *lv);
int lv_raid_change_image_count(struct logical_volume *lv,
uint32_t new_count,
+ uint32_t new_region_size,
struct dm_list *allocate_pvs);
int lv_raid_split(struct logical_volume *lv, const char *split_name,
uint32_t new_count, struct dm_list *splittable_pvs);
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index e21e6cc..ab0bfab 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -2866,11 +2866,11 @@ static int _raid_extract_images(struct logical_volume *lv,
display_lvname(lv),
display_lvname(seg_lv(seg, s)));
- log_error("Try removing the PV list and rerun"
+ log_error("Try removing the PV list and rerun."
" the command.");
return 0;
}
- log_debug("LVs with error segments to be removed: %s %s.",
+ log_debug("LVs with error segments to be removed: %s %s",
display_lvname(seg_metalv(seg, s)),
display_lvname(seg_lv(seg, s)));
} else {
@@ -3013,8 +3013,15 @@ static int _lv_raid_change_image_count(struct logical_volume *lv, uint32_t new_c
}
int lv_raid_change_image_count(struct logical_volume *lv, uint32_t new_count,
- struct dm_list *allocate_pvs)
+ const uint32_t new_region_size, struct dm_list *allocate_pvs)
{
+ struct lv_segment *seg = first_seg(lv);
+
+ if (new_region_size) {
+ seg->region_size = new_region_size;
+ _check_and_adjust_region_size(lv);
+ }
+
return _lv_raid_change_image_count(lv, new_count, allocate_pvs, NULL, 1, 0);
}
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index abec04a..0db10cb 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1359,7 +1359,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
DEFAULT_RAID1_MAX_IMAGES, lp->segtype->name, display_lvname(lv));
return 0;
}
- if (!lv_raid_change_image_count(lv, image_count, /* lp->region_size, */ lp->pvh))
+ if (!lv_raid_change_image_count(lv, image_count, lp->region_size, lp->pvh))
return_0;
log_print_unless_silent("Logical volume %s successfully converted.",
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=64a2fad5d6c65e81…
Commit: 64a2fad5d6c65e81269251408dff10854f0ace7e
Parent: 34caf8317243b3b30e6fc858b4440ebf3ffb8810
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 04:41:46 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert/lvcreate: raise maximum number of raid images
Because of contraints in renaming shifted rimage/rmeta LV names
the current RaidLV limit is a maximum of 10 SubLV pairs.
With the previous introduction of reshaping infratructure that
constriant got removed.
Kernel supports 253 since dm-raid target 1.9.0, older kernels 64.
Raise the maximum number of RaidLV rimage/rmeta pairs to 64.
If we want to raise past 64, we have to introdce a check for
the kernel supporting it in lvcreate/lvconvert.
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/config/defaults.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/config/defaults.h b/lib/config/defaults.h
index db78f0c..5554c9c 100644
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -71,8 +71,8 @@
* FIXME: Increase these to 64 and further to the MD maximum
* once the SubLVs split and name shift got enhanced
*/
-#define DEFAULT_RAID1_MAX_IMAGES 10
-#define DEFAULT_RAID_MAX_IMAGES 10
+#define DEFAULT_RAID1_MAX_IMAGES 64
+#define DEFAULT_RAID_MAX_IMAGES 64
#define DEFAULT_ALLOCATION_STRIPE_ALL_DEVICES 0 /* Don't stripe across all devices if not -i/--stripes given */
#define DEFAULT_RAID_FAULT_POLICY "warn"
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=34caf8317243b3b3…
Commit: 34caf8317243b3b30e6fc858b4440ebf3ffb8810
Parent: f79bd30a8be0d189c417a76d1ca6b64f70a8832e
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 04:36:03 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces the changes to call the reshaping infratructure
from lv_raid_convert().
Changes:
- add reshaping calls from lv_raid_convert()
- add command definitons for reshaping to tools/command-lines.in
- fix raid_rimage_extents()
- add 2 new test scripts lvconvert-raid-reshape-linear_to_striped.sh
and lvconvert-raid-reshape-striped_to_linear.sh to test
the linear <-> striped multi-step conversions
- add lvconvert-raid-reshape.sh reshaping tests
- enhance lvconvert-raid-takeover.sh with new raid10 tests
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/config/defaults.h | 2 +-
lib/metadata/raid_manip.c | 50 +++++++++++++++++++++------------
test/lib/aux.sh | 2 +-
test/lib/check.sh | 13 +++++++-
test/lib/get.sh | 5 +++
test/shell/lvconvert-raid-takeover.sh | 11 +++++--
tools/command-lines.in | 29 +++++++++++++++++++
7 files changed, 87 insertions(+), 25 deletions(-)
diff --git a/lib/config/defaults.h b/lib/config/defaults.h
index 26bbc69..db78f0c 100644
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -72,7 +72,7 @@
* once the SubLVs split and name shift got enhanced
*/
#define DEFAULT_RAID1_MAX_IMAGES 10
-#define DEFAULT_RAID_MAX_IMAGES 64
+#define DEFAULT_RAID_MAX_IMAGES 10
#define DEFAULT_ALLOCATION_STRIPE_ALL_DEVICES 0 /* Don't stripe across all devices if not -i/--stripes given */
#define DEFAULT_RAID_FAULT_POLICY "warn"
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index c465bd4..e21e6cc 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -1135,7 +1135,7 @@ uint32_t raid_rimage_extents(const struct segment_type *segtype,
uint64_t r;
if (!extents ||
- segtype_is_striped_raid(segtype))
+ !segtype_is_striped_raid(segtype))
return extents;
r = extents;
@@ -2111,7 +2111,6 @@ static int _post_raid_dummy(struct logical_volume *lv, void *data)
* In case of disk addition, any PVs listed in mandatory
* @allocate_pvs will be used for allocation of new stripes.
*/
-__attribute__ ((__unused__))
static int _raid_reshape(struct logical_volume *lv,
const struct segment_type *new_segtype,
int yes, int force,
@@ -2289,7 +2288,6 @@ static int _raid_reshape(struct logical_volume *lv,
* 2 -> prohibited reshape request
* 3 -> allowed region size change request
*/
-__attribute__ ((__unused__))
static int _reshape_requested(const struct logical_volume *lv, const struct segment_type *segtype,
const int data_copies, const uint32_t region_size,
const uint32_t stripes, const uint32_t stripe_size)
@@ -5842,8 +5840,10 @@ int lv_raid_convert(struct logical_volume *lv,
uint32_t stripes, stripe_size;
uint32_t new_image_count = seg->area_count;
uint32_t region_size = new_region_size;
+ uint32_t data_copies = seg->data_copies;
takeover_fn_t takeover_fn;
+ new_segtype = new_segtype ? : seg->segtype;
if (!new_segtype) {
log_error(INTERNAL_ERROR "New segtype not specified.");
return 0;
@@ -5853,33 +5853,47 @@ int lv_raid_convert(struct logical_volume *lv,
/* FIXME Ensure caller does *not* set wrong default value! */
/* Define new stripe size if not passed in */
- stripe_size = new_stripe_size ? : seg->stripe_size;
+ stripe_size = new_stripe_size_supplied ? new_stripe_size : seg->stripe_size;
if (segtype_is_striped(new_segtype))
- new_image_count = stripes;
+ new_image_count = stripes ? : seg->area_count;
- if (segtype_is_raid(new_segtype) && !_check_max_raid_devices(new_image_count))
+ if (!_check_max_raid_devices(new_image_count))
return_0;
- /* Change RAID region size */
+ region_size = new_region_size ? : seg->region_size;
+ region_size = region_size ? : get_default_region_size(lv->vg->cmd);
+
/*
- * FIXME: workaround with new_region_size until the
- * cli validation patches got merged when we'll change
- * the API to have new_region_size_supplied to check for.
+ * reshape of capable raid type requested
*/
- if (new_region_size) {
- if (new_segtype == seg->segtype &&
- new_region_size != seg->region_size &&
- seg_is_raid(seg) && !seg_is_any_raid0(seg))
- return _region_size_change_requested(lv, yes, new_region_size);
- } else
- region_size = seg->region_size ? : get_default_region_size(lv->vg->cmd);
+ switch (_reshape_requested(lv, new_segtype, data_copies, region_size, stripes, stripe_size)) {
+ case 0:
+ break;
+ case 1:
+ if (!_raid_reshape(lv, new_segtype, yes, force,
+ data_copies, region_size,
+ stripes, stripe_size, allocate_pvs)) {
+ log_error("Reshape request failed on LV %s.", display_lvname(lv));
+ return 0;
+ }
+
+ return 1;
+ case 2:
+ log_error("Invalid conversion request on %s.", display_lvname(lv));
+ /* Error if we got here with stripes and/or stripe size change requested */
+ return 0;
+ default:
+ log_error(INTERNAL_ERROR "_reshape_requested failed.");
+ return 0;
+ }
/*
* Check acceptible options mirrors, region_size,
* stripes and/or stripe_size have been provided.
*/
- if (!_conversion_options_allowed(seg, &new_segtype, yes, 0 /* Takeover */, 0 /*new_data_copies*/, new_region_size,
+ if (!_conversion_options_allowed(seg, &new_segtype, yes,
+ 0 /* Takeover */, 0 /*new_data_copies*/, new_region_size,
new_stripes, new_stripe_size_supplied))
return _log_possible_conversion_types(lv, new_segtype);
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 9779358..b0e6556 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -1317,7 +1317,7 @@ udev_wait() {
wait_for_sync() {
local i
for i in {1..100} ; do
- check in_sync $1 $2 && return
+ check in_sync $1 $2 $3 && return
sleep .2
done
diff --git a/test/lib/check.sh b/test/lib/check.sh
index 916d2df..64812fb 100644
--- a/test/lib/check.sh
+++ b/test/lib/check.sh
@@ -178,7 +178,7 @@ linear() {
$(lvl $lv -o+devices)
}
-# in_sync <VG> <LV>
+# in_sync <VG> <LV> <ignore 'a'>
# Works for "mirror" and "raid*"
in_sync() {
local a
@@ -187,8 +187,11 @@ in_sync() {
local type
local snap=""
local lvm_name="$1/$2"
+ local ignore_a="$3"
local dm_name=$(echo $lvm_name | sed s:-:--: | sed s:/:-:)
+ [ -z "$ignore_a" ] && ignore_a=0
+
a=( $(dmsetup status $dm_name) ) || \
die "Unable to get sync status of $1"
@@ -225,7 +228,7 @@ in_sync() {
return 1
fi
- [[ ${a[$(($idx - 1))]} =~ a ]] && \
+ [[ ${a[$(($idx - 1))]} =~ a ]] && [ $ignore_a -eq 0 ] && \
die "$lvm_name ($type$snap) in-sync, but 'a' characters in health status"
echo "$lvm_name ($type$snap) is in-sync \"${a[@]}\""
@@ -310,6 +313,12 @@ lv_field() {
die "lv_field: lv=$1, field=\"$2\", actual=\"$actual\", expected=\"$3\""
}
+lv_first_seg_field() {
+ local actual=$(get lv_first_seg_field "$1" "$2" "${@:4}")
+ test "$actual" = "$3" || \
+ die "lv_field: lv=$1, field=\"$2\", actual=\"$actual\", expected=\"$3\""
+}
+
lvh_field() {
local actual=$(get lvh_field "$1" "$2" "${@:4}")
test "$actual" = "$3" || \
diff --git a/test/lib/get.sh b/test/lib/get.sh
index f650417..0a8c943 100644
--- a/test/lib/get.sh
+++ b/test/lib/get.sh
@@ -42,6 +42,11 @@ lv_field() {
trim_ "$r"
}
+lv_first_seg_field() {
+ local r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1" | head -1)
+ trim_ "$r"
+}
+
lvh_field() {
local r=$(lvs -H --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
diff --git a/test/shell/lvconvert-raid-takeover.sh b/test/shell/lvconvert-raid-takeover.sh
index aa41dba..5d8f858 100644
--- a/test/shell/lvconvert-raid-takeover.sh
+++ b/test/shell/lvconvert-raid-takeover.sh
@@ -117,8 +117,7 @@ fsck -fn "$DM_DEV_DIR/$vg/$lv1"
lvconvert -m 4 -R 128K $vg/$lv1
check lv_field $vg/$lv1 segtype "raid1"
check lv_field $vg/$lv1 stripes 5
-# FIXME: once lv_raid_chanage_image_count() supports region_size changes
-not check lv_field $vg/$lv1 regionsize "128.00k"
+check lv_field $vg/$lv1 regionsize "128.00k"
fsck -fn "$DM_DEV_DIR/$vg/$lv1"
aux wait_for_sync $vg $lv1
fsck -fn "$DM_DEV_DIR/$vg/$lv1"
@@ -258,7 +257,13 @@ _lvconvert raid0 raid0 3 $vg $lv1
# Convert raid0 -> raid10
_lvconvert raid10 raid10 6 $vg $lv1
-# Convert raid10 -> raid0
+# Convert raid10 -> raid0_meta
+_lvconvert raid0_meta raid0_meta 3 $vg $lv1
+
+# Convert raid0_meta -> raid5
+_lvconvert raid5_n raid5_n 4 $vg $lv1
+
+# Convert raid5_n -> raid0_meta
_lvconvert raid0_meta raid0_meta 3 $vg $lv1
# Convert raid0_meta -> raid10
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 348e7a4..c3d684e 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -345,6 +345,13 @@ ID: lvconvert_raid_types
DESC: Convert LV to raid.
RULE: all not lv_is_locked lv_is_pvmove
+lvconvert --type raid LV_raid
+OO: OO_LVCONVERT_RAID, OO_LVCONVERT
+ID: lvconvert_raid_types
+DESC: Convert raid LV to different layout algorithm.
+RULE: all not lv_is_locked lv_is_pvmove
+RULE: all not LV_raid0 LV_raid1
+
lvconvert --mirrors SNumber LV
OO: OO_LVCONVERT_RAID, OO_LVCONVERT, --mirrorlog MirrorLog
OP: PV ...
@@ -352,6 +359,21 @@ ID: lvconvert_raid_types
DESC: Convert LV to raid1 or mirror, or change number of mirror images.
RULE: all not lv_is_locked lv_is_pvmove
+lvconvert --stripes_long SNumber LV_raid
+OO: OO_LVCONVERT_RAID, OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_raid_types
+DESC: Convert raid LV to change number of stripe images.
+RULE: all not lv_is_locked lv_is_pvmove
+RULE: all not LV_raid0 LV_raid1
+
+lvconvert --stripesize SizeKB LV_raid
+OO: OO_LVCONVERT_RAID, OO_LVCONVERT
+ID: lvconvert_raid_types
+DESC: Convert raid LV to change the stripe size.
+RULE: all not lv_is_locked lv_is_pvmove
+RULE: all not LV_raid0 LV_raid1
+
lvconvert --regionsize RegionSize LV_raid
OO: OO_LVCONVERT
ID: lvconvert_change_region_size
@@ -359,6 +381,13 @@ DESC: Change the region size of an LV.
RULE: all not lv_is_locked lv_is_pvmove
RULE: all not LV_raid0
+lvconvert LV_mirror_raid
+OO: OO_LVCONVERT
+ID: lvconvert_raid_types
+DESC: Remove out-of-place reshape space
+RULE: all not lv_is_locked lv_is_pvmove
+RULE: all not LV_raid0 LV_raid1
+
---
# lvconvert raid-related utilities
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f79bd30a8be0d189…
Commit: f79bd30a8be0d189c417a76d1ca6b64f70a8832e
Parent: 1784cc990e6941e93cfcf1204526cec75d287a89
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 04:00:17 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces more local infrastructure to raid_manip.c
used by followup patches.
Change:
- allow raid_rimage_extents() to calculate raid10
- remove an __unused__ attribute
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 40bc45e..c465bd4 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -1135,8 +1135,7 @@ uint32_t raid_rimage_extents(const struct segment_type *segtype,
uint64_t r;
if (!extents ||
- segtype_is_mirror(segtype) ||
- segtype_is_raid1(segtype))
+ segtype_is_striped_raid(segtype))
return extents;
r = extents;
@@ -1576,7 +1575,6 @@ static int _lv_free_reshape_space_with_status(struct logical_volume *lv, enum al
return 1;
}
-__attribute__ ((__unused__))
static int _lv_free_reshape_space(struct logical_volume *lv)
{
return _lv_free_reshape_space_with_status(lv, NULL);
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1784cc990e6941e9…
Commit: 1784cc990e6941e93cfcf1204526cec75d287a89
Parent: 2d74de3f05d44b2ac5f651e49d29878731a114a1
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 03:56:10 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces more local infrastructure to raid_manip.c
used by followup patches.
Change:
- add missing raid1 <-> raid5 conversions to support
linear <-> raid5 <-> raid0(_meta)/striped conversions
- rename related new takeover functions to
_takeover_from_raid1_to_raid5 and _takeover_from_raid5_to_raid1,
because a reshape to > 2 legs is only possible with
raid5 layout
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 13 +++++++++----
lib/metadata/takeover_matrix.h | 8 ++++----
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index fc02d3d..40bc45e 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -5323,9 +5323,11 @@ static int _takeover_from_raid1_to_raid10(TAKEOVER_FN_ARGS)
return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
}
-static int _takeover_from_raid1_to_raid45(TAKEOVER_FN_ARGS)
+static int _takeover_from_raid1_to_raid5(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count /* unchanged new_image_count */,
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid1_to_striped(TAKEOVER_FN_ARGS)
@@ -5357,9 +5359,12 @@ static int _takeover_from_raid45_to_raid0_meta(TAKEOVER_FN_ARGS)
1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
-static int _takeover_from_raid45_to_raid1(TAKEOVER_FN_ARGS)
+
+static int _takeover_from_raid5_to_raid1(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count,
+ 2 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid45_to_raid54(TAKEOVER_FN_ARGS)
diff --git a/lib/metadata/takeover_matrix.h b/lib/metadata/takeover_matrix.h
index bb3e6cb..8ac2f75 100644
--- a/lib/metadata/takeover_matrix.h
+++ b/lib/metadata/takeover_matrix.h
@@ -58,13 +58,13 @@
#define r1__r0m _takeover_from_raid1_to_raid0_meta
#define r1__r1 _takeover_from_raid1_to_raid1
#define r1__r10 _takeover_from_raid1_to_raid10
-#define r1__r45 _takeover_from_raid1_to_raid45
+#define r1__r5 _takeover_from_raid1_to_raid5
#define r1__str _takeover_from_raid1_to_striped
#define r45_lin _takeover_from_raid45_to_linear
#define r45_mir _takeover_from_raid45_to_mirrored
#define r45_r0 _takeover_from_raid45_to_raid0
#define r45_r0m _takeover_from_raid45_to_raid0_meta
-#define r45_r1 _takeover_from_raid45_to_raid1
+#define r5_r1 _takeover_from_raid5_to_raid1
#define r45_r54 _takeover_from_raid45_to_raid54
#define r45_r6 _takeover_from_raid45_to_raid6
#define r45_str _takeover_from_raid45_to_striped
@@ -109,8 +109,8 @@ static takeover_fn_t _takeover_fns[][11] = {
/* mirror */ { X , X , N , mir_r0, mir_r0m, mir_r1, mir_r45, X , mir_r10, X , X },
/* raid0 */ { r0__lin, r0__str, r0__mir, N , r0__r0m, r0__r1, r0__r45, r0__r6, r0__r10, X , X },
/* raid0_meta */ { r0m_lin, r0m_str, r0m_mir, r0m_r0, N , r0m_r1, r0m_r45, r0m_r6, r0m_r10, X , X },
- /* raid1 */ { r1__lin, r1__str, r1__mir, r1__r0, r1__r0m, r1__r1, r1__r45, X , r1__r10, X , X },
- /* raid4/5 */ { r45_lin, r45_str, r45_mir, r45_r0, r45_r0m, r45_r1, r45_r54, r45_r6, X , X , X },
+ /* raid1 */ { r1__lin, r1__str, r1__mir, r1__r0, r1__r0m, r1__r1, r1__r5, X , r1__r10, X , X },
+ /* raid4/5 */ { r45_lin, r45_str, r45_mir, r45_r0, r45_r0m, r5_r1 , r45_r54, r45_r6, X , X , X },
/* raid6 */ { X , r6__str, X , r6__r0, r6__r0m, X , r6__r45, X , X , X , X },
/* raid10 */ { r10_lin, r10_str, r10_mir, r10_r0, r10_r0m, r10_r1, X , X , X , X , X },
/* raid01 */ // { X , r01_str, X , X , X , X , X , X , r01_r10, r01_r01, X },
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2d74de3f05d44b2a…
Commit: 2d74de3f05d44b2ac5f651e49d29878731a114a1
Parent: 34a8d3c2fdc9da2bb1974781070d01f901862b9a
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 03:46:14 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces more local infrastructure to raid_manip.c
used by followup patches.
Change:
- enhance _clear_meta_lvs() to support raid0 allowing
raid0_meta -> raid10 conversions to succeed by clearing
the raid0 rmeta images or the kernel will fail because
of discovering reordered raid devices
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 2b5559a..fc02d3d 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -4579,6 +4579,7 @@ static int _raid1_to_mirrored_wrapper(TAKEOVER_FN_ARGS)
* order to wipe them then reattach and set back to raid0_meta.
*
* Same applies to raid4 <-> raid5.
+ * Same applies to raid10 -> raid0_meta.
*/
static int _clear_meta_lvs(struct logical_volume *lv)
{
@@ -4588,11 +4589,11 @@ static int _clear_meta_lvs(struct logical_volume *lv)
const struct segment_type *tmp_segtype;
struct dm_list meta_lvs;
struct lv_list *lvl_array, *lvl;
- int is_raid4_or_5N = seg_is_raid4(seg) || seg_is_raid5_n(seg);
+ int is_raid45n10 = seg_is_raid4(seg) || seg_is_raid5_n(seg) || seg_is_raid10(seg);
/* Reject non-raid0_meta/raid4/raid5_n segment types cautiously */
if (!seg->meta_areas ||
- (!seg_is_raid0_meta(seg) && !is_raid4_or_5N))
+ (!seg_is_raid0_meta(seg) && !is_raid45n10))
return_0;
if (!(lvl_array = dm_pool_alloc(lv->vg->vgmem, seg->area_count * sizeof(*lvl_array))))
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=34a8d3c2fdc9da2b…
Commit: 34a8d3c2fdc9da2bb1974781070d01f901862b9a
Parent: 932db3db535734f03cec973182dcc73adef9d3a5
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 03:37:12 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces more local infrastructure to raid_manip.c
used by followup patches.
Changes:
- enhance _raid45610_to_raid0_or_striped_wrapper() to support
raid5_n with 2 areas to raid1 conversion to allow for
striped/raid0(_meta)/raid4/5/6 -> raid1/linear conversions;
rename it to _takeover_downconvert_wrapper to discontinue the
illegible function name
- enhance _striped_or_raid0_to_raid45610_wrapper() to support
raid1 with 2 areas to raid5* conversions to allow for
linear/raid1 -> striped/raid0(_meta)/raid4/5/6 conversions;
rename it to _takeover_upconvert_wrapper for the same reason
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 258 ++++++++++++++++++++++++++++++++-------------
1 files changed, 183 insertions(+), 75 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 81360d2..2b5559a 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -4748,14 +4748,14 @@ static int _shift_parity_dev(struct lv_segment *seg)
return 1;
}
-/* raid456 -> raid0* / striped */
+/* raid45610 -> raid0* / stripe, raid5_n -> raid4 */
static int _raid45_to_raid54_wrapper(TAKEOVER_FN_ARGS);
-static int _raid45610_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
+static int _takeover_downconvert_wrapper(TAKEOVER_FN_ARGS)
{
int rename_sublvs = 0;
struct lv_segment *seg = first_seg(lv);
struct dm_list removal_lvs;
- uint32_t region_size = seg->region_size;
+ char res_str[30];
dm_list_init(&removal_lvs);
@@ -4766,10 +4766,35 @@ static int _raid45610_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
return 0;
}
- if (!yes && yes_no_prompt("Are you sure you want to convert \"%s\" LV %s to \"%s\" "
- "type losing %s resilience? [y/n]: ",
- lvseg_name(seg), display_lvname(lv), new_segtype->name,
- segtype_is_striped(new_segtype) ? "all" : "some") == 'n') {
+ if (seg_is_any_raid10(seg) && (seg->area_count % seg->data_copies)) {
+ log_error("Can't convert %s LV %s to %s with odd number of stripes.",
+ lvseg_name(seg), display_lvname(lv), new_segtype->name);
+ return 0;
+ }
+
+ if (seg_is_any_raid5(seg) &&
+ segtype_is_raid1(new_segtype)) {
+ if (seg->area_count != 2) {
+ log_error("Can't convert %s LV %s to %s with != 2 legs.",
+ lvseg_name(seg), display_lvname(lv), new_segtype->name);
+ return 0;
+ }
+ if (seg->area_count != new_image_count) {
+ log_error(INTERNAL_ERROR "Bogus new_image_count converting %s LV %s to %s.",
+ lvseg_name(seg), display_lvname(lv), new_segtype->name);
+ return 0;
+ }
+ }
+
+ if (seg->area_count > 2) {
+ if (dm_snprintf(res_str, sizeof(res_str), " losing %s resilience",
+ segtype_is_striped(new_segtype) ? "all" : "some") < 0)
+ return_0;
+ } else
+ *res_str = '\0';
+
+ if (!yes && yes_no_prompt("Are you sure you want to convert \"%s\" LV %s to \"%s\" type%s? [y/n]: ",
+ lvseg_name(seg), display_lvname(lv), new_segtype->name, res_str) == 'n') {
log_error("Logical volume %s NOT converted to \"%s\"",
display_lvname(lv), new_segtype->name);
return 0;
@@ -4779,6 +4804,9 @@ static int _raid45610_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
if (!archive(lv->vg))
return_0;
+ if (!_lv_free_reshape_space(lv))
+ return_0;
+
/*
* raid4 (which actually gets mapped to raid5/dedicated first parity disk)
* needs shifting of SubLVs to move the parity SubLV pair in the first area
@@ -4790,28 +4818,35 @@ static int _raid45610_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
if (!_shift_parity_dev(seg))
return 0;
- if (segtype_is_any_raid0(new_segtype) &&
- !(rename_sublvs = _rename_area_lvs(lv, "_"))) {
- log_error("Failed to rename %s LV %s MetaLVs.", lvseg_name(seg), display_lvname(lv));
- return 0;
- }
} else if (seg_is_raid10_near(seg)) {
- log_debug_metadata("Reordering areas for raid10 -> raid0 takeover");
+ log_debug_metadata("Reordering areas for raid10 -> raid0 takeover.");
if (!_reorder_raid10_near_seg_areas(seg, reorder_from_raid10_near))
return 0;
}
- /* Remove meta and data LVs requested */
- if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, &removal_lvs, 0, 0))
+ if (segtype_is_any_raid0(new_segtype) &&
+ !(rename_sublvs = _rename_area_lvs(lv, "_"))) {
+ log_error("Failed to rename %s LV %s MetaLVs.", lvseg_name(seg), display_lvname(lv));
return 0;
+ }
+
+ /* Remove meta and data LVs requested */
+ if (new_image_count != seg->area_count) {
+ log_debug_metadata("Removing %" PRIu32 " component LV pair(s) to %s.",
+ lv_raid_image_count(lv) - new_image_count,
+ display_lvname(lv));
+ if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, &removal_lvs, 0, 0))
+ return 0;
+
+ seg->area_count = new_image_count;
+ }
/* FIXME Hard-coded raid4/5/6 to striped/raid0 */
if (segtype_is_striped_target(new_segtype) || segtype_is_any_raid0(new_segtype)) {
- seg->area_len = seg->extents_copied = seg->area_len / seg->area_count;
+ seg->area_len = seg->extents_copied = seg->len / seg->area_count;
+ seg->region_size = 0;
if (!(seg->segtype = get_segtype_from_flag(lv->vg->cmd, SEG_RAID0_META)))
return_0;
-
- region_size = 0;
}
if (segtype_is_striped_target(new_segtype)) {
@@ -4827,12 +4862,18 @@ static int _raid45610_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
} else
seg->segtype = new_segtype;
- seg->region_size = new_region_size ?: region_size;
+ if (seg_is_raid1(seg))
+ seg->stripe_size = 0;
if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, 0, &removal_lvs, NULL))
return_0;
if (rename_sublvs) {
+ /* Got to clear the meta lvs from raid10 content to be able to convert to e.g. raid6 */
+ if (segtype_is_raid0_meta(new_segtype) &&
+ !_clear_meta_lvs(lv))
+ return_0;
+
if (!_rename_area_lvs(lv, NULL)) {
log_error("Failed to rename %s LV %s MetaLVs.", lvseg_name(seg), display_lvname(lv));
return 0;
@@ -4942,8 +4983,8 @@ static int _striped_to_raid0_wrapper(struct logical_volume *lv,
return 1;
}
-/* Helper: striped/raid0* -> raid4/5/6/10, raid45 -> raid6 wrapper */
-static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
+/* Helper: striped/raid0/raid0_meta/raid1 -> raid4/5/6/10, raid45 -> raid6 wrapper */
+static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
{
uint32_t extents_copied, region_size, seg_len, stripe_size;
struct lv_segment *seg = first_seg(lv);
@@ -4961,10 +5002,40 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
return 0;
}
+ if (seg_is_any_raid5(seg) && segtype_is_any_raid6(new_segtype) && seg->area_count < 4) {
+ log_error("Minimum of 3 stripes needed for conversion from %s to %s.",
+ lvseg_name(seg), new_segtype->name);
+ return 0;
+ }
+
+ if (seg_is_raid1(seg)) {
+ if (seg->area_count != 2) {
+ log_error("Can't convert %s LV %s to %s with != 2 legs.",
+ lvseg_name(seg), display_lvname(lv), new_segtype->name);
+ return 0;
+ }
+ if (!segtype_is_any_raid5(new_segtype)) {
+ log_error("Can't convert %s LV %s to %s.",
+ lvseg_name(seg), display_lvname(lv), new_segtype->name);
+ return 0;
+ }
+ if (seg->area_count != new_image_count) {
+ log_error(INTERNAL_ERROR "Bogus new_image_count converting %s LV %s to %s.",
+ lvseg_name(seg), display_lvname(lv), new_segtype->name);
+ return 0;
+ }
+
+ if (!new_stripe_size)
+ new_stripe_size = 128;
+ }
+
/* Archive metadata */
if (!archive(lv->vg))
return_0;
+ if (!_lv_free_reshape_space(lv))
+ return_0;
+
/* This helper can be used to convert from striped/raid0* -> raid10 too */
if (seg_is_striped_target(seg)) {
log_debug_metadata("Converting LV %s from %s to %s.",
@@ -4979,15 +5050,14 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
if (!_raid0_add_or_remove_metadata_lvs(lv, 1 /* update_and_reload */, allocate_pvs, NULL))
return 0;
/* raid0_meta -> raid4 needs clearing of MetaLVs in order to avoid raid disk role change issues in the kernel */
- } else if (segtype_is_raid4(new_segtype) &&
- !_clear_meta_lvs(lv))
+ }
+
+ if (seg_is_raid0_meta(seg) &&
+ segtype_is_raid4(new_segtype) &&
+ !_clear_meta_lvs(lv))
return_0;
- /* Add the additional component LV pairs */
- log_debug_metadata("Adding %" PRIu32 " component LV pair(s) to %s.",
- new_image_count - lv_raid_image_count(lv),
- display_lvname(lv));
extents_copied = seg->extents_copied;
region_size = seg->region_size;
seg_len = seg->len;
@@ -4998,11 +5068,21 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
return_0;
seg->area_len = seg_lv(seg, 0)->le_count;
lv->le_count = seg->len = seg->area_len * seg->area_count;
+ seg->area_len = seg->len;
seg->extents_copied = seg->region_size = 0;
}
- if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, NULL, 0, 1))
- return 0;
+ /* Add the additional component LV pairs */
+ if (new_image_count != seg->area_count) {
+ log_debug_metadata("Adding %" PRIu32 " component LV pair(s) to %s.",
+ new_image_count - lv_raid_image_count(lv),
+ display_lvname(lv));
+ if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, NULL, 0, 1))
+ return 0;
+
+ seg = first_seg(lv);
+ }
+
if (segtype_is_raid4(new_segtype) &&
(!_shift_parity_dev(seg) ||
@@ -5010,25 +5090,40 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
log_error("Can't convert %s to %s.", display_lvname(lv), new_segtype->name);
return 0;
} else if (segtype_is_raid10_near(new_segtype)) {
- log_debug_metadata("Reordering areas for raid0 -> raid10 takeover");
+ uint32_t s;
+
+ /* FIXME: raid10 ; needs to change once more than 2 data copies! */
+ seg->data_copies = 2;
+
+ log_debug_metadata("Reordering areas for raid0 -> raid10 takeover.");
if (!_reorder_raid10_near_seg_areas(seg, reorder_to_raid10_near))
return 0;
+ /* Set rebuild flags accordingly */
+ for (s = 0; s < seg->area_count; s++) {
+ seg_lv(seg, s)->status &= ~LV_REBUILD;
+ seg_metalv(seg, s)->status &= ~LV_REBUILD;
+ if (s % seg->data_copies)
+ seg_lv(seg, s)->status |= LV_REBUILD;
+ }
+
}
seg->segtype = new_segtype;
seg->region_size = new_region_size ?: region_size;
+ seg->stripe_size = new_stripe_size ?: stripe_size;
+ seg->extents_copied = extents_copied;
- /* FIXME Hard-coded raid0 to raid4/5/6 */
- seg->stripe_size = stripe_size;
+ /* FIXME Hard-coded to raid4/5/6/10 */
lv->le_count = seg->len = seg->area_len = seg_len;
- seg->extents_copied = extents_copied;
_check_and_adjust_region_size(lv);
log_debug_metadata("Updating VG metadata and reloading %s LV %s.",
lvseg_name(seg), display_lvname(lv));
- if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, 0, NULL, NULL))
- return_0;
+ if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, 0, &removal_lvs,
+ _post_raid_dummy, NULL,
+ _pre_raid_add_legs, NULL))
+ return 0;
if (segtype_is_raid4(new_segtype)) {
/* We had to rename SubLVs because of collision free shifting, rename back... */
@@ -5118,23 +5213,23 @@ static int _takeover_from_raid0_to_raid1(TAKEOVER_FN_ARGS)
static int _takeover_from_raid0_to_raid10(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
- first_seg(lv)->area_count * 2 /* new_image_count */,
- 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count * 2 /* new_image_count */,
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_to_raid45(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
- first_seg(lv)->area_count + 1 /* new_image_count */,
- 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count + 1 /* new_image_count */,
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_to_raid6(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
- first_seg(lv)->area_count + 2 /* new_image_count */,
- 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count + 2 /* new_image_count */,
+ 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_to_striped(TAKEOVER_FN_ARGS)
@@ -5170,21 +5265,21 @@ static int _takeover_from_raid0_meta_to_raid1(TAKEOVER_FN_ARGS)
static int _takeover_from_raid0_meta_to_raid10(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count * 2 /* new_image_count */,
2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_meta_to_raid45(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count + 1 /* new_image_count */,
2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_meta_to_raid6(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
first_seg(lv)->area_count + 2 /* new_image_count */,
3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
@@ -5249,12 +5344,16 @@ static int _takeover_from_raid45_to_mirrored(TAKEOVER_FN_ARGS)
static int _takeover_from_raid45_to_raid0(TAKEOVER_FN_ARGS)
{
- return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1, 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count - 1,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid45_to_raid0_meta(TAKEOVER_FN_ARGS)
{
- return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1, 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count - 1,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid45_to_raid1(TAKEOVER_FN_ARGS)
@@ -5278,38 +5377,44 @@ static int _takeover_from_raid45_to_raid6(TAKEOVER_FN_ARGS)
1 /* data_copies */, 0, 0, 0, allocate_pvs))
return 0;
}
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
- first_seg(lv)->area_count + 1 /* new_image_count */,
- 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count + 1 /* new_image_count */,
+ 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid45_to_striped(TAKEOVER_FN_ARGS)
{
- return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1, 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count - 1,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_raid0(TAKEOVER_FN_ARGS)
{
- return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
- 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count - 2,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_raid0_meta(TAKEOVER_FN_ARGS)
{
- return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
- 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count - 2,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_raid45(TAKEOVER_FN_ARGS)
{
- return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1,
- 2 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count - 1,
+ 2 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_striped(TAKEOVER_FN_ARGS)
{
- return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
- 2 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count - 2,
+ 2 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_striped_to_raid0(TAKEOVER_FN_ARGS)
@@ -5335,22 +5440,22 @@ static int _takeover_from_striped_to_raid0_meta(TAKEOVER_FN_ARGS)
static int _takeover_from_striped_to_raid10(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
- first_seg(lv)->area_count * 2 /* new_image_count */,
- 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count * 2 /* new_image_count */,
+ 2 /* FIXME: variable data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_striped_to_raid45(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count + 1,
- 2 /* data_copies*/, 0, 0, new_region_size, allocate_pvs);
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count + 1,
+ 2 /* data_copies*/, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_striped_to_raid6(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
- first_seg(lv)->area_count + 2 /* new_image_count */,
- 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ return _takeover_upconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count + 2 /* new_image_count */,
+ 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
/*
@@ -5384,8 +5489,9 @@ static int _takeover_from_raid10_to_mirrored(TAKEOVER_FN_ARGS)
static int _takeover_from_raid10_to_raid0(TAKEOVER_FN_ARGS)
{
- return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count / 2,
- 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count / first_seg(lv)->data_copies,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
/*
@@ -5398,8 +5504,9 @@ static int _takeover_from_raid10_to_raid01(TAKEOVER_FN_ARGS)
static int _takeover_from_raid10_to_raid0_meta(TAKEOVER_FN_ARGS)
{
- return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count / 2,
- 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count / first_seg(lv)->data_copies,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid10_to_raid1(TAKEOVER_FN_ARGS)
@@ -5418,8 +5525,9 @@ static int _takeover_from_raid10_to_raid10(TAKEOVER_FN_ARGS)
static int _takeover_from_raid10_to_striped(TAKEOVER_FN_ARGS)
{
- return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count / 2,
- 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _takeover_downconvert_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count / first_seg(lv)->data_copies,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
/*
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=932db3db535734f0…
Commit: 932db3db535734f03cec973182dcc73adef9d3a5
Parent: fe18e5e77a488618510648c7801ea3375ce5aac4
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 03:11:41 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces more local infrastructure to raid_manip.c
used by followup patches.
Changes:
- add missing possible reshape conversions and conversion options
to allow/prohibit changing stripesize or number fo stripes
- enhance setting convenient riad types in reshape conversions
(e.g. raid1 with 2 legs -> radi5_n)
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 149 +++++++++++++++++++++++++++++++++++----------
1 files changed, 117 insertions(+), 32 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index cc074f6..81360d2 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -26,6 +26,7 @@ typedef int (*fn_on_lv_t)(struct logical_volume *lv, void *data);
static int _eliminate_extracted_lvs_optional_write_vg(struct volume_group *vg,
struct dm_list *removal_lvs,
int vg_write_requested);
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*a))
static int _check_restriping(uint32_t new_stripes, struct logical_volume *lv)
{
@@ -4211,37 +4212,68 @@ static struct possible_takeover_reshape_type _possible_takeover_reshape_types[]
{ .current_types = SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6,
.possible_types = SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6,
.current_areas = ~0U,
- .options = ALLOW_REGION_SIZE },
+ .options = ALLOW_REGION_SIZE|ALLOW_STRIPES|ALLOW_STRIPE_SIZE },
+
+ /* Reshape raid5* <-> raid5* */
+ { .current_types = SEG_RAID5_LS|SEG_RAID5_RS|SEG_RAID5_RA|SEG_RAID5_LA|SEG_RAID5_N,
+ .possible_types = SEG_RAID5_LS|SEG_RAID5_RS|SEG_RAID5_RA|SEG_RAID5_LA|SEG_RAID5_N,
+ .current_areas = ~0U,
+ .options = ALLOW_REGION_SIZE|ALLOW_STRIPES|ALLOW_STRIPE_SIZE },
+ /* Reshape raid6* <-> raid6* */
+ { .current_types = SEG_RAID6_ZR|SEG_RAID6_NR|SEG_RAID6_NC|SEG_RAID6_LS_6|\
+ SEG_RAID6_RS_6|SEG_RAID6_RA_6|SEG_RAID6_LA_6|SEG_RAID6_N_6,
+ .possible_types = SEG_RAID6_ZR|SEG_RAID6_NR|SEG_RAID6_NC|SEG_RAID6_LS_6|\
+ SEG_RAID6_RS_6|SEG_RAID6_RA_6|SEG_RAID6_LA_6|SEG_RAID6_N_6,
+ .current_areas = ~0U,
+ .options = ALLOW_REGION_SIZE|ALLOW_STRIPES|ALLOW_STRIPE_SIZE },
/* raid5_ls <-> raid6_ls_6 */
{ .current_types = SEG_RAID5_LS|SEG_RAID6_LS_6,
.possible_types = SEG_RAID5_LS|SEG_RAID6_LS_6,
.current_areas = ~0U,
- .options = ALLOW_REGION_SIZE },
+ .options = ALLOW_REGION_SIZE|ALLOW_STRIPES|ALLOW_STRIPE_SIZE },
/* raid5_rs -> raid6_rs_6 */
{ .current_types = SEG_RAID5_RS|SEG_RAID6_RS_6,
.possible_types = SEG_RAID5_RS|SEG_RAID6_RS_6,
.current_areas = ~0U,
- .options = ALLOW_REGION_SIZE },
+ .options = ALLOW_REGION_SIZE|ALLOW_STRIPES|ALLOW_STRIPE_SIZE },
/* raid5_ls -> raid6_la_6 */
{ .current_types = SEG_RAID5_LA|SEG_RAID6_LA_6,
.possible_types = SEG_RAID5_LA|SEG_RAID6_LA_6,
.current_areas = ~0U,
- .options = ALLOW_REGION_SIZE },
+ .options = ALLOW_REGION_SIZE|ALLOW_STRIPES|ALLOW_STRIPE_SIZE },
/* raid5_ls -> raid6_ra_6 */
{ .current_types = SEG_RAID5_RA|SEG_RAID6_RA_6,
.possible_types = SEG_RAID5_RA|SEG_RAID6_RA_6,
.current_areas = ~0U,
- .options = ALLOW_REGION_SIZE },
+ .options = ALLOW_REGION_SIZE|ALLOW_STRIPES|ALLOW_STRIPE_SIZE },
+
+ /* Reshape raid10 <-> raid10 */
+ { .current_types = SEG_RAID10_NEAR,
+ .possible_types = SEG_RAID10_NEAR,
+ .current_areas = ~0U,
+ .options = ALLOW_REGION_SIZE|ALLOW_STRIPES|ALLOW_STRIPE_SIZE },
/* mirror <-> raid1 with arbitrary number of legs */
{ .current_types = SEG_MIRROR|SEG_RAID1,
.possible_types = SEG_MIRROR|SEG_RAID1,
.current_areas = ~0U,
+ .options = ALLOW_REGION_SIZE|ALLOW_STRIPES|ALLOW_STRIPE_SIZE },
+
+ /* raid1 -> raid5* with 2 legs */
+ { .current_types = SEG_RAID1,
+ .possible_types = SEG_RAID5_LS|SEG_RAID5_RS|SEG_RAID5_RA|SEG_RAID5_LA|SEG_RAID5_N,
+ .current_areas = 2U,
+ .options = ALLOW_REGION_SIZE|ALLOW_STRIPE_SIZE },
+
+ /* raid5* -> raid1 with 2 legs */
+ { .current_types = SEG_RAID5_LS|SEG_RAID5_RS|SEG_RAID5_RA|SEG_RAID5_LA|SEG_RAID5_N,
+ .possible_types = SEG_RAID1,
+ .current_areas = 2U,
.options = ALLOW_REGION_SIZE },
/* END */
@@ -5323,7 +5355,7 @@ static int _takeover_from_striped_to_raid6(TAKEOVER_FN_ARGS)
/*
* Only if we decide to support raid01 at all.
-
+
static int _takeover_from_raid01_to_raid01(TAKEOVER_FN_ARGS)
{
return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
@@ -5437,11 +5469,51 @@ static int _log_prohibited_option(const struct lv_segment *seg_from,
return 1;
}
-/* Change segtype for raid4 <-> raid5 <-> raid6 takeover where necessary. */
-static int _set_convenient_raid456_segtype_to(const struct lv_segment *seg_from,
- const struct segment_type **segtype)
+/*
+ * Find takeover raid flag for segment type flag of @seg
+ */
+/* Segment type flag correspondence for raid5 <-> raid6 conversions */
+static uint64_t _r5_to_r6[][2] = {
+ { SEG_RAID5_LS, SEG_RAID6_LS_6 },
+ { SEG_RAID5_LA, SEG_RAID6_LA_6 },
+ { SEG_RAID5_RS, SEG_RAID6_RS_6 },
+ { SEG_RAID5_RA, SEG_RAID6_RA_6 },
+ { SEG_RAID5_N, SEG_RAID6_N_6 },
+};
+
+
+/* Return segment type flag for raid5 -> raid6 conversions */
+static uint64_t _get_r56_flag(const struct lv_segment *seg, unsigned idx)
+{
+ unsigned elems = ARRAY_SIZE(_r5_to_r6);
+
+ while (elems--)
+ if (seg->segtype->flags & _r5_to_r6[elems][idx])
+ return _r5_to_r6[elems][!idx];
+
+ return 0;
+}
+
+/* Return segment type flag for raid5 -> raid6 conversions */
+static uint64_t _raid_seg_flag_5_to_6(const struct lv_segment *seg)
+{
+ return _get_r56_flag(seg, 0);
+}
+
+/* Return segment type flag for raid6 -> raid5 conversions */
+static uint64_t _raid_seg_flag_6_to_5(const struct lv_segment *seg)
+{
+ return _get_r56_flag(seg, 1);
+}
+
+/* Change segtype for raid4 <-> raid5 <-> raid6 or raid1 <-> raid5 takeover where necessary. */
+static int _set_convenient_raid1456_segtype_to(const struct lv_segment *seg_from,
+ const struct segment_type **segtype,
+ int yes)
{
size_t len = min(strlen((*segtype)->name), strlen(lvseg_name(seg_from)));
+ uint64_t seg_flag;
+ struct cmd_context *cmd = seg_from->lv->vg->cmd;
const struct segment_type *segtype_sav = *segtype;
/* Bail out if same RAID level is requested. */
@@ -5451,54 +5523,66 @@ static int _set_convenient_raid456_segtype_to(const struct lv_segment *seg_from,
/* Striped/raid0 -> raid5/6 */
if (seg_is_striped(seg_from) || seg_is_any_raid0(seg_from)) {
/* If this is any raid5 conversion request -> enforce raid5_n, because we convert from striped */
- if (segtype_is_any_raid5(*segtype) &&
- !segtype_is_raid5_n(*segtype)) {
- if (!(*segtype = get_segtype_from_flag(seg_from->lv->vg->cmd, SEG_RAID5_N)))
- return_0;
+ if (segtype_is_any_raid5(*segtype) && !segtype_is_raid5_n(*segtype)) {
+ seg_flag = SEG_RAID5_N;
goto replaced;
/* If this is any raid6 conversion request -> enforce raid6_n_6, because we convert from striped */
- } else if (segtype_is_any_raid6(*segtype) &&
- !segtype_is_raid6_n_6(*segtype)) {
- if (!(*segtype = get_segtype_from_flag(seg_from->lv->vg->cmd, SEG_RAID6_N_6)))
- return_0;
+ } else if (segtype_is_any_raid6(*segtype) && !segtype_is_raid6_n_6(*segtype)) {
+ seg_flag = SEG_RAID6_N_6;
goto replaced;
}
+ /* raid1 -> raid5_n with 2 areas */
+ } else if (seg_is_raid1(seg_from) && seg_from->area_count == 2 &&
+ segtype_is_any_raid5(*segtype) && !segtype_is_raid5_n(*segtype)) {
+ seg_flag = SEG_RAID5_N;
+ goto replaced;
+
/* raid4 -> raid5_n */
- } else if (seg_is_raid4(seg_from) &&
- segtype_is_any_raid5(*segtype)) {
- if (!(*segtype = get_segtype_from_flag(seg_from->lv->vg->cmd, SEG_RAID5_N)))
- return_0;
+ } else if (seg_is_raid4(seg_from) && segtype_is_any_raid5(*segtype)) {
+ seg_flag = SEG_RAID5_N;
goto replaced;
/* raid4/raid5_n -> striped/raid0/raid6 */
} else if ((seg_is_raid4(seg_from) || seg_is_raid5_n(seg_from)) &&
!segtype_is_striped(*segtype) &&
!segtype_is_any_raid0(*segtype) &&
+ !segtype_is_raid1(*segtype) &&
!segtype_is_raid4(*segtype) &&
!segtype_is_raid5_n(*segtype) &&
!segtype_is_raid6_n_6(*segtype)) {
- if (!(*segtype = get_segtype_from_flag(seg_from->lv->vg->cmd, SEG_RAID6_N_6)))
- return_0;
+ seg_flag = SEG_RAID6_N_6;
goto replaced;
- /* ... and raid6 -> striped/raid0/raid4/raid5_n */
- } else if (seg_is_raid6_n_6(seg_from) &&
- !segtype_is_striped(*segtype) &&
- !segtype_is_any_raid0(*segtype) &&
- !segtype_is_raid4(*segtype) &&
- !segtype_is_raid5_n(*segtype)) {
- if (!(*segtype = get_segtype_from_flag(seg_from->lv->vg->cmd, SEG_RAID5_N)))
+ /* Got to do check for raid5 -> raid6 ... */
+ } else if (seg_is_any_raid5(seg_from) && segtype_is_any_raid6(*segtype)) {
+ if (!(seg_flag = _raid_seg_flag_5_to_6(seg_from)))
return_0;
goto replaced;
+
+ /* ... and raid6 -> raid5 */
+ } else if (seg_is_any_raid6(seg_from) && segtype_is_any_raid5(*segtype)) {
+ /* No result for raid6_{zr,nr,nc} */
+ if (!(seg_flag = _raid_seg_flag_6_to_5(seg_from)))
+ return 0;
+ goto replaced;
}
return 1;
replaced:
+ if (!(*segtype = get_segtype_from_flag(cmd, seg_flag)))
+ return_0;
log_warn("Replaced LV type %s with possible type %s.",
segtype_sav->name, (*segtype)->name);
+ if (!yes && yes_no_prompt("Do you want to convert %s LV %s to %s? [y/n]: ",
+ segtype_sav->name, display_lvname(seg_from->lv),
+ (*segtype)->name) == 'n') {
+ log_error("Logical volume %s NOT converted.", display_lvname(seg_from->lv));
+ return 0;
+ }
+
return 1;
}
@@ -5584,6 +5668,7 @@ static int _region_size_change_requested(struct logical_volume *lv, int yes, con
/* Check allowed conversion from seg_from to *segtype_to */
static int _conversion_options_allowed(const struct lv_segment *seg_from,
const struct segment_type **segtype_to,
+ int yes,
uint32_t new_image_count,
int new_data_copies, int new_region_size,
int stripes, unsigned new_stripe_size_supplied)
@@ -5591,7 +5676,7 @@ static int _conversion_options_allowed(const struct lv_segment *seg_from,
int r = 1;
uint32_t opts;
- if (!new_image_count && !_set_convenient_raid456_segtype_to(seg_from, segtype_to))
+ if (!new_image_count && !_set_convenient_raid1456_segtype_to(seg_from, segtype_to, yes))
return_0;
if (!_get_allowed_conversion_options(seg_from, *segtype_to, new_image_count, &opts)) {
@@ -5682,7 +5767,7 @@ int lv_raid_convert(struct logical_volume *lv,
* Check acceptible options mirrors, region_size,
* stripes and/or stripe_size have been provided.
*/
- if (!_conversion_options_allowed(seg, &new_segtype, 0 /* Takeover */, 0 /*new_data_copies*/, new_region_size,
+ if (!_conversion_options_allowed(seg, &new_segtype, yes, 0 /* Takeover */, 0 /*new_data_copies*/, new_region_size,
new_stripes, new_stripe_size_supplied))
return _log_possible_conversion_types(lv, new_segtype);
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fe18e5e77a488618…
Commit: fe18e5e77a488618510648c7801ea3375ce5aac4
Parent: 929cf4b73ca6112e59e5e85cf3a2f3992747883b
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 02:53:18 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces more local infrastructure to raid_manip.c
used by followup patches.
Changes:
- add _raid_reshape() using the pre/post callbacks and
the stripes add/remove reshape functions introduced before
- and _reshape_requested function checking if a reshape
was requested
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 362 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 339 insertions(+), 23 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 63588ad..cc074f6 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -57,7 +57,6 @@ static int _check_num_areas_in_lv_segments(struct logical_volume *lv, unsigned n
/*
* Check if reshape is supported in the kernel.
*/
-__attribute__ ((__unused__))
static int _reshape_is_supported(struct cmd_context *cmd, const struct segment_type *segtype)
{
unsigned attrs;
@@ -255,7 +254,6 @@ static int _deactivate_and_remove_lvs(struct volume_group *vg, struct dm_list *r
*
* report health string in @*raid_health for @lv from kernel reporting # of devs in @*kernel_devs
*/
-__attribute__ ((__unused__))
static int _get_dev_health(struct logical_volume *lv, uint32_t *kernel_devs,
uint32_t *devs_health, uint32_t *devs_in_sync,
char **raid_health)
@@ -934,6 +932,7 @@ static char *_generate_raid_name(struct logical_volume *lv,
return lvname;
}
+
/*
* Create an LV of specified type. Set visible after creation.
* This function does not make metadata changes.
@@ -1016,7 +1015,7 @@ static int _alloc_image_components(struct logical_volume *lv,
region_size = seg->region_size;
if (seg_is_raid(seg))
- segtype = seg->segtype;
+ segtype = get_segtype_from_string(lv->vg->cmd, SEG_TYPE_NAME_RAID0_META);
else if (!(segtype = get_segtype_from_string(lv->vg->cmd, SEG_TYPE_NAME_RAID1)))
return_0;
@@ -1032,17 +1031,13 @@ static int _alloc_image_components(struct logical_volume *lv,
/* FIXME Workaround for segment type changes where new segtype is unknown here */
/* Only for raid0* to raid4 */
extents = (lv->le_count / seg->area_count) * count;
- else if (segtype_is_raid10(segtype)) {
- if (seg->area_count < 2) {
- log_error(INTERNAL_ERROR "LV %s needs at least 2 areas.",
- display_lvname(lv));
- return 0;
- }
- extents = lv->le_count / (seg->area_count / 2); /* we enforce 2 mirrors right now */
- } else
- extents = (segtype->parity_devs) ?
- (lv->le_count / (seg->area_count - segtype->parity_devs)) :
- lv->le_count;
+
+ else {
+ if (seg_type(seg, 0) == AREA_LV)
+ extents = seg_lv(seg, 0)->le_count * count;
+ else
+ extents = lv->le_count / (seg->area_count - segtype->parity_devs);
+ }
/* Do we need to allocate any extents? */
if (pvs && !dm_list_empty(pvs) &&
@@ -1214,7 +1209,6 @@ static int _cmp_level(const struct segment_type *t1, const struct segment_type *
*
* Return 1 if same, else != 1
*/
-__attribute__ ((__unused__))
static int is_same_level(const struct segment_type *t1, const struct segment_type *t2)
{
return _cmp_level(t1, t2);
@@ -1602,7 +1596,6 @@ static int _lv_free_reshape_space(struct logical_volume *lv)
* 3: kernel dev count > @dev_count
*
*/
-__attribute__ ((__unused__))
static int _reshaped_state(struct logical_volume *lv, const unsigned dev_count,
unsigned *devs_health, unsigned *devs_in_sync)
{
@@ -1656,7 +1649,6 @@ static int _lv_reshape_get_new_len(struct logical_volume *lv,
/*
* Extend/reduce size of @lv and it's first segment during reshape to @extents
*/
-__attribute__ ((__unused__))
static int _reshape_adjust_to_size(struct logical_volume *lv,
uint32_t old_image_count, uint32_t new_image_count)
{
@@ -1693,7 +1685,6 @@ static int _reshape_adjust_to_size(struct logical_volume *lv,
static int _lv_raid_change_image_count(struct logical_volume *lv, uint32_t new_count,
struct dm_list *allocate_pvs, struct dm_list *removal_lvs,
int commit, int use_existing_area_len);
-__attribute__ ((__unused__))
static int _raid_reshape_add_images(struct logical_volume *lv,
const struct segment_type *new_segtype, int yes,
uint32_t old_image_count, uint32_t new_image_count,
@@ -1789,7 +1780,6 @@ static int _raid_reshape_add_images(struct logical_volume *lv,
* Reshape: remove images from existing raid lv
*
*/
-__attribute__ ((__unused__))
static int _raid_reshape_remove_images(struct logical_volume *lv,
const struct segment_type *new_segtype,
int yes, int force,
@@ -1947,7 +1937,6 @@ static int _raid_reshape_remove_images(struct logical_volume *lv,
* Reshape: keep images in RAID @lv but change stripe size or data copies
*
*/
-__attribute__ ((__unused__))
static int _raid_reshape_keep_images(struct logical_volume *lv,
const struct segment_type *new_segtype,
int yes, int force, int *force_repair,
@@ -2018,7 +2007,6 @@ static int _vg_write_lv_suspend_commit_backup(struct volume_group *vg,
return r;
}
-__attribute__ ((__unused__))
static int _vg_write_commit_backup(struct volume_group *vg)
{
return _vg_write_lv_suspend_commit_backup(vg, NULL, 1, 1);
@@ -2084,7 +2072,6 @@ static int _activate_sub_lvs_excl_local_list(struct logical_volume *lv, struct d
}
/* Helper: callback function to activate any new image component pairs @lv */
-__attribute__ ((__unused__))
static int _pre_raid_add_legs(struct logical_volume *lv, void *data)
{
if (!_vg_write_lv_suspend_vg_commit(lv, 1))
@@ -2111,13 +2098,342 @@ static int _pre_raid0_remove_rmeta(struct logical_volume *lv, void *data)
}
/* Helper: callback dummy needed for */
-__attribute__ ((__unused__))
static int _post_raid_dummy(struct logical_volume *lv, void *data)
{
return 1;
}
/*
+ * Reshape logical volume @lv by adding/removing stripes
+ * (absolute new stripes given in @new_stripes), changing
+ * layout (e.g. raid5_ls -> raid5_ra) or changing
+ * stripe size to @new_stripe_size.
+ *
+ * In case of disk addition, any PVs listed in mandatory
+ * @allocate_pvs will be used for allocation of new stripes.
+ */
+__attribute__ ((__unused__))
+static int _raid_reshape(struct logical_volume *lv,
+ const struct segment_type *new_segtype,
+ int yes, int force,
+ const unsigned new_data_copies,
+ const unsigned new_region_size,
+ const unsigned new_stripes,
+ const unsigned new_stripe_size,
+ struct dm_list *allocate_pvs)
+{
+ int force_repair = 0, r, too_few = 0;
+ unsigned devs_health, devs_in_sync;
+ uint32_t new_image_count, old_image_count;
+ enum alloc_where where_it_was;
+ struct lv_segment *seg = first_seg(lv);
+ struct dm_list removal_lvs;
+
+ if (!seg_is_reshapable_raid(seg))
+ return_0;
+
+ if (!is_same_level(seg->segtype, new_segtype))
+ return_0;
+
+ if (!(old_image_count = seg->area_count))
+ return_0;
+
+ if ((new_image_count = new_stripes + seg->segtype->parity_devs) < 2)
+ return_0;
+
+ if (!_check_max_raid_devices(new_image_count))
+ return_0;
+
+ if (!_raid_in_sync(lv)) {
+ log_error("Unable to convert %s while it is not in-sync.",
+ display_lvname(lv));
+ return 0;
+ }
+
+ dm_list_init(&removal_lvs);
+
+ /* No change in layout requested ? */
+ if (seg->segtype == new_segtype &&
+ seg->data_copies == new_data_copies &&
+ seg->region_size == new_region_size &&
+ old_image_count == new_image_count &&
+ seg->stripe_size == new_stripe_size) {
+ /*
+ * No change in segment type, image count, region or stripe size has been requested ->
+ * user requests this to remove any reshape space from the @lv
+ */
+ if (!_lv_free_reshape_space_with_status(lv, &where_it_was)) {
+ log_error(INTERNAL_ERROR "Failed to free reshape space of %s.",
+ display_lvname(lv));
+ return 0;
+ }
+
+ log_print_unless_silent("No change in RAID LV %s layout, freeing reshape space.", display_lvname(lv));
+
+ if (where_it_was == alloc_none) {
+ log_print_unless_silent("LV %s does not have reshape space allocated.",
+ display_lvname(lv));
+ return 1;
+ }
+
+ if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, 0, NULL, NULL))
+ return_0;
+
+ return 1;
+ }
+
+ /* raid4/5 with N image component pairs (i.e. N-1 stripes): allow for raid4/5 reshape to 2 devices, i.e. raid1 layout */
+ if (seg_is_raid4(seg) || seg_is_any_raid5(seg)) {
+ if (new_stripes < 1)
+ too_few = 1;
+
+ /* raid6 (raid10 can't shrink reshape) device count: check for 2 stripes minimum */
+ } else if (new_stripes < 2)
+ too_few = 1;
+
+ if (too_few) {
+ log_error("Too few stripes requested.");
+ return 0;
+ }
+
+ switch ((r = _reshaped_state(lv, old_image_count, &devs_health, &devs_in_sync))) {
+ case 1:
+ /*
+ * old_image_count == kernel_dev_count
+ *
+ * Check for device health
+ */
+ if (devs_in_sync < devs_health) {
+ log_error("Can't reshape out of sync LV %s.", display_lvname(lv));
+ return 0;
+ }
+
+ /* device count and health are good -> ready to go */
+ break;
+
+ case 2:
+ if (devs_in_sync == new_image_count)
+ break;
+
+ /* Possible after a shrinking reshape and forgotten device removal */
+ log_error("Device count is incorrect. "
+ "Forgotten \"lvconvert --stripes %d %s\" to remove %u images after reshape?",
+ devs_in_sync - seg->segtype->parity_devs, display_lvname(lv),
+ old_image_count - devs_in_sync);
+ return 0;
+
+ default:
+ log_error(INTERNAL_ERROR "Bad return=%d provided to %s.", r, __func__);
+ return 0;
+ }
+
+ if (seg->stripe_size != new_stripe_size)
+ log_print_unless_silent("Converting stripesize %s of %s LV %s to %s.",
+ display_size(lv->vg->cmd, seg->stripe_size),
+ lvseg_name(seg), display_lvname(lv),
+ display_size(lv->vg->cmd, new_stripe_size));
+
+ /* Handle disk addition reshaping */
+ if (old_image_count < new_image_count) {
+ if (!_raid_reshape_add_images(lv, new_segtype, yes,
+ old_image_count, new_image_count,
+ new_stripes, new_stripe_size, allocate_pvs))
+ return 0;
+
+ /* Handle disk removal reshaping */
+ } else if (old_image_count > new_image_count) {
+ if (!_raid_reshape_remove_images(lv, new_segtype, yes, force,
+ old_image_count, new_image_count,
+ new_stripes, new_stripe_size,
+ allocate_pvs, &removal_lvs))
+ return 0;
+
+ /*
+ * Handle raid set layout reshaping w/o changing # of legs (allocation algorithm or stripe size change)
+ * (e.g. raid5_ls -> raid5_n or stripe size change)
+ */
+ } else if (!_raid_reshape_keep_images(lv, new_segtype, yes, force, &force_repair,
+ new_data_copies, new_stripe_size, allocate_pvs))
+ return 0;
+
+ /* HM FIXME: workaround for not resetting "nosync" flag */
+ init_mirror_in_sync(0);
+
+ seg->region_size = new_region_size;
+
+ if (seg->area_count != 2 || old_image_count != seg->area_count) {
+ if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, 0, &removal_lvs,
+ _post_raid_dummy, NULL,
+ _pre_raid_add_legs, NULL))
+ return 0;
+ } if (!_vg_write_commit_backup(lv->vg))
+ return 0;
+
+ return 1; // force_repair ? _lv_cond_repair(lv) : 1;
+}
+
+/*
+ * Check for reshape request defined by:
+ *
+ * - raid type is reshape capable
+ * - no raid level change
+ * - # of stripes requested to change
+ * (i.e. add/remove disks from a striped raid set)
+ * -or-
+ * - stripe size change requestd
+ * (e.g. 32K -> 128K)
+ *
+ * Returns:
+ *
+ * 0 -> no reshape request
+ * 1 -> allowed reshape request
+ * 2 -> prohibited reshape request
+ * 3 -> allowed region size change request
+ */
+__attribute__ ((__unused__))
+static int _reshape_requested(const struct logical_volume *lv, const struct segment_type *segtype,
+ const int data_copies, const uint32_t region_size,
+ const uint32_t stripes, const uint32_t stripe_size)
+{
+ struct lv_segment *seg = first_seg(lv);
+
+ /* This segment type is not reshapable */
+ if (!seg_is_reshapable_raid(seg))
+ return 0;
+
+ if (!_reshape_is_supported(lv->vg->cmd, seg->segtype))
+ return 0;
+
+ /* Switching raid levels is a takeover, no reshape */
+ if (!is_same_level(seg->segtype, segtype))
+ return 0;
+
+ /* Possible takeover in case #data_copies == #stripes */
+ if (seg_is_raid10_near(seg) && segtype_is_raid1(segtype))
+ return 0;
+
+ /* No layout change -> allow for removal of reshape space */
+ if (seg->segtype == segtype &&
+ data_copies == seg->data_copies &&
+ region_size == seg->region_size &&
+ stripes == _data_rimages_count(seg, seg->area_count) &&
+ stripe_size == seg->stripe_size)
+ return 1;
+
+ /* Ensure region size is >= stripe size */
+ if (!seg_is_striped(seg) &&
+ !seg_is_any_raid0(seg) &&
+ (region_size || stripe_size) &&
+ ((region_size ?: seg->region_size) < (stripe_size ?: seg->stripe_size))) {
+ log_error("region size may not be smaller than stripe size on LV %s.",
+ display_lvname(lv));
+ return 2;
+ }
+#if 0
+ if ((_lv_is_duplicating(lv) || lv_is_duplicated(lv)) &&
+ ((seg_is_raid1(seg) ? 0 : (stripes != _data_rimages_count(seg, seg->area_count))) ||
+ data_copies != seg->data_copies))
+ goto err;
+ if ((!seg_is_striped(seg) && segtype_is_raid10_far(segtype)) ||
+ (seg_is_raid10_far(seg) && !segtype_is_striped(segtype))) {
+ if (data_copies == seg->data_copies &&
+ region_size == seg->region_size) {
+ log_error("Can't convert %sraid10_far.",
+ seg_is_raid10_far(seg) ? "" : "to ");
+ goto err;
+ }
+ }
+
+ if (seg_is_raid10_far(seg)) {
+ if (stripes != _data_rimages_count(seg, seg->area_count)) {
+ log_error("Can't change stripes in raid10_far.");
+ goto err;
+ }
+
+ if (stripe_size != seg->stripe_size) {
+ log_error("Can't change stripe size in raid10_far.");
+ goto err;
+ }
+ }
+#endif
+
+ if (seg_is_any_raid10(seg) && seg->area_count > 2 &&
+ stripes && stripes < seg->area_count - seg->segtype->parity_devs) {
+ log_error("Can't remove stripes from raid10");
+ goto err;
+ }
+
+ if (data_copies != seg->data_copies) {
+ if (seg_is_raid10_near(seg))
+ return 0;
+#if 0
+ if (seg_is_raid10_far(seg))
+ return segtype_is_raid10_far(segtype) ? 1 : 0;
+
+ if (seg_is_raid10_offset(seg)) {
+ log_error("Can't change number of data copies on %s LV %s.",
+ lvseg_name(seg), display_lvname(lv));
+ goto err;
+ }
+#endif
+ }
+
+#if 0
+ /* raid10_{near,offset} case */
+ if ((seg_is_raid10_near(seg) && segtype_is_raid10_offset(segtype)) ||
+ (seg_is_raid10_offset(seg) && segtype_is_raid10_near(segtype))) {
+ if (stripes >= seg->area_count)
+ return 1;
+
+ goto err;
+ }
+
+ /*
+ * raid10_far is not reshapable in MD at all;
+ * lvm/dm adds reshape capability to add/remove data_copies
+ */
+ if (seg_is_raid10_far(seg) && segtype_is_raid10_far(segtype)) {
+ if (stripes && stripes == seg->area_count &&
+ data_copies > 1 &&
+ data_copies <= seg->area_count &&
+ data_copies != seg->data_copies)
+ return 1;
+
+ goto err;
+
+ } else if (seg_is_any_raid10(seg) && segtype_is_any_raid10(segtype) &&
+ data_copies > 1 && data_copies != seg->data_copies)
+ goto err;
+#endif
+
+ /* Change layout (e.g. raid5_ls -> raid5_ra) keeping # of stripes */
+ if (seg->segtype != segtype) {
+ if (stripes && stripes != _data_rimages_count(seg, seg->area_count))
+ goto err;
+
+ return 1;
+ }
+
+ if (stripes && stripes == _data_rimages_count(seg, seg->area_count) &&
+ stripe_size == seg->stripe_size) {
+ log_error("LV %s already has %u stripes.",
+ display_lvname(lv), stripes);
+ return 2;
+ }
+
+ return (stripes || stripe_size) ? 1 : 0;
+
+err:
+#if 0
+ if (lv_is_duplicated(lv))
+ log_error("Conversion of duplicating sub LV %s rejected.", display_lvname(lv));
+ else
+ log_error("Use \"lvconvert --duplicate --type %s ... %s.", segtype->name, display_lvname(lv));
+#endif
+ return 2;
+}
+
+/*
* _alloc_rmeta_for_lv
* @lv
*
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=929cf4b73ca6112e…
Commit: 929cf4b73ca6112e59e5e85cf3a2f3992747883b
Parent: 4de0e692dba592206c8bb1f5000b4a6e445914a5
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 02:39:04 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces more local infrastructure to raid_manip.c
used by followup patches.
Changes:
- add vg metadata update functions
- add pre and post activation callback functions for
proper sequencing of sub lv activations during reshaping
- move and enhance _lv_update_reload_fns_reset_eliminate_lvs()
to support pre and post activation callbacks
- add _reset_flags_passed_to_kernel() which resets anyxi
rebuild/reshape flags after they have been passed into the kernel
and sets the SubLV remove after reshape flags on legs to be removed
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 345 +++++++++++++++++++++++++++++++++++----------
1 files changed, 269 insertions(+), 76 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 1cee8c3..63588ad 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -22,6 +22,11 @@
#include "lv_alloc.h"
#include "lvm-string.h"
+typedef int (*fn_on_lv_t)(struct logical_volume *lv, void *data);
+static int _eliminate_extracted_lvs_optional_write_vg(struct volume_group *vg,
+ struct dm_list *removal_lvs,
+ int vg_write_requested);
+
static int _check_restriping(uint32_t new_stripes, struct logical_volume *lv)
{
if (new_stripes && new_stripes != first_seg(lv)->area_count) {
@@ -404,6 +409,141 @@ static int _raid_remove_top_layer(struct logical_volume *lv,
return 1;
}
+/* Reset any rebuild or reshape disk flags on @lv, first segment already passed to the kernel */
+static int _reset_flags_passed_to_kernel(struct logical_volume *lv, int *flags_reset)
+{
+ uint32_t lv_count = 0, s;
+ struct logical_volume *slv;
+ struct lv_segment *seg = first_seg(lv);
+ uint64_t reset_flags = LV_REBUILD | LV_RESHAPE_DELTA_DISKS_PLUS | LV_RESHAPE_DELTA_DISKS_MINUS;
+
+ for (s = 0; s < seg->area_count; s++) {
+ if (seg_type(seg, s) == AREA_PV)
+ continue;
+
+ if (!(slv = seg_lv(seg, s)))
+ return_0;
+
+ /* Recurse into sub LVs */
+ if (!_reset_flags_passed_to_kernel(slv, flags_reset))
+ return 0;
+
+ if (slv->status & LV_RESHAPE_DELTA_DISKS_MINUS) {
+ *flags_reset = 1;
+ slv->status |= LV_REMOVE_AFTER_RESHAPE;
+ seg_metalv(seg, s)->status |= LV_REMOVE_AFTER_RESHAPE;
+ }
+
+ if (slv->status & reset_flags) {
+ *flags_reset = 1;
+ slv->status &= ~reset_flags;
+ }
+
+ lv_count++;
+ }
+
+ /* Reset passed in data offset (reshaping) */
+ if (lv_count)
+ seg->data_offset = 0;
+
+ return 1;
+}
+
+/*
+ * HM Helper:
+ *
+ * Minimum 4 arguments!
+ *
+ * Updates and reloads metadata, clears any flags passed to the kernel,
+ * eliminates any residual LVs and updates and reloads metadata again.
+ *
+ * @lv mandatory argument, rest variable:
+ *
+ * @lv @origin_only @removal_lvs/NULL @fn_post_on_lv/NULL [ @fn_post_data/NULL [ @fn_post_on_lv/NULL @fn_post_data/NULL ] ]
+ *
+ * Run optional variable args function fn_post_on_lv with fn_post_data on @lv before second metadata update
+ * Run optional variable args function fn_pre_on_lv with fn_pre_data on @lv before first metadata update
+ *
+ * This minimaly involves 2 metadata commits or more, depending on
+ * pre and post functions carrying out any additional ones or not.
+ *
+ * WARNING: needs to be called with at least 4 arguments to suit va_list processing!
+ */
+static int _lv_update_reload_fns_reset_eliminate_lvs(struct logical_volume *lv, int origin_only, ...)
+{
+ int flags_reset = 0, r = 0;
+ va_list ap;
+ fn_on_lv_t fn_pre_on_lv = NULL, fn_post_on_lv;
+ void *fn_pre_data, *fn_post_data;
+ struct dm_list *removal_lvs;
+
+ va_start(ap, origin_only);
+ removal_lvs = va_arg(ap, struct dm_list *);
+
+ /* Retrieve post/pre functions and post/pre data reference from variable arguments, if any */
+ if ((fn_post_on_lv = va_arg(ap, fn_on_lv_t))) {
+ fn_post_data = va_arg(ap, void *);
+ if ((fn_pre_on_lv = va_arg(ap, fn_on_lv_t)))
+ fn_pre_data = va_arg(ap, void *);
+ }
+
+ /* Call any efn_pre_on_lv before the first update and reload call (e.g. to rename LVs) */
+ if (fn_pre_on_lv && !(r = fn_pre_on_lv(lv, fn_pre_data))) {
+ log_error(INTERNAL_ERROR "Pre callout function failed.");
+ goto err;
+ }
+
+ if (r == 2) {
+ /*
+ * Returning 2 from pre function -> lv is suspended and
+ * metadata got updated, don't need to do it again
+ */
+ if (!(origin_only ? resume_lv_origin(lv->vg->cmd, lv_lock_holder(lv)) :
+ resume_lv(lv->vg->cmd, lv_lock_holder(lv)))) {
+ log_error("Failed to resume %s.", display_lvname(lv));
+ goto err;
+ }
+
+ /* Update metadata and reload mappings including flags (e.g. LV_REBUILD, LV_RESHAPE_DELTA_DISKS_PLUS) */
+ } else if (!(origin_only ? lv_update_and_reload_origin(lv) : lv_update_and_reload(lv)))
+ goto err;
+
+ /* Eliminate any residual LV and don't commit the metadata */
+ if (!_eliminate_extracted_lvs_optional_write_vg(lv->vg, removal_lvs, 0))
+ goto err;
+
+ /*
+ * Now that any 'REBUILD' or 'RESHAPE_DELTA_DISKS' etc.
+ * has/have made its/their way to the kernel, we must
+ * remove the flag(s) so that the individual devices are
+ * not rebuilt/reshaped/taken over upon every activation.
+ *
+ * Writes and commits metadata if any flags have been reset
+ * and if successful, performs metadata backup.
+ */
+ log_debug_metadata("Clearing any flags for %s passed to the kernel.", display_lvname(lv));
+ if (!_reset_flags_passed_to_kernel(lv, &flags_reset))
+ goto err;
+
+ /* Call any @fn_post_on_lv before the second update call (e.g. to rename LVs back) */
+ if (fn_post_on_lv && !(r = fn_post_on_lv(lv, fn_post_data))) {
+ log_error("Post callout function failed.");
+ goto err;
+ }
+
+ /* Update and reload to clear out reset flags in the metadata and in the kernel */
+ log_debug_metadata("Updating metadata mappings for %s.", display_lvname(lv));
+ if ((r != 2 || flags_reset) && !(origin_only ? lv_update_and_reload_origin(lv) : lv_update_and_reload(lv))) {
+ log_error(INTERNAL_ERROR "Update of LV %s failed.", display_lvname(lv));
+ goto err;
+ }
+
+ r = 1;
+err:
+ va_end(ap);
+ return r;
+}
+
/*
* Assisted excl_local activation of lvl listed LVs before resume
*
@@ -1852,6 +1992,131 @@ static int _raid_reshape_keep_images(struct logical_volume *lv,
return 1;
}
+/* HM Helper: write, optionally suspend @lv (origin), commit and optionally backup metadata of @vg */
+static int _vg_write_lv_suspend_commit_backup(struct volume_group *vg,
+ struct logical_volume *lv,
+ int origin_only, int do_backup)
+{
+ int r = 1;
+
+ if (!vg_write(vg)) {
+ log_error("Write of VG %s failed.", vg->name);
+ return_0;
+ }
+
+ if (lv && !(r = (origin_only ? suspend_lv_origin(vg->cmd, lv_lock_holder(lv)) :
+ suspend_lv(vg->cmd, lv_lock_holder(lv))))) {
+ log_error("Failed to suspend %s before committing changes.",
+ display_lvname(lv));
+ vg_revert(lv->vg);
+ } else if (!(r = vg_commit(vg)))
+ stack; /* !vg_commit() has implicit vg_revert() */
+
+ if (r && do_backup && !backup(vg))
+ log_error("Backup of VG %s failed; continuing.", vg->name);
+
+ return r;
+}
+
+__attribute__ ((__unused__))
+static int _vg_write_commit_backup(struct volume_group *vg)
+{
+ return _vg_write_lv_suspend_commit_backup(vg, NULL, 1, 1);
+}
+
+__attribute__ ((__unused__))
+static int _vg_write_commit(struct volume_group *vg)
+{
+ return _vg_write_lv_suspend_commit_backup(vg, NULL, 1, 0);
+}
+
+/* Write vg of @lv, suspend @lv and commit the vg */
+static int _vg_write_lv_suspend_vg_commit(struct logical_volume *lv, int origin_only)
+{
+ return _vg_write_lv_suspend_commit_backup(lv->vg, lv, origin_only, 0);
+}
+
+/* Helper: function to activate @lv exclusively local */
+static int _activate_sub_lv_excl_local(struct logical_volume *lv)
+{
+ if (lv && !activate_lv_excl_local(lv->vg->cmd, lv)) {
+ log_error("Failed to activate %s.", display_lvname(lv));
+ return 0;
+ }
+
+ return 1;
+}
+
+/* Helper: function to activate any sub LVs of @lv exclusively local starting with area indexed by @start_idx */
+static int _activate_sub_lvs_excl_local(struct logical_volume *lv, uint32_t start_idx)
+{
+ uint32_t s;
+ struct lv_segment *seg = first_seg(lv);
+
+ /* seg->area_count may be 0 here! */
+ log_debug_metadata("Activating %u image component%s of LV %s.",
+ seg->area_count - start_idx, seg->meta_areas ? " pairs" : "s",
+ display_lvname(lv));
+ for (s = start_idx; s < seg->area_count; s++)
+ if (!_activate_sub_lv_excl_local(seg_lv(seg, s)) ||
+ !_activate_sub_lv_excl_local(seg_metalv(seg, s)))
+ return 0;
+
+ return 1;
+}
+
+/* Helper: function to activate any sub LVs of @lv exclusively local starting with area indexed by @start_idx */
+static int _activate_sub_lvs_excl_local_list(struct logical_volume *lv, struct dm_list *lv_list)
+{
+ int r = 1;
+ struct lv_list *lvl;
+
+ if (lv_list) {
+ dm_list_iterate_items(lvl, lv_list) {
+ log_very_verbose("Activating logical volume %s before %s in kernel.",
+ display_lvname(lvl->lv), display_lvname(lv_lock_holder(lv)));
+ if (!_activate_sub_lv_excl_local(lvl->lv))
+ r = 0; /* But lets try with the rest */
+ }
+ }
+
+ return r;
+}
+
+/* Helper: callback function to activate any new image component pairs @lv */
+__attribute__ ((__unused__))
+static int _pre_raid_add_legs(struct logical_volume *lv, void *data)
+{
+ if (!_vg_write_lv_suspend_vg_commit(lv, 1))
+ return 0;
+
+ /* Reload any changed image component pairs for out-of-place reshape apace */
+ if (!_activate_sub_lvs_excl_local(lv, 0))
+ return 0;
+
+ return 2; /* 1: ok, 2: metadata commited */
+}
+
+/* Helper: callback function to activate any rmetas on @data list */
+__attribute__ ((__unused__))
+static int _pre_raid0_remove_rmeta(struct logical_volume *lv, void *data)
+{
+ struct dm_list *lv_list = data;
+
+ if (!_vg_write_lv_suspend_vg_commit(lv, 1))
+ return 0;
+
+ /* 1: ok, 2: metadata commited */
+ return _activate_sub_lvs_excl_local_list(lv, lv_list) ? 2 : 0;
+}
+
+/* Helper: callback dummy needed for */
+__attribute__ ((__unused__))
+static int _post_raid_dummy(struct logical_volume *lv, void *data)
+{
+ return 1;
+}
+
/*
* _alloc_rmeta_for_lv
* @lv
@@ -3077,78 +3342,6 @@ static int _raid0_add_or_remove_metadata_lvs(struct logical_volume *lv,
}
/*
- * Clear any rebuild disk flags on lv.
- * If any flags were cleared, *flags_were_cleared is set to 1.
- */
-/* FIXME Generalise into foreach_underlying_lv_segment_area. */
-static void _clear_rebuild_flags(struct logical_volume *lv, int *flags_were_cleared)
-{
- struct lv_segment *seg = first_seg(lv);
- struct logical_volume *sub_lv;
- uint32_t s;
- uint64_t flags_to_clear = LV_REBUILD;
-
- for (s = 0; s < seg->area_count; s++) {
- if (seg_type(seg, s) == AREA_PV)
- continue;
-
- sub_lv = seg_lv(seg, s);
-
- /* Recurse into sub LVs */
- _clear_rebuild_flags(sub_lv, flags_were_cleared);
-
- if (sub_lv->status & flags_to_clear) {
- sub_lv->status &= ~flags_to_clear;
- *flags_were_cleared = 1;
- }
- }
-}
-
-/*
- * Updates and reloads metadata, clears any flags passed to the kernel,
- * eliminates any residual LVs and updates and reloads metadata again.
- *
- * lv removal_lvs
- *
- * This minimally involves 2 metadata commits.
- */
-static int _lv_update_reload_fns_reset_eliminate_lvs(struct logical_volume *lv, struct dm_list *removal_lvs)
-{
- int flags_were_cleared = 0, r = 0;
-
- if (!_lv_update_and_reload_list(lv, 1, removal_lvs))
- return_0;
-
- /* Eliminate any residual LV and don't commit the metadata */
- if (!_eliminate_extracted_lvs_optional_write_vg(lv->vg, removal_lvs, 0))
- return_0;
-
- /*
- * Now that any 'REBUILD' or 'RESHAPE_DELTA_DISKS' etc.
- * has/have made its/their way to the kernel, we must
- * remove the flag(s) so that the individual devices are
- * not rebuilt/reshaped/taken over upon every activation.
- *
- * Writes and commits metadata if any flags have been reset
- * and if successful, performs metadata backup.
- */
- /* FIXME This needs to be done through hooks in the metadata */
- log_debug_metadata("Clearing any flags for %s passed to the kernel.",
- display_lvname(lv));
- _clear_rebuild_flags(lv, &flags_were_cleared);
-
- log_debug_metadata("Updating metadata and reloading mappings for %s.",
- display_lvname(lv));
- if ((r != 2 || flags_were_cleared) && !lv_update_and_reload(lv)) {
- log_error("Update and reload of LV %s failed.",
- display_lvname(lv));
- return 0;
- }
-
- return 1;
-}
-
-/*
* Adjust all data sub LVs of lv to mirror
* or raid name depending on direction
* adjusting their LV status
@@ -3357,7 +3550,7 @@ static int _convert_raid1_to_mirror(struct logical_volume *lv,
if (!attach_mirror_log(first_seg(lv), log_lv))
return_0;
- return update_and_reload ? _lv_update_reload_fns_reset_eliminate_lvs(lv, removal_lvs) : 1;
+ return update_and_reload ? _lv_update_reload_fns_reset_eliminate_lvs(lv, 0, removal_lvs, NULL) : 1;
}
/*
@@ -4288,7 +4481,7 @@ static int _raid45610_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
seg->region_size = new_region_size ?: region_size;
- if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, &removal_lvs))
+ if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, 0, &removal_lvs, NULL))
return_0;
if (rename_sublvs) {
@@ -4365,7 +4558,7 @@ static int _raid45_to_raid54_wrapper(TAKEOVER_FN_ARGS)
seg->region_size = new_region_size ?: region_size;
seg->segtype = new_segtype;
- if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, &removal_lvs))
+ if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, 0, &removal_lvs, NULL))
return_0;
init_mirror_in_sync(0);
@@ -4486,7 +4679,7 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
log_debug_metadata("Updating VG metadata and reloading %s LV %s.",
lvseg_name(seg), display_lvname(lv));
- if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, NULL))
+ if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, 0, NULL, NULL))
return_0;
if (segtype_is_raid4(new_segtype)) {
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4de0e692dba59220…
Commit: 4de0e692dba592206c8bb1f5000b4a6e445914a5
Parent: 7d39b4d5e7c38438b294469f74d437bdbb9a2632
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 02:12:30 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces more local infrastructure to raid_manip.c
used by followup patches.
Changes:
- add function to support disk adding reshapes
- add function to support disk removing reshapes
- add function to support layout (e.g. raid5ls -> raid5_rs)
or stripesize reshaping
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 314 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 311 insertions(+), 3 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index b82ec90..1cee8c3 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -557,7 +557,7 @@ static void _swap_areas(struct lv_segment_area *a1, struct lv_segment_area *a2)
*
* raid10_{near,far} can only be reordered to raid0 if !mod(#total_devs, #mirrors)
*
- * Examples with 6 disks indexed 0..5 with 3 stripes:
+ * Examples with 6 disks indexed 0..5 with 3 stripes and 2 data copies:
* raid0 (012345) -> raid10_{near,far} (031425) order
* idx 024135
* raid10_{near,far} (012345) -> raid0 (024135/135024) order depending on mirror leg selection (TBD)
@@ -576,7 +576,7 @@ enum raid0_raid10_conversion { reorder_to_raid10_near, reorder_from_raid10_near
static int _reorder_raid10_near_seg_areas(struct lv_segment *seg, enum raid0_raid10_conversion conv)
{
unsigned dc, idx1, idx1_sav, idx2, s, ss, str, xchg;
- uint32_t data_copies = 2; /* seg->data_copies */
+ uint32_t data_copies = seg->data_copies;
uint32_t *idx, stripes = seg->area_count;
unsigned i = 0;
@@ -589,7 +589,7 @@ static int _reorder_raid10_near_seg_areas(struct lv_segment *seg, enum raid0_rai
/* FIXME: once more data copies supported with raid10 */
if (seg_is_raid10_near(seg) && (stripes % data_copies)) {
- log_error("Can't convert %s LV %s with number of stripes not divisable by number of data copies",
+ log_error("Can't convert %s LV %s with number of stripes not divisable by number of data copies.",
lvseg_name(seg), display_lvname(seg->lv));
return 0;
}
@@ -1545,6 +1545,314 @@ static int _reshape_adjust_to_size(struct logical_volume *lv,
}
/*
+ * HM Helper:
+ *
+ * Reshape: add immages to existing raid lv
+ *
+ */
+static int _lv_raid_change_image_count(struct logical_volume *lv, uint32_t new_count,
+ struct dm_list *allocate_pvs, struct dm_list *removal_lvs,
+ int commit, int use_existing_area_len);
+__attribute__ ((__unused__))
+static int _raid_reshape_add_images(struct logical_volume *lv,
+ const struct segment_type *new_segtype, int yes,
+ uint32_t old_image_count, uint32_t new_image_count,
+ const unsigned new_stripes, const unsigned new_stripe_size,
+ struct dm_list *allocate_pvs)
+{
+ uint32_t grown_le_count, current_le_count, s;
+ struct volume_group *vg;
+ struct logical_volume *slv;
+ struct lv_segment *seg = first_seg(lv);
+ struct lvinfo info = { 0 };
+
+ if (new_image_count == old_image_count) {
+ log_error(INTERNAL_ERROR "No change of image count on LV %s.", display_lvname(lv));
+ return_0;
+ }
+
+ vg = lv->vg;
+
+ if (!lv_info(vg->cmd, lv, 0, &info, 1, 0) && driver_version(NULL, 0)) {
+ log_error("lv_info failed: aborting.");
+ return 0;
+ }
+
+ if (seg->segtype != new_segtype)
+ log_print_unless_silent("Ignoring layout change on device adding reshape.");
+
+ if (seg_is_any_raid10(seg) && (new_image_count % seg->data_copies)) {
+ log_error("Can't reshape %s LV %s to odd number of stripes.",
+ lvseg_name(seg), display_lvname(lv));
+ return 0;
+ }
+
+ if (!_lv_reshape_get_new_len(lv, old_image_count, new_image_count, &grown_le_count))
+ return 0;
+
+ current_le_count = lv->le_count - _reshape_len_per_lv(lv);
+ grown_le_count -= _reshape_len_per_dev(seg) * _data_rimages_count(seg, new_image_count);
+ log_warn("WARNING: Adding stripes to active%s logical volume %s "
+ "will grow it from %u to %u extents!",
+ info.open_count ? " and open" : "",
+ display_lvname(lv), current_le_count, grown_le_count);
+ log_print_unless_silent("Run \"lvresize -l%u %s\" to shrink it or use the additional capacity.",
+ current_le_count, display_lvname(lv));
+ if (!yes && yes_no_prompt("Are you sure you want to add %u images to %s LV %s? [y/n]: ",
+ new_image_count - old_image_count, lvseg_name(seg), display_lvname(lv)) == 'n') {
+ log_error("Logical volume %s NOT converted.", display_lvname(lv));
+ return 0;
+ }
+
+ /* Allocate new image component pairs for the additional stripes and grow LV size */
+ log_debug_metadata("Adding %u data and metadata image LV pair%s to %s.",
+ new_image_count - old_image_count, new_image_count - old_image_count > 1 ? "s" : "",
+ display_lvname(lv));
+ if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, NULL, 0, 0))
+ return 0;
+
+ /* Reshape adding image component pairs -> change sizes/counters accordingly */
+ if (!_reshape_adjust_to_size(lv, old_image_count, new_image_count)) {
+ log_error("Failed to adjust LV %s to new size!", display_lvname(lv));
+ return 0;
+ }
+
+ /* Allocate forward out of place reshape space at the beginning of all data image LVs */
+ log_debug_metadata("(Re)allocating reshape space for %s.", display_lvname(lv));
+ if (!_lv_alloc_reshape_space(lv, alloc_begin, NULL, allocate_pvs))
+ return 0;
+
+ /*
+ * Reshape adding image component pairs:
+ *
+ * - reset rebuild flag on new image LVs
+ * - set delta disks plus flag on new image LVs
+ */
+ if (old_image_count < seg->area_count) {
+ log_debug_metadata("Setting delta disk flag on new data LVs of %s.",
+ display_lvname(lv));
+ for (s = old_image_count; s < seg->area_count; s++) {
+ slv = seg_lv(seg, s);
+ slv->status &= ~LV_REBUILD;
+ slv->status |= LV_RESHAPE_DELTA_DISKS_PLUS;
+ }
+ }
+
+ seg->stripe_size = new_stripe_size;
+
+ return 1;
+}
+
+/*
+ * HM Helper:
+ *
+ * Reshape: remove images from existing raid lv
+ *
+ */
+__attribute__ ((__unused__))
+static int _raid_reshape_remove_images(struct logical_volume *lv,
+ const struct segment_type *new_segtype,
+ int yes, int force,
+ uint32_t old_image_count, uint32_t new_image_count,
+ const unsigned new_stripes, const unsigned new_stripe_size,
+ struct dm_list *allocate_pvs, struct dm_list *removal_lvs)
+{
+ uint32_t active_lvs, current_le_count, reduced_le_count, removed_lvs, s;
+ uint64_t extend_le_count;
+ unsigned devs_health, devs_in_sync;
+ struct lv_segment *seg = first_seg(lv);
+ struct lvinfo info = { 0 };
+
+ if (seg_is_any_raid6(seg) && new_stripes < 3) {
+ log_error("Minimum 3 stripes required for %s LV %s.",
+ lvseg_name(seg), display_lvname(lv));
+ return 0;
+ }
+
+ if (new_image_count == old_image_count) {
+ log_error(INTERNAL_ERROR "No change of image count on LV %s.", display_lvname(lv));
+ return_0;
+ }
+
+ switch (_reshaped_state(lv, new_image_count, &devs_health, &devs_in_sync)) {
+ case 3:
+ /*
+ * Disk removal reshape step 1:
+ *
+ * we got more disks active than requested via @new_stripes
+ *
+ * -> flag the ones to remove
+ *
+ */
+ if (seg->segtype != new_segtype)
+ log_print_unless_silent("Ignoring layout change on device removing reshape.");
+
+ if (!lv_info(lv->vg->cmd, lv, 0, &info, 1, 0) && driver_version(NULL, 0)) {
+ log_error("lv_info failed: aborting.");
+ return 0;
+ }
+
+ if (!_lv_reshape_get_new_len(lv, old_image_count, new_image_count, &reduced_le_count))
+ return 0;
+
+ reduced_le_count -= seg->reshape_len * _data_rimages_count(seg, new_image_count);
+ current_le_count = lv->le_count - seg->reshape_len * _data_rimages_count(seg, old_image_count);
+ extend_le_count = current_le_count * current_le_count / reduced_le_count;
+ log_warn("WARNING: Removing stripes from active%s logical "
+ "volume %s will shrink it from %s to %s!",
+ info.open_count ? " and open" : "", display_lvname(lv),
+ display_size(lv->vg->cmd, (uint64_t) current_le_count * lv->vg->extent_size),
+ display_size(lv->vg->cmd, (uint64_t) reduced_le_count * lv->vg->extent_size));
+ log_warn("THIS MAY DESTROY (PARTS OF) YOUR DATA!");
+ if (!yes)
+ log_warn("Interrupt the conversion and run \"lvresize -y -l%u %s\" to "
+ "keep the current size if not done already!",
+ (uint32_t) extend_le_count, display_lvname(lv));
+ log_print_unless_silent("If that leaves the logical volume larger than %llu extents due to stripe rounding,",
+ (unsigned long long) extend_le_count);
+ log_print_unless_silent("you may want to grow the content afterwards (filesystem etc.)");
+ log_warn("WARNING: too remove freed stripes after the conversion has finished, you have to run \"lvconvert --stripes %u %s\"",
+ new_stripes, display_lvname(lv));
+
+ if (!force) {
+ log_warn("WARNING: Can't remove stripes without --force option.");
+ return 0;
+ }
+
+ if (!yes && yes_no_prompt("Are you sure you want to remove %u images from %s LV %s? [y/n]: ",
+ old_image_count - new_image_count, lvseg_name(seg), display_lvname(lv)) == 'n') {
+ log_error("Logical volume %s NOT converted.", display_lvname(lv));
+ return 0;
+ }
+
+ /*
+ * Allocate backward out of place reshape space at the
+ * _end_ of all data image LVs, because MD reshapes backwards
+ * to remove disks from a raid set
+ */
+ if (!_lv_alloc_reshape_space(lv, alloc_end, NULL, allocate_pvs))
+ return 0;
+
+ /* Flag all disks past new images as delta disks minus to kernel */
+ for (s = new_image_count; s < old_image_count; s++)
+ seg_lv(seg, s)->status |= LV_RESHAPE_DELTA_DISKS_MINUS;
+
+ if (seg_is_any_raid5(seg) && new_image_count == 2)
+ seg->data_copies = 2;
+
+ break;
+
+ case 1:
+ /*
+ * Disk removal reshape step 2:
+ *
+ * we got the proper (smaller) amount of devices active
+ * for a previously finished disk removal reshape
+ *
+ * -> remove the freed up images and reduce LV size
+ *
+ */
+ for (active_lvs = removed_lvs = s = 0; s < seg->area_count; s++) {
+ struct logical_volume *slv;
+
+ if (!seg_lv(seg, s) || !(slv = seg_lv(seg, s))) {
+ log_error("Missing image sub lv off LV %s.", display_lvname(lv));
+ return 0;
+ }
+
+ if (slv->status & LV_REMOVE_AFTER_RESHAPE)
+ removed_lvs++;
+ else
+ active_lvs++;
+ }
+
+ if (devs_in_sync != new_image_count) {
+ log_error("No correct kernel/lvm active LV count on %s.", display_lvname(lv));
+ return 0;
+ }
+
+ if (active_lvs + removed_lvs != old_image_count) {
+ log_error ("No correct kernel/lvm total LV count on %s.", display_lvname(lv));
+ return 0;
+ }
+
+ /* Reshape removing image component pairs -> change sizes accordingly */
+ if (!_reshape_adjust_to_size(lv, old_image_count, new_image_count)) {
+ log_error("Failed to adjust LV %s to new size!", display_lvname(lv));
+ return 0;
+ }
+
+ log_debug_metadata("Removing %u data and metadata image LV pair%s from %s.",
+ old_image_count - new_image_count, old_image_count - new_image_count > 1 ? "s" : "",
+ display_lvname(lv));
+ if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, removal_lvs, 0, 0))
+ return 0;
+
+ seg->area_count = new_image_count;
+
+ break;
+
+ default:
+ log_error(INTERNAL_ERROR "Bad return provided to %s.", __func__);
+ return 0;
+ }
+
+ seg->stripe_size = new_stripe_size;
+
+ return 1;
+}
+/*
+ * HM Helper:
+ *
+ * Reshape: keep images in RAID @lv but change stripe size or data copies
+ *
+ */
+__attribute__ ((__unused__))
+static int _raid_reshape_keep_images(struct logical_volume *lv,
+ const struct segment_type *new_segtype,
+ int yes, int force, int *force_repair,
+ const int new_data_copies, const unsigned new_stripe_size,
+ struct dm_list *allocate_pvs)
+{
+ int alloc_reshape_space = 1;
+ enum alloc_where where = alloc_anywhere;
+ struct lv_segment *seg = first_seg(lv);
+
+ if (seg->segtype != new_segtype)
+ log_print_unless_silent("Converting %s LV %s to %s.",
+ lvseg_name(seg), display_lvname(lv), new_segtype->name);
+ if (!yes && yes_no_prompt("Are you sure you want to convert %s LV %s? [y/n]: ",
+ lvseg_name(seg), display_lvname(lv)) == 'n') {
+ log_error("Logical volume %s NOT converted.", display_lvname(lv));
+ return 0;
+ }
+
+ seg->stripe_size = new_stripe_size;
+
+ /*
+ * Reshape layout alogorithm or chunksize:
+ *
+ * Allocate free out-of-place reshape space unless raid10_far.
+ *
+ * If other raid10, allocate it appropriatly.
+ *
+ * Allocate it anywhere for raid4/5 to avoid remapping
+ * it in case it is already allocated.
+ *
+ * The dm-raid target is able to use the space whereever it
+ * is found by appropriately selecting forward or backward reshape.
+ */
+ if (seg->area_count != 2 &&
+ alloc_reshape_space &&
+ !_lv_alloc_reshape_space(lv, where, NULL, allocate_pvs))
+ return 0;
+
+ seg->segtype = new_segtype;
+
+ return 1;
+}
+
+/*
* _alloc_rmeta_for_lv
* @lv
*
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7d39b4d5e7c38438…
Commit: 7d39b4d5e7c38438b294469f74d437bdbb9a2632
Parent: 92691e345d12515d61e6e7748e5b9ddc4eff49c0
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 02:05:36 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces more local infrastructure to raid_manip.c
used by followup patches.
Changes:
- add function providing state of a reshaped RaidLV
- add function to adjust the size of a RaidLV was
reshaped to add/remove stripes
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 96 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 96 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index b2a5572..b82ec90 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -1447,6 +1447,102 @@ static int _lv_free_reshape_space(struct logical_volume *lv)
return _lv_free_reshape_space_with_status(lv, NULL);
}
+/*
+ * HM
+ *
+ * Compares current raid disk count of active RAID set @lv to
+ * requested @dev_count returning number of disks as of healths
+ * string in @devs_health and synced disks in @devs_in_sync
+ *
+ * Returns:
+ *
+ * 0: error
+ * 1: kernel dev count = @dev_count
+ * 2: kernel dev count < @dev_count
+ * 3: kernel dev count > @dev_count
+ *
+ */
+__attribute__ ((__unused__))
+static int _reshaped_state(struct logical_volume *lv, const unsigned dev_count,
+ unsigned *devs_health, unsigned *devs_in_sync)
+{
+ uint32_t kernel_devs;
+
+ if (!devs_health || !devs_in_sync)
+ return_0;
+
+ if (!_get_dev_health(lv, &kernel_devs, devs_health, devs_in_sync, NULL))
+ return 0;
+
+ if (kernel_devs == dev_count)
+ return 1;
+
+ return kernel_devs < dev_count ? 2 : 3;
+}
+
+/*
+ * Return new length for @lv based on @old_image_count and @new_image_count in @*len
+ *
+ * Subtracts any reshape space and provide data length only!
+ */
+static int _lv_reshape_get_new_len(struct logical_volume *lv,
+ uint32_t old_image_count, uint32_t new_image_count,
+ uint32_t *len)
+{
+ struct lv_segment *seg = first_seg(lv);
+ uint32_t di_old = _data_rimages_count(seg, old_image_count);
+ uint32_t di_new = _data_rimages_count(seg, new_image_count);
+ uint32_t old_lv_reshape_len, new_lv_reshape_len;
+ uint64_t r;
+
+ if (!di_old || !di_new)
+ return_0;
+
+ old_lv_reshape_len = di_old * _reshape_len_per_dev(seg);
+ new_lv_reshape_len = di_new * _reshape_len_per_dev(seg);
+
+ r = (uint64_t) lv->le_count;
+ r -= old_lv_reshape_len;
+ if ((r = new_lv_reshape_len + r * di_new / di_old) > UINT_MAX) {
+ log_error("No proper new segment length for %s!", display_lvname(lv));
+ return 0;
+ }
+
+ *len = (uint32_t) r;
+
+ return 1;
+}
+
+/*
+ * Extend/reduce size of @lv and it's first segment during reshape to @extents
+ */
+__attribute__ ((__unused__))
+static int _reshape_adjust_to_size(struct logical_volume *lv,
+ uint32_t old_image_count, uint32_t new_image_count)
+{
+ struct lv_segment *seg = first_seg(lv);
+ uint32_t new_le_count;
+
+ if (!_lv_reshape_get_new_len(lv, old_image_count, new_image_count, &new_le_count))
+ return 0;
+
+ /* Externally visible LV size w/o reshape space */
+ lv->le_count = seg->len = new_le_count;
+ lv->size = (lv->le_count - new_image_count * _reshape_len_per_dev(seg)) * lv->vg->extent_size;
+ /* seg->area_len does not change */
+
+ if (old_image_count < new_image_count) {
+ /* Extend from raid1 mapping */
+ if (old_image_count == 2 &&
+ !seg->stripe_size)
+ seg->stripe_size = DEFAULT_STRIPESIZE;
+
+ /* Reduce to raid1 mapping */
+ } else if (new_image_count == 2)
+ seg->stripe_size = 0;
+
+ return 1;
+}
/*
* _alloc_rmeta_for_lv
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=92691e345d12515d…
Commit: 92691e345d12515d61e6e7748e5b9ddc4eff49c0
Parent: c1865b0a864e0623b2395c96e7853e4637e46772
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 01:57:04 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces more local infrastructure to raid_manip.c
used by followup patches.
Changes:
- add lv_raid_data_copies returning raid type specific number;
needed for raid10 with more than 2 data copies
- remove _shift_and_rename_image_components() constraint
to support more than 10 raid legs
- add function to calculate total rimage length used by out-of-place
reshape space allocation
- add out-of-place reshape space alloc/relocate/free functions
- move _data_rimages_count() used by reshape space alloc/realocate functions
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/lv_manip.c | 2 +-
lib/metadata/raid_manip.c | 470 ++++++++++++++++++++++++++++++++++++++++++---
lib/raid/raid.c | 2 +-
3 files changed, 443 insertions(+), 31 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index f3cad09..b98391b 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -957,7 +957,7 @@ struct lv_segment *alloc_lv_segment(const struct segment_type *segtype,
seg->stripe_size = stripe_size;
seg->area_count = area_count;
seg->area_len = area_len;
- seg->data_copies = data_copies ? : 0; // lv_raid_data_copies(segtype, area_count);
+ seg->data_copies = data_copies ? : lv_raid_data_copies(segtype, area_count);
seg->chunk_size = chunk_size;
seg->region_size = region_size;
seg->extents_copied = extents_copied;
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 70e0a55..b2a5572 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -708,12 +708,11 @@ static int _reorder_raid10_near_seg_areas(struct lv_segment *seg, enum raid0_rai
*
* Returns: 1 on success, 0 on failure
*/
+static char *_generate_raid_name(struct logical_volume *lv,
+ const char *suffix, int count);
static int _shift_and_rename_image_components(struct lv_segment *seg)
{
- int len;
- char *shift_name;
uint32_t s, missing;
- struct cmd_context *cmd = seg->lv->vg->cmd;
/*
* All LVs must be properly named for their index before
@@ -724,21 +723,12 @@ static int _shift_and_rename_image_components(struct lv_segment *seg)
if (!seg_is_raid(seg))
return_0;
- if (seg->area_count > 10) {
- /*
- * FIXME: Handling more would mean I'd have
- * to handle double digits
- */
- log_error("Unable handle arrays with more than 10 devices.");
- return 0;
- }
-
log_very_verbose("Shifting images in %s.", display_lvname(seg->lv));
for (s = 0, missing = 0; s < seg->area_count; s++) {
if (seg_type(seg, s) == AREA_UNASSIGNED) {
if (seg_metatype(seg, s) != AREA_UNASSIGNED) {
- log_error(INTERNAL_ERROR "Metadata segment area"
+ log_error(INTERNAL_ERROR "Metadata segment area."
" #%d should be AREA_UNASSIGNED.", s);
return 0;
}
@@ -753,24 +743,16 @@ static int _shift_and_rename_image_components(struct lv_segment *seg)
display_lvname(seg_lv(seg, s)), missing);
/* Alter rmeta name */
- shift_name = dm_pool_strdup(cmd->mem, seg_metalv(seg, s)->name);
- if (!shift_name) {
+ if (!(seg_metalv(seg, s)->name = _generate_raid_name(seg->lv, "rmeta", s - missing))) {
log_error("Memory allocation failed.");
return 0;
}
- len = strlen(shift_name) - 1;
- shift_name[len] -= missing;
- seg_metalv(seg, s)->name = shift_name;
/* Alter rimage name */
- shift_name = dm_pool_strdup(cmd->mem, seg_lv(seg, s)->name);
- if (!shift_name) {
+ if (!(seg_lv(seg, s)->name = _generate_raid_name(seg->lv, "rimage", s - missing))) {
log_error("Memory allocation failed.");
return 0;
}
- len = strlen(shift_name) - 1;
- shift_name[len] -= missing;
- seg_lv(seg, s)->name = shift_name;
seg->areas[s - missing] = seg->areas[s];
seg->meta_areas[s - missing] = seg->meta_areas[s];
@@ -1030,6 +1012,442 @@ uint32_t raid_rimage_extents(const struct segment_type *segtype,
return r > UINT_MAX ? 0 : (uint32_t) r;
}
+/* Return number of data copies for @segtype */
+uint32_t lv_raid_data_copies(const struct segment_type *segtype, uint32_t area_count)
+{
+ if (segtype_is_any_raid10(segtype))
+ /* FIXME: change for variable number of data copies */
+ return 2;
+ else if (segtype_is_mirrored(segtype))
+ return area_count;
+ else if (segtype_is_striped_raid(segtype))
+ return segtype->parity_devs + 1;
+ return 1;
+}
+
+
+/* Return data images count for @total_rimages depending on @seg's type */
+static uint32_t _data_rimages_count(const struct lv_segment *seg, const uint32_t total_rimages)
+{
+ if (!seg_is_thin(seg) && total_rimages <= seg->segtype->parity_devs)
+ return_0;
+
+ return total_rimages - seg->segtype->parity_devs;
+}
+
+/* Get total area len of @lv, i.e. sum of area_len of all segments */
+static uint32_t _lv_total_rimage_len(struct logical_volume *lv)
+{
+ uint32_t s;
+ struct lv_segment *seg = first_seg(lv);
+
+ if (seg_is_raid(seg)) {
+ for (s = 0; s < seg->area_count; s++)
+ if (seg_lv(seg, s))
+ return seg_lv(seg, s)->le_count;
+ } else
+ return lv->le_count;
+
+ return_0;
+}
+
+/*
+ * HM helper:
+ *
+ * Compare the raid levels in segtype @t1 and @t2
+ *
+ * Return 1 if same, else 0
+ */
+static int _cmp_level(const struct segment_type *t1, const struct segment_type *t2)
+{
+ if ((segtype_is_any_raid10(t1) && !segtype_is_any_raid10(t2)) ||
+ (!segtype_is_any_raid10(t1) && segtype_is_any_raid10(t2)))
+ return 0;
+
+ return !strncmp(t1->name, t2->name, 5);
+}
+
+/*
+ * HM Helper:
+ *
+ * Check for same raid levels in segtype @t1 and @t2
+ *
+ * Return 1 if same, else != 1
+ */
+__attribute__ ((__unused__))
+static int is_same_level(const struct segment_type *t1, const struct segment_type *t2)
+{
+ return _cmp_level(t1, t2);
+}
+
+/* Return # of reshape LEs per device for @seg */
+static uint32_t _reshape_len_per_dev(struct lv_segment *seg)
+{
+ return seg->reshape_len;
+}
+
+/* Return # of reshape LEs per @lv (sum of all sub LVs reshape LEs) */
+static uint32_t _reshape_len_per_lv(struct logical_volume *lv)
+{
+ struct lv_segment *seg = first_seg(lv);
+
+ return _reshape_len_per_dev(seg) * _data_rimages_count(seg, seg->area_count);
+}
+
+/*
+ * HM Helper:
+ *
+ * store the allocated reshape length per data image
+ * in the only segment of the top-level RAID @lv and
+ * in the first segment of each sub lv.
+ */
+static int _lv_set_reshape_len(struct logical_volume *lv, uint32_t reshape_len)
+{
+ uint32_t s;
+ struct lv_segment *data_seg, *seg = first_seg(lv);
+
+ if (reshape_len >= lv->le_count - 1)
+ return_0;
+
+ seg->reshape_len = reshape_len;
+
+ for (s = 0; s < seg->area_count; s++) {
+ if (!seg_lv(seg, s))
+ return_0;
+
+ reshape_len = seg->reshape_len;
+ dm_list_iterate_items(data_seg, &seg_lv(seg, s)->segments) {
+ data_seg->reshape_len = reshape_len;
+ reshape_len = 0;
+ }
+ }
+
+ return 1;
+}
+
+/* HM Helper:
+ *
+ * correct segments logical start extents in all sub LVs of @lv
+ * after having reordered any segments in sub LVs e.g. because of
+ * reshape space (re)allocation.
+ */
+static int _lv_set_image_lvs_start_les(struct logical_volume *lv)
+{
+ uint32_t le, s;
+ struct lv_segment *data_seg, *seg = first_seg(lv);
+
+
+ for (s = 0; s < seg->area_count; s++) {
+ if (!seg_lv(seg, s))
+ return_0;
+
+ le = 0;
+ dm_list_iterate_items(data_seg, &(seg_lv(seg, s)->segments)) {
+ data_seg->reshape_len = le ? 0 : seg->reshape_len;
+ data_seg->le = le;
+ le += data_seg->len;
+ }
+ }
+
+ /* Try merging rimage sub LV segments _after_ adjusting start LEs */
+ for (s = 0; s < seg->area_count; s++)
+ if (!lv_merge_segments(seg_lv(seg, s)))
+ return_0;
+
+ return 1;
+}
+
+/*
+ * Relocate @out_of_place_les_per_disk from @lv's data images begin <-> end depending on @where
+ *
+ * @where:
+ * alloc_begin: end -> begin
+ * alloc_end: begin -> end
+ */
+enum alloc_where { alloc_begin, alloc_end, alloc_anywhere, alloc_none };
+static int _lv_relocate_reshape_space(struct logical_volume *lv, enum alloc_where where)
+{
+ uint32_t le, begin, end, s;
+ struct logical_volume *dlv;
+ struct dm_list *insert;
+ struct lv_segment *data_seg, *seg = first_seg(lv);
+
+ if (!_reshape_len_per_dev(seg))
+ return_0;
+
+ /*
+ * Move the reshape LEs of each stripe (i.e. the data image sub lv)
+ * in the first/last segment(s) across to the opposite end of the
+ * address space
+ */
+ for (s = 0; s < seg->area_count; s++) {
+ if (!(dlv = seg_lv(seg, s)))
+ return_0;
+
+ switch (where) {
+ case alloc_begin:
+ /* Move to the beginning -> start moving to the beginning from "end - reshape LEs" to end */
+ begin = dlv->le_count - _reshape_len_per_dev(seg);
+ end = dlv->le_count;
+ break;
+ case alloc_end:
+ /* Move to the end -> start moving to the end from 0 and end with reshape LEs */
+ begin = 0;
+ end = _reshape_len_per_dev(seg);
+ break;
+ default:
+ log_error(INTERNAL_ERROR "bogus reshape space reallocation request [%d]", where);
+ return 0;
+ }
+
+ /* Ensure segment boundary at begin/end of reshape space */
+ if (!lv_split_segment(dlv, begin ?: end))
+ return_0;
+
+ /* Select destination to move to (begin/end) */
+ insert = begin ? dlv->segments.n : &dlv->segments;
+ if (!(data_seg = find_seg_by_le(dlv, begin)))
+ return_0;
+
+ le = begin;
+ while (le < end) {
+ struct dm_list *n = data_seg->list.n;
+
+ le += data_seg->len;
+
+ dm_list_move(insert, &data_seg->list);
+
+ /* If moving to the begin, adjust insertion point so that we don't reverse order */
+ if (begin)
+ insert = data_seg->list.n;
+
+ data_seg = dm_list_item(n, struct lv_segment);
+ }
+
+ le = 0;
+ dm_list_iterate_items(data_seg, &dlv->segments) {
+ data_seg->reshape_len = le ? 0 : _reshape_len_per_dev(seg);
+ data_seg->le = le;
+ le += data_seg->len;
+ }
+ }
+
+ return 1;
+}
+
+/*
+ * Check if we've got out of space reshape
+ * capacity in @lv and allocate if necessary.
+ *
+ * We inquire the targets status interface to retrieve
+ * the current data_offset and the device size and
+ * compare that to the size of the component image LV
+ * to tell if an extension of the LV is needed or
+ * existing space can just be used,
+ *
+ * Three different scenarios need to be covered:
+ *
+ * - we have to reshape forwards
+ * (true for adding disks to a raid set) ->
+ * add extent to each component image upfront
+ * or move an existing one at the end across;
+ * kernel will set component devs data_offset to
+ * the passed in one and new_data_offset to 0,
+ * i.e. the data starts at offset 0 after the reshape
+ *
+ * - we have to reshape backwards
+ * (true for removing disks form a raid set) ->
+ * add extent to each component image by the end
+ * or use already existing one from a previous reshape;
+ * kernel will leave the data_offset of each component dev
+ * at 0 and set new_data_offset to the passed in one,
+ * i.e. the data will be at offset new_data_offset != 0
+ * after the reshape
+ *
+ * - we are free to reshape either way
+ * (true for layout changes keeping number of disks) ->
+ * let the kernel identify free out of place reshape space
+ * and select the appropriate data_offset and reshape direction
+ *
+ * Kernel will always be told to put data offset
+ * on an extent boundary.
+ * When we convert to mappings outside MD ones such as linear,
+ * striped and mirror _and_ data_offset != 0, split the first segment
+ * and adjust the rest to remove the reshape space.
+ * If it's at the end, just lv_reduce() and set seg->reshape_len to 0.
+ *
+ * Does not write metadata!
+ */
+static int _lv_alloc_reshape_space(struct logical_volume *lv,
+ enum alloc_where where,
+ enum alloc_where *where_it_was,
+ struct dm_list *allocate_pvs)
+{
+ uint32_t out_of_place_les_per_disk;
+ uint64_t data_offset;
+ struct lv_segment *seg = first_seg(lv);
+
+ if (!seg->stripe_size)
+ return_0;
+
+ /* Ensure min out-of-place reshape space 1 MiB */
+ out_of_place_les_per_disk = max(2048U, (unsigned) seg->stripe_size);
+ out_of_place_les_per_disk = (uint32_t) max(out_of_place_les_per_disk / (unsigned long long) lv->vg->extent_size, 1ULL);
+
+ /* Get data_offset and dev_sectors from the kernel */
+ if (!lv_raid_data_offset(lv, &data_offset)) {
+ log_error("Can't get data offset and dev size for %s from kernel.",
+ display_lvname(lv));
+ return 0;
+ }
+
+ /*
+ * If we have reshape space allocated and it has to grow,
+ * relocate it to the end in case kernel says it is at the
+ * beginning in order to grow the LV.
+ */
+ if (_reshape_len_per_dev(seg)) {
+ if (out_of_place_les_per_disk > _reshape_len_per_dev(seg)) {
+ /* Kernel says data is at data_offset > 0 -> relocate reshape space at the begin to the end */
+ if (data_offset && !_lv_relocate_reshape_space(lv, alloc_end))
+ return_0;
+
+ data_offset = 0;
+ out_of_place_les_per_disk -= _reshape_len_per_dev(seg);
+ } else
+ out_of_place_les_per_disk = 0;
+ }
+
+ /*
+ * If we don't reshape space allocated extend the LV.
+ *
+ * first_seg(lv)->reshape_len (only segment of top level raid LV)
+ * is accounting for the data rimages so that unchanged
+ * lv_extend()/lv_reduce() can be used to allocate/free,
+ * because seg->len etc. still holds the whole size as before
+ * including the reshape space
+ */
+ if (out_of_place_les_per_disk) {
+ uint32_t data_rimages = _data_rimages_count(seg, seg->area_count);
+ uint32_t reshape_len = out_of_place_les_per_disk * data_rimages;
+ uint32_t prev_rimage_len = _lv_total_rimage_len(lv);
+ uint64_t lv_size = lv->size;
+
+ if (!lv_extend(lv, seg->segtype, data_rimages,
+ seg->stripe_size, 1, seg->region_size,
+ reshape_len /* # of reshape LEs to add */,
+ allocate_pvs, lv->alloc, 0)) {
+ log_error("Failed to allocate out-of-place reshape space for %s.",
+ display_lvname(lv));
+ return 0;
+ }
+
+ lv->size = lv_size;
+ /* pay attention to lv_extend maybe having allocated more because of layout specific rounding */
+ if (!_lv_set_reshape_len(lv, _lv_total_rimage_len(lv) - prev_rimage_len))
+ return 0;
+ }
+
+ /* Preset data offset in case we fail relocating reshape space below */
+ seg->data_offset = 0;
+
+ /*
+ * Handle reshape space relocation
+ */
+ switch (where) {
+ case alloc_begin:
+ /* Kernel says data is at data_offset == 0 -> relocate reshape space at the end to the begin */
+ if (!data_offset && !_lv_relocate_reshape_space(lv, where))
+ return_0;
+ break;
+
+ case alloc_end:
+ /* Kernel says data is at data_offset > 0 -> relocate reshape space at the begin to the end */
+ if (data_offset && !_lv_relocate_reshape_space(lv, where))
+ return_0;
+ break;
+
+ case alloc_anywhere:
+ /* We don't care where the space is, kernel will just toggle data_offset accordingly */
+ break;
+
+ default:
+ log_error(INTERNAL_ERROR "Bogus reshape space allocation request.");
+ return 0;
+ }
+
+ if (where_it_was)
+ *where_it_was = data_offset ? alloc_begin : alloc_end;
+
+ /* Inform kernel about the reshape length in sectors */
+ seg->data_offset = _reshape_len_per_dev(seg) * lv->vg->extent_size;
+
+ return _lv_set_image_lvs_start_les(lv);
+}
+
+/* Remove any reshape space from the data LVs of @lv */
+static int _lv_free_reshape_space_with_status(struct logical_volume *lv, enum alloc_where *where_it_was)
+{
+ uint32_t total_reshape_len;
+ struct lv_segment *seg = first_seg(lv);
+
+ if ((total_reshape_len = _reshape_len_per_lv(lv))) {
+ enum alloc_where where;
+ /*
+ * raid10:
+ *
+ * the allocator will have added times #data_copies stripes,
+ * so we need to lv_reduce() less visible size.
+ */
+ if (seg_is_any_raid10(seg)) {
+ if (total_reshape_len % seg->data_copies)
+ return_0;
+
+ total_reshape_len /= seg->data_copies;
+ }
+
+ /*
+ * Got reshape space on request to free it.
+ *
+ * If it happens to be at the beginning of
+ * the data LVs, remap it to the end in order
+ * to be able to free it via lv_reduce().
+ */
+ if (!_lv_alloc_reshape_space(lv, alloc_end, &where, NULL))
+ return_0;
+
+ seg->extents_copied = first_seg(lv)->area_len;
+ if (!lv_reduce(lv, total_reshape_len))
+ return_0;
+
+ seg->extents_copied = first_seg(lv)->area_len;
+
+ if (!_lv_set_reshape_len(lv, 0))
+ return 0;
+
+ /*
+ * Only in case reshape space was freed at the beginning,
+ * which is indicated by "where == alloc_begin",
+ * tell kernel to adjust data_offsets on raid devices to 0.
+ *
+ * The special, unused value '1' for seg->data_offset will cause
+ * "data_offset 0" to be emitted in the segment line.
+ */
+ seg->data_offset = (where == alloc_begin) ? 1 : 0;
+
+ } else if (where_it_was)
+ *where_it_was = alloc_none;
+
+ return 1;
+}
+
+__attribute__ ((__unused__))
+static int _lv_free_reshape_space(struct logical_volume *lv)
+{
+ return _lv_free_reshape_space_with_status(lv, NULL);
+}
+
+
/*
* _alloc_rmeta_for_lv
* @lv
@@ -4088,12 +4506,6 @@ static takeover_fn_t _get_takeover_fn(const struct lv_segment *seg, const struct
return _takeover_fns[_segtype_ix(seg->segtype, seg->area_count)][_segtype_ix(new_segtype, new_image_count)];
}
-/* Number of data (not parity) rimages */
-static uint32_t _data_rimages_count(const struct lv_segment *seg, const uint32_t total_rimages)
-{
- return total_rimages - seg->segtype->parity_devs;
-}
-
/*
* Determine whether data_copies, stripes, stripe_size are
* possible for conversion from seg_from to new_segtype.
diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index 398e8b0..59db437 100644
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -171,7 +171,7 @@ static int _raid_text_import(struct lv_segment *seg,
}
if (seg->data_copies < 2)
- seg->data_copies = 0; // lv_raid_data_copies(seg->segtype, seg->area_count);
+ seg->data_copies = lv_raid_data_copies(seg->segtype, seg->area_count);
if (seg_is_any_raid0(seg))
seg->area_len /= seg->area_count;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c1865b0a864e0623…
Commit: c1865b0a864e0623b2395c96e7853e4637e46772
Parent: b499d96215a67711220b44fcb88693221c6d7ef5
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 01:29:37 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
raid: typo
---
lib/metadata/raid_manip.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 9c94b24..70e0a55 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -434,7 +434,7 @@ static int _lv_update_and_reload_list(struct logical_volume *lv, int origin_only
display_lvname(lock_lv));
vg_revert(vg);
} else if (!(r = vg_commit(vg)))
- stack; /* !vg_commit() has implict vg_revert() */
+ stack; /* !vg_commit() has implicit vg_revert() */
if (r && lv_list) {
dm_list_iterate_items(lvl, lv_list) {
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b499d96215a67711…
Commit: b499d96215a67711220b44fcb88693221c6d7ef5
Parent: e2354ea344c248ede9faa872c260d46985830c0f
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 01:18:38 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces local infrastructure to raid_manip.c
used by followup patches.
Add functions:
- to check reshaping is supported in target attibute
- to return device health string needed to check
the raid device is ready to reshape
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/metadata/raid_manip.c | 56 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 9ecc410..9c94b24 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -50,6 +50,24 @@ static int _check_num_areas_in_lv_segments(struct logical_volume *lv, unsigned n
}
/*
+ * Check if reshape is supported in the kernel.
+ */
+__attribute__ ((__unused__))
+static int _reshape_is_supported(struct cmd_context *cmd, const struct segment_type *segtype)
+{
+ unsigned attrs;
+
+ if (!segtype->ops->target_present ||
+ !segtype->ops->target_present(cmd, NULL, &attrs) ||
+ !(attrs & RAID_FEATURE_RESHAPE)) {
+ log_error("RAID module does not support reshape.");
+ return 0;
+ }
+
+ return 1;
+}
+
+/*
* Ensure region size exceeds the minimum for @lv because
* MD's bitmap is limited to tracking 2^21 regions.
*
@@ -228,6 +246,44 @@ static int _deactivate_and_remove_lvs(struct volume_group *vg, struct dm_list *r
}
/*
+ * HM Helper:
+ *
+ * report health string in @*raid_health for @lv from kernel reporting # of devs in @*kernel_devs
+ */
+__attribute__ ((__unused__))
+static int _get_dev_health(struct logical_volume *lv, uint32_t *kernel_devs,
+ uint32_t *devs_health, uint32_t *devs_in_sync,
+ char **raid_health)
+{
+ unsigned d;
+ char *rh;
+
+ *devs_health = *devs_in_sync = 0;
+
+ if (!lv_raid_dev_count(lv, kernel_devs)) {
+ log_error("Failed to get device count.");
+ return_0;
+ }
+
+ if (!lv_raid_dev_health(lv, &rh)) {
+ log_error("Failed to get device health.");
+ return_0;
+ }
+
+ d = (unsigned) strlen(rh);
+ while (d--) {
+ (*devs_health)++;
+ if (rh[d] == 'A')
+ (*devs_in_sync)++;
+ }
+
+ if (raid_health)
+ *raid_health = rh;
+
+ return 1;
+}
+
+/*
* _raid_in_sync
* @lv
*
1
0
24 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e2354ea344c248ed…
Commit: e2354ea344c248ede9faa872c260d46985830c0f
Parent: ffe3ca26e05f9bb10f004bafe6866b189d7ac385
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 24 00:50:00 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 24 05:20:58 2017 +0100
lvconvert: add infrastructure for RaidLV reshaping support
In order to support striped raid5/6/10 LV reshaping (change
of LV type, stripesize or number of legs), this patch
introduces infrastructure prerequisites to be used
by raid_manip.c extensions in followup patches.
This base is needed for allocation of out-of-place
reshape space required by the MD raid personalities to
avoid writing over data in-place when reading off the
current RAID layout or number of legs and writing out
the new layout or to a different number of legs
(i.e. restripe)
Changes:
- add members reshape_len to 'struct lv_segment' to store
out-of-place reshape length per component rimage
- add member data_copies to struct lv_segment
to support more than 2 raid10 data copies
- make alloc_lv_segment() aware of both reshape_len and data_copies
- adjust all alloc_lv_segment() callers to the new API
- add functions to retrieve the current data offset (needed for
out-of-place reshaping space allocation) and the devices count
from the kernel
- make libdm deptree code aware of reshape_len
- add LV flags for disk add/remove reshaping
- support import/export of the new 'struct lv_segment' members
- enhance lv_extend/_lv_reduce to cope with reshape_len
- add seg_is_*/segtype_is_* macros related to reshaping
- add target version check for reshaping
- grow rebuilds/writemostly bitmaps to 246 bit to support kernel maximal
- enhance libdm deptree code to support data_offset (out-of-place reshaping)
and delta_disk (legs add/remove reshaping) target arguments
Related: rhbz834579
Related: rhbz1191935
Related: rhbz1191978
---
lib/activate/activate.c | 60 ++++++++++++++++++-
lib/activate/activate.h | 2 +
lib/activate/dev_manager.c | 19 ++++--
lib/format1/import-extents.c | 10 ++--
lib/format_pool/import_export.c | 10 ++--
lib/format_text/export.c | 6 +-
lib/format_text/flags.c | 5 +-
lib/format_text/import_vsn1.c | 16 ++++-
lib/metadata/lv.c | 5 +-
lib/metadata/lv_alloc.h | 4 +-
lib/metadata/lv_manip.c | 76 ++++++++++++++--------
lib/metadata/merge.c | 22 +++---
lib/metadata/metadata-exported.h | 15 ++++-
lib/metadata/raid_manip.c | 12 ++--
lib/metadata/segtype.c | 3 +-
lib/metadata/segtype.h | 7 ++
lib/metadata/snapshot_manip.c | 4 +-
lib/raid/raid.c | 126 ++++++++++++++++++++++++++------------
libdm/libdevmapper.h | 20 ++++--
libdm/libdm-common.h | 2 +
libdm/libdm-deptree.c | 119 +++++++++++++++++++++++++----------
libdm/libdm-targets.c | 18 ++++++
tools/lvconvert.c | 34 ++++++++---
23 files changed, 430 insertions(+), 165 deletions(-)
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index ea56735..a3978ad 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2016 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -272,10 +272,18 @@ int lv_raid_percent(const struct logical_volume *lv, dm_percent_t *percent)
{
return 0;
}
+int lv_raid_data_offset(const struct logical_volume *lv, uint64_t *data_offset)
+{
+ return 0;
+}
int lv_raid_dev_health(const struct logical_volume *lv, char **dev_health)
{
return 0;
}
+int lv_raid_dev_count(const struct logical_volume *lv, uint32_t *dev_cnt)
+{
+ return 0;
+}
int lv_raid_mismatch_count(const struct logical_volume *lv, uint64_t *cnt)
{
return 0;
@@ -984,6 +992,30 @@ int lv_raid_percent(const struct logical_volume *lv, dm_percent_t *percent)
return lv_mirror_percent(lv->vg->cmd, lv, 0, percent, NULL);
}
+int lv_raid_data_offset(const struct logical_volume *lv, uint64_t *data_offset)
+{
+ int r;
+ struct dev_manager *dm;
+ struct dm_status_raid *status;
+
+ if (!lv_info(lv->vg->cmd, lv, 0, NULL, 0, 0))
+ return 0;
+
+ log_debug_activation("Checking raid data offset and dev sectors for LV %s/%s",
+ lv->vg->name, lv->name);
+ if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
+ return_0;
+
+ if (!(r = dev_manager_raid_status(dm, lv, &status)))
+ stack;
+
+ *data_offset = status->data_offset;
+
+ dev_manager_destroy(dm);
+
+ return r;
+}
+
int lv_raid_dev_health(const struct logical_volume *lv, char **dev_health)
{
int r;
@@ -1013,6 +1045,32 @@ int lv_raid_dev_health(const struct logical_volume *lv, char **dev_health)
return r;
}
+int lv_raid_dev_count(const struct logical_volume *lv, uint32_t *dev_cnt)
+{
+ struct dev_manager *dm;
+ struct dm_status_raid *status;
+
+ *dev_cnt = 0;
+
+ if (!lv_info(lv->vg->cmd, lv, 0, NULL, 0, 0))
+ return 0;
+
+ log_debug_activation("Checking raid device count for LV %s/%s",
+ lv->vg->name, lv->name);
+ if (!(dm = dev_manager_create(lv->vg->cmd, lv->vg->name, 1)))
+ return_0;
+
+ if (!dev_manager_raid_status(dm, lv, &status)) {
+ dev_manager_destroy(dm);
+ return_0;
+ }
+ *dev_cnt = status->dev_count;
+
+ dev_manager_destroy(dm);
+
+ return 1;
+}
+
int lv_raid_mismatch_count(const struct logical_volume *lv, uint64_t *cnt)
{
struct dev_manager *dm;
diff --git a/lib/activate/activate.h b/lib/activate/activate.h
index 85c1521..09d25c5 100644
--- a/lib/activate/activate.h
+++ b/lib/activate/activate.h
@@ -168,6 +168,8 @@ int lv_snapshot_percent(const struct logical_volume *lv, dm_percent_t *percent);
int lv_mirror_percent(struct cmd_context *cmd, const struct logical_volume *lv,
int wait, dm_percent_t *percent, uint32_t *event_nr);
int lv_raid_percent(const struct logical_volume *lv, dm_percent_t *percent);
+int lv_raid_dev_count(const struct logical_volume *lv, uint32_t *dev_cnt);
+int lv_raid_data_offset(const struct logical_volume *lv, uint64_t *data_offset);
int lv_raid_dev_health(const struct logical_volume *lv, char **dev_health);
int lv_raid_mismatch_count(const struct logical_volume *lv, uint64_t *cnt);
int lv_raid_sync_action(const struct logical_volume *lv, char **sync_action);
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index cde026e..49d9ad3 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2016 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -214,6 +214,14 @@ typedef enum {
STATUS, /* DM_DEVICE_STATUS ioctl */
} info_type_t;
+/* Return length of segment depending on type and reshape_len */
+static uint32_t _seg_len(const struct lv_segment *seg)
+{
+ uint32_t reshape_len = seg_is_raid(seg) ? ((seg->area_count - seg->segtype->parity_devs) * seg->reshape_len) : 0;
+
+ return seg->len - reshape_len;
+}
+
static int _info_run(const char *dlid, struct dm_info *dminfo,
uint32_t *read_ahead,
struct lv_seg_status *seg_status,
@@ -250,7 +258,7 @@ static int _info_run(const char *dlid, struct dm_info *dminfo,
if (seg_status && dminfo->exists) {
start = length = seg_status->seg->lv->vg->extent_size;
start *= seg_status->seg->le;
- length *= seg_status->seg->len;
+ length *= _seg_len(seg_status->seg);
do {
target = dm_get_next_target(dmt, target, &target_start,
@@ -2214,7 +2222,7 @@ static char *_add_error_or_zero_device(struct dev_manager *dm, struct dm_tree *d
struct lv_segment *seg_i;
struct dm_info info;
int segno = -1, i = 0;
- uint64_t size = (uint64_t) seg->len * seg->lv->vg->extent_size;
+ uint64_t size = (uint64_t) _seg_len(seg) * seg->lv->vg->extent_size;
dm_list_iterate_items(seg_i, &seg->lv->segments) {
if (seg == seg_i) {
@@ -2500,7 +2508,7 @@ static int _add_target_to_dtree(struct dev_manager *dm,
return seg->segtype->ops->add_target_line(dm, dm->mem, dm->cmd,
&dm->target_state, seg,
laopts, dnode,
- extent_size * seg->len,
+ extent_size * _seg_len(seg),
&dm->pvmove_mirror_count);
}
@@ -2693,7 +2701,7 @@ static int _add_segment_to_dtree(struct dev_manager *dm,
/* Replace target and all its used devs with error mapping */
log_debug_activation("Using error for pending delete %s.",
display_lvname(seg->lv));
- if (!dm_tree_node_add_error_target(dnode, (uint64_t)seg->lv->vg->extent_size * seg->len))
+ if (!dm_tree_node_add_error_target(dnode, (uint64_t)seg->lv->vg->extent_size * _seg_len(seg)))
return_0;
} else if (!_add_target_to_dtree(dm, dnode, seg, laopts))
return_0;
@@ -3165,7 +3173,6 @@ static int _tree_action(struct dev_manager *dm, const struct logical_volume *lv,
log_error(INTERNAL_ERROR "_tree_action: Action %u not supported.", action);
goto out;
}
-
r = 1;
out:
diff --git a/lib/format1/import-extents.c b/lib/format1/import-extents.c
index 3ab3ac4..4c259c1 100644
--- a/lib/format1/import-extents.c
+++ b/lib/format1/import-extents.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -225,8 +225,8 @@ static int _read_linear(struct cmd_context *cmd, struct lv_map *lvm)
while (le < lvm->lv->le_count) {
len = _area_length(lvm, le);
- if (!(seg = alloc_lv_segment(segtype, lvm->lv, le, len, 0, 0,
- NULL, 1, len, 0, 0, 0, NULL))) {
+ if (!(seg = alloc_lv_segment(segtype, lvm->lv, le, len, 0, 0, 0,
+ NULL, 1, len, 0, 0, 0, 0, NULL))) {
log_error("Failed to allocate linear segment.");
return 0;
}
@@ -297,10 +297,10 @@ static int _read_stripes(struct cmd_context *cmd, struct lv_map *lvm)
if (!(seg = alloc_lv_segment(segtype, lvm->lv,
lvm->stripes * first_area_le,
- lvm->stripes * area_len,
+ lvm->stripes * area_len, 0,
0, lvm->stripe_size, NULL,
lvm->stripes,
- area_len, 0, 0, 0, NULL))) {
+ area_len, 0, 0, 0, 0, NULL))) {
log_error("Failed to allocate striped segment.");
return 0;
}
diff --git a/lib/format_pool/import_export.c b/lib/format_pool/import_export.c
index 2f0f2eb..f4097a7 100644
--- a/lib/format_pool/import_export.c
+++ b/lib/format_pool/import_export.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1997-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -192,9 +192,9 @@ static int _add_stripe_seg(struct dm_pool *mem,
return_0;
if (!(seg = alloc_lv_segment(segtype, lv, *le_cur,
- area_len * usp->num_devs, 0,
+ area_len * usp->num_devs, 0, 0,
usp->striping, NULL, usp->num_devs,
- area_len, 0, 0, 0, NULL))) {
+ area_len, 0, 0, 0, 0, NULL))) {
log_error("Unable to allocate striped lv_segment structure");
return 0;
}
@@ -232,8 +232,8 @@ static int _add_linear_seg(struct dm_pool *mem,
area_len = (usp->devs[j].blocks) / POOL_PE_SIZE;
if (!(seg = alloc_lv_segment(segtype, lv, *le_cur,
- area_len, 0, usp->striping,
- NULL, 1, area_len,
+ area_len, 0, 0, usp->striping,
+ NULL, 1, area_len, 0,
POOL_PE_SIZE, 0, 0, NULL))) {
log_error("Unable to allocate linear lv_segment "
"structure");
diff --git a/lib/format_text/export.c b/lib/format_text/export.c
index 199c185..899ff45 100644
--- a/lib/format_text/export.c
+++ b/lib/format_text/export.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -583,8 +583,10 @@ static int _print_segment(struct formatter *f, struct volume_group *vg,
outf(f, "start_extent = %u", seg->le);
outsize(f, (uint64_t) seg->len * vg->extent_size,
"extent_count = %u", seg->len);
-
outnl(f);
+ if (seg->reshape_len)
+ outsize(f, (uint64_t) seg->reshape_len * vg->extent_size,
+ "reshape_count = %u", seg->reshape_len);
outf(f, "type = \"%s\"", seg->segtype->name);
if (!_out_list(f, &seg->tags, "tags"))
diff --git a/lib/format_text/flags.c b/lib/format_text/flags.c
index 75b9054..716e632 100644
--- a/lib/format_text/flags.c
+++ b/lib/format_text/flags.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2013 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -61,6 +61,9 @@ static const struct flag _lv_flags[] = {
{LOCKED, "LOCKED", STATUS_FLAG},
{LV_NOTSYNCED, "NOTSYNCED", STATUS_FLAG},
{LV_REBUILD, "REBUILD", STATUS_FLAG},
+ {LV_RESHAPE_DELTA_DISKS_PLUS, "RESHAPE_DELTA_DISKS_PLUS", STATUS_FLAG},
+ {LV_RESHAPE_DELTA_DISKS_MINUS, "RESHAPE_DELTA_DISKS_MINUS", STATUS_FLAG},
+ {LV_REMOVE_AFTER_RESHAPE, "REMOVE_AFTER_RESHAPE", STATUS_FLAG},
{LV_WRITEMOSTLY, "WRITEMOSTLY", STATUS_FLAG},
{LV_ACTIVATION_SKIP, "ACTIVATION_SKIP", COMPATIBLE_FLAG},
{LV_ERROR_WHEN_FULL, "ERROR_WHEN_FULL", COMPATIBLE_FLAG},
diff --git a/lib/format_text/import_vsn1.c b/lib/format_text/import_vsn1.c
index 00caf21..e545008 100644
--- a/lib/format_text/import_vsn1.c
+++ b/lib/format_text/import_vsn1.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -354,7 +354,7 @@ static int _read_segment(struct logical_volume *lv, const struct dm_config_node
struct lv_segment *seg;
const struct dm_config_node *sn_child = sn->child;
const struct dm_config_value *cv;
- uint32_t start_extent, extent_count;
+ uint32_t area_extents, start_extent, extent_count, reshape_count, data_copies;
struct segment_type *segtype;
const char *segtype_str;
@@ -375,6 +375,12 @@ static int _read_segment(struct logical_volume *lv, const struct dm_config_node
return 0;
}
+ if (!_read_int32(sn_child, "reshape_count", &reshape_count))
+ reshape_count = 0;
+
+ if (!_read_int32(sn_child, "data_copies", &data_copies))
+ data_copies = 1;
+
segtype_str = SEG_TYPE_NAME_STRIPED;
if (!dm_config_get_str(sn_child, "type", &segtype_str)) {
@@ -389,9 +395,11 @@ static int _read_segment(struct logical_volume *lv, const struct dm_config_node
!segtype->ops->text_import_area_count(sn_child, &area_count))
return_0;
+ area_extents = segtype->parity_devs ?
+ raid_rimage_extents(segtype, extent_count, area_count - segtype->parity_devs, data_copies) : extent_count;
if (!(seg = alloc_lv_segment(segtype, lv, start_extent,
- extent_count, 0, 0, NULL, area_count,
- extent_count, 0, 0, 0, NULL))) {
+ extent_count, reshape_count, 0, 0, NULL, area_count,
+ area_extents, data_copies, 0, 0, 0, NULL))) {
log_error("Segment allocation failed");
return 0;
}
diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
index 8587902..b54e391 100644
--- a/lib/metadata/lv.c
+++ b/lib/metadata/lv.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2016 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -1278,6 +1278,9 @@ char *lv_attr_dup_with_info_and_seg_status(struct dm_pool *mem, const struct lv_
repstr[8] = 'm'; /* RAID has 'm'ismatches */
} else if (lv->status & LV_WRITEMOSTLY)
repstr[8] = 'w'; /* sub-LV has 'w'ritemostly */
+ else if (lv->status & LV_REMOVE_AFTER_RESHAPE)
+ repstr[8] = 'R'; /* sub-LV got freed from raid set by reshaping
+ and has to be 'R'emoved */
} else if (lvdm->seg_status.type == SEG_STATUS_CACHE) {
if (lvdm->seg_status.cache->fail)
repstr[8] = 'F';
diff --git a/lib/metadata/lv_alloc.h b/lib/metadata/lv_alloc.h
index f7bc713..cf2c579 100644
--- a/lib/metadata/lv_alloc.h
+++ b/lib/metadata/lv_alloc.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -21,11 +21,13 @@
struct lv_segment *alloc_lv_segment(const struct segment_type *segtype,
struct logical_volume *lv,
uint32_t le, uint32_t len,
+ uint32_t reshape_len,
uint64_t status,
uint32_t stripe_size,
struct logical_volume *log_lv,
uint32_t area_count,
uint32_t area_len,
+ uint32_t data_copies,
uint32_t chunk_size,
uint32_t region_size,
uint32_t extents_copied,
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 78cc30e..f3cad09 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2014 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -912,11 +912,13 @@ static uint32_t _round_to_stripe_boundary(struct volume_group *vg, uint32_t exte
struct lv_segment *alloc_lv_segment(const struct segment_type *segtype,
struct logical_volume *lv,
uint32_t le, uint32_t len,
+ uint32_t reshape_len,
uint64_t status,
uint32_t stripe_size,
struct logical_volume *log_lv,
uint32_t area_count,
uint32_t area_len,
+ uint32_t data_copies,
uint32_t chunk_size,
uint32_t region_size,
uint32_t extents_copied,
@@ -950,10 +952,12 @@ struct lv_segment *alloc_lv_segment(const struct segment_type *segtype,
seg->lv = lv;
seg->le = le;
seg->len = len;
+ seg->reshape_len = reshape_len;
seg->status = status;
seg->stripe_size = stripe_size;
seg->area_count = area_count;
seg->area_len = area_len;
+ seg->data_copies = data_copies ? : 0; // lv_raid_data_copies(segtype, area_count);
seg->chunk_size = chunk_size;
seg->region_size = region_size;
seg->extents_copied = extents_copied;
@@ -1047,11 +1051,10 @@ static int _release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t
if (lv_is_raid_image(lv)) {
/* Calculate the amount of extents to reduce per rmate/rimage LV */
uint32_t rimage_extents;
+ struct lv_segment *seg1 = first_seg(lv);
- /* FIXME: avoid extra seg_is_*() conditonals */
- area_reduction =_round_to_stripe_boundary(lv->vg, area_reduction,
- (seg_is_raid1(seg) || seg_is_any_raid0(seg)) ? 0 : _raid_stripes_count(seg), 0);
- rimage_extents = raid_rimage_extents(seg->segtype, area_reduction, seg_is_any_raid0(seg) ? 0 : _raid_stripes_count(seg),
+ /* FIXME: avoid extra seg_is_*() conditionals here */
+ rimage_extents = raid_rimage_extents(seg1->segtype, area_reduction, seg_is_any_raid0(seg) ? 0 : _raid_stripes_count(seg),
seg_is_raid10(seg) ? 1 :_raid_data_copies(seg));
if (!rimage_extents)
return 0;
@@ -1258,7 +1261,7 @@ static uint32_t _calc_area_multiple(const struct segment_type *segtype,
* the 'stripes' argument will always need to
* be given.
*/
- if (!strcmp(segtype->name, _lv_type_names[LV_TYPE_RAID10])) {
+ if (segtype_is_raid10(segtype)) {
if (!stripes)
return area_count / 2;
return stripes;
@@ -1278,16 +1281,17 @@ static uint32_t _calc_area_multiple(const struct segment_type *segtype,
static int _lv_segment_reduce(struct lv_segment *seg, uint32_t reduction)
{
uint32_t area_reduction, s;
+ uint32_t areas = (seg->area_count / (seg_is_raid10(seg) ? seg->data_copies : 1)) - seg->segtype->parity_devs;
/* Caller must ensure exact divisibility */
- if (seg_is_striped(seg)) {
- if (reduction % seg->area_count) {
+ if (seg_is_striped(seg) || seg_is_striped_raid(seg)) {
+ if (reduction % areas) {
log_error("Segment extent reduction %" PRIu32
" not divisible by #stripes %" PRIu32,
reduction, seg->area_count);
return 0;
}
- area_reduction = (reduction / seg->area_count);
+ area_reduction = reduction / areas;
} else
area_reduction = reduction;
@@ -1296,7 +1300,11 @@ static int _lv_segment_reduce(struct lv_segment *seg, uint32_t reduction)
return_0;
seg->len -= reduction;
- seg->area_len -= area_reduction;
+
+ if (seg_is_raid(seg))
+ seg->area_len = seg->len;
+ else
+ seg->area_len -= area_reduction;
return 1;
}
@@ -1306,11 +1314,13 @@ static int _lv_segment_reduce(struct lv_segment *seg, uint32_t reduction)
*/
static int _lv_reduce(struct logical_volume *lv, uint32_t extents, int delete)
{
- struct lv_segment *seg;
+ struct lv_segment *seg = first_seg(lv);;
uint32_t count = extents;
uint32_t reduction;
struct logical_volume *pool_lv;
struct logical_volume *external_lv = NULL;
+ int is_raid10 = seg_is_any_raid10(seg) && seg->reshape_len;
+ uint32_t data_copies = seg->data_copies;
if (lv_is_merging_origin(lv)) {
log_debug_metadata("Dropping snapshot merge of %s to removed origin %s.",
@@ -1373,7 +1383,15 @@ static int _lv_reduce(struct logical_volume *lv, uint32_t extents, int delete)
count -= reduction;
}
- lv->le_count -= extents;
+ seg = first_seg(lv);
+
+ if (is_raid10) {
+ lv->le_count -= extents * data_copies;
+ if (seg)
+ seg->len = seg->area_len = lv->le_count;
+ } else
+ lv->le_count -= extents;
+
lv->size = (uint64_t) lv->le_count * lv->vg->extent_size;
if (!delete)
@@ -1793,10 +1811,10 @@ static int _setup_alloced_segment(struct logical_volume *lv, uint64_t status,
area_multiple = _calc_area_multiple(segtype, area_count, 0);
extents = aa[0].len * area_multiple;
- if (!(seg = alloc_lv_segment(segtype, lv, lv->le_count, extents,
+ if (!(seg = alloc_lv_segment(segtype, lv, lv->le_count, extents, 0,
status, stripe_size, NULL,
area_count,
- aa[0].len, 0u, region_size, 0u, NULL))) {
+ aa[0].len, 0, 0u, region_size, 0u, NULL))) {
log_error("Couldn't allocate new LV segment.");
return 0;
}
@@ -3234,9 +3252,9 @@ int lv_add_virtual_segment(struct logical_volume *lv, uint64_t status,
seg->area_len += extents;
seg->len += extents;
} else {
- if (!(seg = alloc_lv_segment(segtype, lv, lv->le_count, extents,
+ if (!(seg = alloc_lv_segment(segtype, lv, lv->le_count, extents, 0,
status, 0, NULL, 0,
- extents, 0, 0, 0, NULL))) {
+ extents, 0, 0, 0, 0, NULL))) {
log_error("Couldn't allocate new %s segment.", segtype->name);
return 0;
}
@@ -3562,10 +3580,10 @@ static struct lv_segment *_convert_seg_to_mirror(struct lv_segment *seg,
}
if (!(newseg = alloc_lv_segment(get_segtype_from_string(seg->lv->vg->cmd, SEG_TYPE_NAME_MIRROR),
- seg->lv, seg->le, seg->len,
+ seg->lv, seg->le, seg->len, 0,
seg->status, seg->stripe_size,
log_lv,
- seg->area_count, seg->area_len,
+ seg->area_count, seg->area_len, 0,
seg->chunk_size, region_size,
seg->extents_copied, NULL))) {
log_error("Couldn't allocate converted LV segment.");
@@ -3667,8 +3685,8 @@ int lv_add_segmented_mirror_image(struct alloc_handle *ah,
}
if (!(new_seg = alloc_lv_segment(segtype, copy_lv,
- seg->le, seg->len, PVMOVE, 0,
- NULL, 1, seg->len,
+ seg->le, seg->len, 0, PVMOVE, 0,
+ NULL, 1, seg->len, 0,
0, 0, 0, NULL)))
return_0;
@@ -3863,9 +3881,9 @@ static int _lv_insert_empty_sublvs(struct logical_volume *lv,
/*
* First, create our top-level segment for our top-level LV
*/
- if (!(mapseg = alloc_lv_segment(segtype, lv, 0, 0, lv->status,
+ if (!(mapseg = alloc_lv_segment(segtype, lv, 0, 0, 0, lv->status,
stripe_size, NULL,
- devices, 0, 0, region_size, 0, NULL))) {
+ devices, 0, 0, 0, region_size, 0, NULL))) {
log_error("Failed to create mapping segment for %s.",
display_lvname(lv));
return 0;
@@ -4063,8 +4081,11 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah,
lv_set_hidden(seg_metalv(seg, s));
}
- seg->area_len += extents / area_multiple;
seg->len += extents;
+ if (seg_is_raid(seg))
+ seg->area_len = seg->len;
+ else
+ seg->area_len += extents / area_multiple;
if (!_setup_lv_size(lv, lv->le_count + extents))
return_0;
@@ -6309,7 +6330,6 @@ static int _lv_update_and_reload(struct logical_volume *lv, int origin_only)
log_very_verbose("Updating logical volume %s on disk(s)%s.",
display_lvname(lock_lv), origin_only ? " (origin only)": "");
-
if (!vg_write(vg))
return_0;
@@ -6776,8 +6796,8 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd,
return_NULL;
/* allocate a new linear segment */
- if (!(mapseg = alloc_lv_segment(segtype, lv_where, 0, layer_lv->le_count,
- status, 0, NULL, 1, layer_lv->le_count,
+ if (!(mapseg = alloc_lv_segment(segtype, lv_where, 0, layer_lv->le_count, 0,
+ status, 0, NULL, 1, layer_lv->le_count, 0,
0, 0, 0, NULL)))
return_NULL;
@@ -6833,8 +6853,8 @@ static int _extend_layer_lv_for_segment(struct logical_volume *layer_lv,
/* allocate a new segment */
if (!(mapseg = alloc_lv_segment(segtype, layer_lv, layer_lv->le_count,
- seg->area_len, status, 0,
- NULL, 1, seg->area_len, 0, 0, 0, seg)))
+ seg->area_len, 0, status, 0,
+ NULL, 1, seg->area_len, 0, 0, 0, 0, seg)))
return_0;
/* map the new segment to the original underlying are */
diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c
index 6311818..f82e1e7 100644
--- a/lib/metadata/merge.c
+++ b/lib/metadata/merge.c
@@ -236,7 +236,7 @@ static void _check_raid_seg(struct lv_segment *seg, int *error_count)
if (!seg->areas)
raid_seg_error("zero areas");
- if (seg->extents_copied > seg->area_len)
+ if (seg->extents_copied > seg->len)
raid_seg_error_val("extents_copied too large", seg->extents_copied);
/* Default < 10, change once raid1 split shift and rename SubLVs works! */
@@ -475,7 +475,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
struct lv_segment *seg, *seg2;
uint32_t le = 0;
unsigned seg_count = 0, seg_found, external_lv_found = 0;
- uint32_t area_multiplier, s;
+ uint32_t data_rimage_count, s;
struct seg_list *sl;
struct glv_list *glvl;
int error_count = 0;
@@ -498,13 +498,13 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
inc_error_count;
}
- area_multiplier = segtype_is_striped(seg->segtype) ?
- seg->area_count : 1;
-
- if (seg->area_len * area_multiplier != seg->len) {
- log_error("LV %s: segment %u has inconsistent "
- "area_len %u",
- lv->name, seg_count, seg->area_len);
+ data_rimage_count = seg->area_count - seg->segtype->parity_devs;
+ /* FIXME: raid varies seg->area_len? */
+ if (seg->len != seg->area_len &&
+ seg->len != seg->area_len * data_rimage_count) {
+ log_error("LV %s: segment %u with len=%u "
+ " has inconsistent area_len %u",
+ lv->name, seg_count, seg->len, seg->area_len);
inc_error_count;
}
@@ -766,10 +766,10 @@ static int _lv_split_segment(struct logical_volume *lv, struct lv_segment *seg,
/* Clone the existing segment */
if (!(split_seg = alloc_lv_segment(seg->segtype,
- seg->lv, seg->le, seg->len,
+ seg->lv, seg->le, seg->len, seg->reshape_len,
seg->status, seg->stripe_size,
seg->log_lv,
- seg->area_count, seg->area_len,
+ seg->area_count, seg->area_len, seg->data_copies,
seg->chunk_size, seg->region_size,
seg->extents_copied, seg->pvmove_source_seg))) {
log_error("Couldn't allocate cloned LV segment.");
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index e4d2267..11fb247 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2016 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -137,7 +137,11 @@
e.g. to prohibit allocation of a RAID image
on a PV already holing an image of the RAID set */
#define LOCKD_SANLOCK_LV UINT64_C(0x0080000000000000) /* LV - Internal use only */
-/* Next unused flag: UINT64_C(0x0100000000000000) */
+#define LV_RESHAPE_DELTA_DISKS_PLUS UINT64_C(0x0100000000000000) /* LV reshape flag delta disks plus image(s) */
+#define LV_RESHAPE_DELTA_DISKS_MINUS UINT64_C(0x0200000000000000) /* LV reshape flag delta disks minus image(s) */
+
+#define LV_REMOVE_AFTER_RESHAPE UINT64_C(0x0400000000000000) /* LV needs to be removed after a shrinking reshape */
+/* Next unused flag: UINT64_C(0x0800000000000000) */
/* Format features flags */
#define FMT_SEGMENTS 0x00000001U /* Arbitrary segment params? */
@@ -446,6 +450,7 @@ struct lv_segment {
const struct segment_type *segtype;
uint32_t le;
uint32_t len;
+ uint32_t reshape_len; /* For RAID: user hidden additional out of place reshaping length off area_len and len */
uint64_t status;
@@ -454,6 +459,7 @@ struct lv_segment {
uint32_t writebehind; /* For RAID (RAID1 only) */
uint32_t min_recovery_rate; /* For RAID */
uint32_t max_recovery_rate; /* For RAID */
+ uint32_t data_offset; /* For RAID: data offset in sectors on each data component image */
uint32_t area_count;
uint32_t area_len;
uint32_t chunk_size; /* For snapshots/thin_pool. In sectors. */
@@ -464,6 +470,7 @@ struct lv_segment {
struct logical_volume *cow;
struct dm_list origin_list;
uint32_t region_size; /* For mirrors, replicators - in sectors */
+ uint32_t data_copies; /* For RAID: number of data copies (e.g. 3 for RAID 6 */
uint32_t extents_copied;/* Number of extents synced for raids/mirrors */
struct logical_volume *log_lv;
struct lv_segment *pvmove_source_seg;
@@ -1205,7 +1212,8 @@ struct logical_volume *first_replicator_dev(const struct logical_volume *lv);
int lv_is_raid_with_tracking(const struct logical_volume *lv);
uint32_t lv_raid_image_count(const struct logical_volume *lv);
int lv_raid_change_image_count(struct logical_volume *lv,
- uint32_t new_count, struct dm_list *allocate_pvs);
+ uint32_t new_count,
+ struct dm_list *allocate_pvs);
int lv_raid_split(struct logical_volume *lv, const char *split_name,
uint32_t new_count, struct dm_list *splittable_pvs);
int lv_raid_split_and_track(struct logical_volume *lv,
@@ -1233,6 +1241,7 @@ uint32_t raid_ensure_min_region_size(const struct logical_volume *lv, uint64_t r
int lv_raid_change_region_size(struct logical_volume *lv,
int yes, int force, uint32_t new_region_size);
int lv_raid_in_sync(const struct logical_volume *lv);
+uint32_t lv_raid_data_copies(const struct segment_type *segtype, uint32_t area_count);
/* -- metadata/raid_manip.c */
/* ++ metadata/cache_manip.c */
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index b6215a2..9ecc410 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -1952,9 +1952,9 @@ static int _alloc_and_add_new_striped_segment(struct logical_volume *lv,
/* Allocate a segment with seg->area_count areas */
if (!(new_seg = alloc_lv_segment(striped_segtype, lv, le, area_len * seg->area_count,
- 0,
+ 0, 0,
seg->stripe_size, NULL, seg->area_count,
- area_len, seg->chunk_size, 0, 0, NULL)))
+ area_len, 0, seg->chunk_size, 0, 0, NULL)))
return_0;
dm_list_add(new_segments, &new_seg->list);
@@ -2510,8 +2510,8 @@ static int _striped_to_raid0_move_segs_to_raid0_lvs(struct logical_volume *lv,
if (!(seg_new = alloc_lv_segment(segtype, dlv,
le, seg_from->area_len,
status,
- 0 /* stripe_size */, NULL, 1 /* area_count */,
- seg_from->area_len,
+ 0, 0 /* stripe_size */, NULL, 1 /* area_count */,
+ seg_from->area_len, 0,
0 /* chunk_size */, 0 /* region_size */, 0, NULL)))
return_0;
@@ -2726,9 +2726,9 @@ static struct lv_segment *_convert_striped_to_raid0(struct logical_volume *lv,
seg = first_seg(dm_list_item(dm_list_first(&data_lvs), struct lv_list)->lv);
if (!(raid0_seg = alloc_lv_segment(segtype, lv,
0 /* le */, lv->le_count /* len */,
- 0,
+ 0, 0,
stripe_size, NULL /* log_lv */,
- area_count, area_len,
+ area_count, area_len, 0,
0 /* chunk_size */,
0 /* seg->region_size */, 0u /* extents_copied */ ,
NULL /* pvmove_source_seg */))) {
diff --git a/lib/metadata/segtype.c b/lib/metadata/segtype.c
index b66ab02..d0508ca 100644
--- a/lib/metadata/segtype.c
+++ b/lib/metadata/segtype.c
@@ -43,7 +43,8 @@ struct segment_type *get_segtype_from_flag(struct cmd_context *cmd, uint64_t fla
{
struct segment_type *segtype;
- dm_list_iterate_items(segtype, &cmd->segtypes)
+ /* Iterate backwards to provide aliases; e.g. raid5 instead of raid5_ls */
+ dm_list_iterate_back_items(segtype, &cmd->segtypes)
if (flag & segtype->flags)
return segtype;
diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h
index 9212824..bea7141 100644
--- a/lib/metadata/segtype.h
+++ b/lib/metadata/segtype.h
@@ -140,7 +140,11 @@ struct dev_manager;
#define segtype_is_any_raid10(segtype) ((segtype)->flags & SEG_RAID10 ? 1 : 0)
#define segtype_is_raid10(segtype) ((segtype)->flags & SEG_RAID10 ? 1 : 0)
#define segtype_is_raid10_near(segtype) segtype_is_raid10(segtype)
+/* FIXME: once raid10_offset supported */
+#define segtype_is_raid10_offset(segtype) 0 // ((segtype)->flags & SEG_RAID10_OFFSET ? 1 : 0)
#define segtype_is_raid_with_meta(segtype) (segtype_is_raid(segtype) && !segtype_is_raid0(segtype))
+#define segtype_is_striped_raid(segtype) (segtype_is_raid(segtype) && !segtype_is_raid1(segtype))
+#define segtype_is_reshapable_raid(segtype) ((segtype_is_striped_raid(segtype) && !segtype_is_any_raid0(segtype)) || segtype_is_raid10_near(segtype) || segtype_is_raid10_offset(segtype))
#define segtype_is_snapshot(segtype) ((segtype)->flags & SEG_SNAPSHOT ? 1 : 0)
#define segtype_is_striped(segtype) ((segtype)->flags & SEG_AREAS_STRIPED ? 1 : 0)
#define segtype_is_thin(segtype) ((segtype)->flags & (SEG_THIN_POOL|SEG_THIN_VOLUME) ? 1 : 0)
@@ -190,6 +194,8 @@ struct dev_manager;
#define seg_is_raid10(seg) segtype_is_raid10((seg)->segtype)
#define seg_is_raid10_near(seg) segtype_is_raid10_near((seg)->segtype)
#define seg_is_raid_with_meta(seg) segtype_is_raid_with_meta((seg)->segtype)
+#define seg_is_striped_raid(seg) segtype_is_striped_raid((seg)->segtype)
+#define seg_is_reshapable_raid(seg) segtype_is_reshapable_raid((seg)->segtype)
#define seg_is_replicator(seg) ((seg)->segtype->flags & SEG_REPLICATOR ? 1 : 0)
#define seg_is_replicator_dev(seg) ((seg)->segtype->flags & SEG_REPLICATOR_DEV ? 1 : 0)
#define seg_is_snapshot(seg) segtype_is_snapshot((seg)->segtype)
@@ -280,6 +286,7 @@ struct segment_type *init_unknown_segtype(struct cmd_context *cmd,
#define RAID_FEATURE_RAID0 (1U << 1) /* version 1.7 */
#define RAID_FEATURE_RESHAPING (1U << 2) /* version 1.8 */
#define RAID_FEATURE_RAID4 (1U << 3) /* ! version 1.8 or 1.9.0 */
+#define RAID_FEATURE_RESHAPE (1U << 4) /* version 1.10.2 */
#ifdef RAID_INTERNAL
int init_raid_segtypes(struct cmd_context *cmd, struct segtype_library *seglib);
diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c
index b5fb60c..57fbef9 100644
--- a/lib/metadata/snapshot_manip.c
+++ b/lib/metadata/snapshot_manip.c
@@ -238,8 +238,8 @@ static struct lv_segment *_alloc_snapshot_seg(struct logical_volume *lv)
return NULL;
}
- if (!(seg = alloc_lv_segment(segtype, lv, 0, lv->le_count, 0, 0,
- NULL, 0, lv->le_count, 0, 0, 0, NULL))) {
+ if (!(seg = alloc_lv_segment(segtype, lv, 0, lv->le_count, 0, 0, 0,
+ NULL, 0, lv->le_count, 0, 0, 0, 0, NULL))) {
log_error("Couldn't allocate new snapshot segment.");
return NULL;
}
diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index c679207..398e8b0 100644
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -137,6 +137,7 @@ static int _raid_text_import(struct lv_segment *seg,
} raid_attr_import[] = {
{ "region_size", &seg->region_size },
{ "stripe_size", &seg->stripe_size },
+ { "data_copies", &seg->data_copies },
{ "writebehind", &seg->writebehind },
{ "min_recovery_rate", &seg->min_recovery_rate },
{ "max_recovery_rate", &seg->max_recovery_rate },
@@ -146,6 +147,10 @@ static int _raid_text_import(struct lv_segment *seg,
for (i = 0; i < DM_ARRAY_SIZE(raid_attr_import); i++, aip++) {
if (dm_config_has_node(sn, aip->name)) {
if (!dm_config_get_uint32(sn, aip->name, aip->var)) {
+ if (!strcmp(aip->name, "data_copies")) {
+ *aip->var = 0;
+ continue;
+ }
log_error("Couldn't read '%s' for segment %s of logical volume %s.",
aip->name, dm_config_parent_name(sn), seg->lv->name);
return 0;
@@ -165,6 +170,9 @@ static int _raid_text_import(struct lv_segment *seg,
return 0;
}
+ if (seg->data_copies < 2)
+ seg->data_copies = 0; // lv_raid_data_copies(seg->segtype, seg->area_count);
+
if (seg_is_any_raid0(seg))
seg->area_len /= seg->area_count;
@@ -183,18 +191,31 @@ static int _raid_text_export_raid0(const struct lv_segment *seg, struct formatte
static int _raid_text_export_raid(const struct lv_segment *seg, struct formatter *f)
{
- outf(f, "device_count = %u", seg->area_count);
+ int raid0 = seg_is_any_raid0(seg);
+
+ if (raid0)
+ outfc(f, (seg->area_count == 1) ? "# linear" : NULL,
+ "stripe_count = %u", seg->area_count);
+
+ else {
+ outf(f, "device_count = %u", seg->area_count);
+ if (seg_is_any_raid10(seg) && seg->data_copies > 0)
+ outf(f, "data_copies = %" PRIu32, seg->data_copies);
+ if (seg->region_size)
+ outf(f, "region_size = %" PRIu32, seg->region_size);
+ }
if (seg->stripe_size)
outf(f, "stripe_size = %" PRIu32, seg->stripe_size);
- if (seg->region_size)
- outf(f, "region_size = %" PRIu32, seg->region_size);
- if (seg->writebehind)
- outf(f, "writebehind = %" PRIu32, seg->writebehind);
- if (seg->min_recovery_rate)
- outf(f, "min_recovery_rate = %" PRIu32, seg->min_recovery_rate);
- if (seg->max_recovery_rate)
- outf(f, "max_recovery_rate = %" PRIu32, seg->max_recovery_rate);
+
+ if (!raid0) {
+ if (seg_is_raid1(seg) && seg->writebehind)
+ outf(f, "writebehind = %" PRIu32, seg->writebehind);
+ if (seg->min_recovery_rate)
+ outf(f, "min_recovery_rate = %" PRIu32, seg->min_recovery_rate);
+ if (seg->max_recovery_rate)
+ outf(f, "max_recovery_rate = %" PRIu32, seg->max_recovery_rate);
+ }
return out_areas(f, seg, "raid");
}
@@ -216,14 +237,16 @@ static int _raid_add_target_line(struct dev_manager *dm __attribute__((unused)),
struct dm_tree_node *node, uint64_t len,
uint32_t *pvmove_mirror_count __attribute__((unused)))
{
+ int delta_disks = 0, delta_disks_minus = 0, delta_disks_plus = 0, data_offset = 0;
uint32_t s;
uint64_t flags = 0;
- uint64_t rebuilds = 0;
- uint64_t writemostly = 0;
+ uint64_t rebuilds[RAID_BITMAP_SIZE];
+ uint64_t writemostly[RAID_BITMAP_SIZE];
struct dm_tree_node_raid_params params;
- int raid0 = seg_is_any_raid0(seg);
memset(¶ms, 0, sizeof(params));
+ memset(&rebuilds, 0, sizeof(rebuilds));
+ memset(&writemostly, 0, sizeof(writemostly));
if (!seg->area_count) {
log_error(INTERNAL_ERROR "_raid_add_target_line called "
@@ -232,63 +255,84 @@ static int _raid_add_target_line(struct dev_manager *dm __attribute__((unused)),
}
/*
- * 64 device restriction imposed by kernel as well. It is
- * not strictly a userspace limitation.
+ * 253 device restriction imposed by kernel due to MD and dm-raid bitfield limitation in superblock.
+ * It is not strictly a userspace limitation.
*/
- if (seg->area_count > 64) {
- log_error("Unable to handle more than 64 devices in a "
- "single RAID array");
+ if (seg->area_count > DEFAULT_RAID_MAX_IMAGES) {
+ log_error("Unable to handle more than %u devices in a "
+ "single RAID array", DEFAULT_RAID_MAX_IMAGES);
return 0;
}
- if (!raid0) {
+ if (!seg_is_any_raid0(seg)) {
if (!seg->region_size) {
- log_error("Missing region size for mirror segment.");
+ log_error("Missing region size for raid segment in %s.",
+ seg_lv(seg, 0)->name);
return 0;
}
- for (s = 0; s < seg->area_count; s++)
- if (seg_lv(seg, s)->status & LV_REBUILD)
- rebuilds |= 1ULL << s;
+ for (s = 0; s < seg->area_count; s++) {
+ uint64_t status = seg_lv(seg, s)->status;
+
+ if (status & LV_REBUILD)
+ rebuilds[s/64] |= 1ULL << (s%64);
+
+ if (status & LV_RESHAPE_DELTA_DISKS_PLUS) {
+ delta_disks++;
+ delta_disks_plus++;
+ } else if (status & LV_RESHAPE_DELTA_DISKS_MINUS) {
+ delta_disks--;
+ delta_disks_minus++;
+ }
+
+ if (delta_disks_plus && delta_disks_minus) {
+ log_error(INTERNAL_ERROR "Invalid request for delta disks minus and delta disks plus!");
+ return 0;
+ }
+
+ if (status & LV_WRITEMOSTLY)
+ writemostly[s/64] |= 1ULL << (s%64);
+ }
- for (s = 0; s < seg->area_count; s++)
- if (seg_lv(seg, s)->status & LV_WRITEMOSTLY)
- writemostly |= 1ULL << s;
+ data_offset = seg->data_offset;
if (mirror_in_sync())
flags = DM_NOSYNC;
}
params.raid_type = lvseg_name(seg);
- params.stripe_size = seg->stripe_size;
- params.flags = flags;
- if (raid0) {
- params.mirrors = 1;
- params.stripes = seg->area_count;
- } else if (seg->segtype->parity_devs) {
+ if (seg->segtype->parity_devs) {
/* RAID 4/5/6 */
params.mirrors = 1;
params.stripes = seg->area_count - seg->segtype->parity_devs;
- } else if (seg_is_raid10(seg)) {
- /* RAID 10 only supports 2 mirrors now */
- params.mirrors = 2;
- params.stripes = seg->area_count / 2;
+ } else if (seg_is_any_raid0(seg)) {
+ params.mirrors = 1;
+ params.stripes = seg->area_count;
+ } else if (seg_is_any_raid10(seg)) {
+ params.data_copies = seg->data_copies;
+ params.stripes = seg->area_count;
} else {
/* RAID 1 */
- params.mirrors = seg->area_count;
+ params.mirrors = seg->data_copies;
params.stripes = 1;
params.writebehind = seg->writebehind;
+ memcpy(params.writemostly, writemostly, sizeof(params.writemostly));
}
- if (!raid0) {
+ /* RAID 0 doesn't have a bitmap, thus no region_size, rebuilds etc. */
+ if (!seg_is_any_raid0(seg)) {
params.region_size = seg->region_size;
- params.rebuilds = rebuilds;
- params.writemostly = writemostly;
+ memcpy(params.rebuilds, rebuilds, sizeof(params.rebuilds));
params.min_recovery_rate = seg->min_recovery_rate;
params.max_recovery_rate = seg->max_recovery_rate;
+ params.delta_disks = delta_disks;
+ params.data_offset = data_offset;
}
+ params.stripe_size = seg->stripe_size;
+ params.flags = flags;
+
if (!dm_tree_node_add_raid_target_with_params(node, len, ¶ms))
return_0;
@@ -450,6 +494,10 @@ static int _raid_target_present(struct cmd_context *cmd,
else
log_very_verbose("Target raid does not support %s.",
SEG_TYPE_NAME_RAID4);
+
+ if (maj > 1 ||
+ (maj == 1 && (min > 10 || (min == 10 && patchlevel >= 2))))
+ _raid_attrs |= RAID_FEATURE_RESHAPE;
}
if (attributes)
diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 9a10252..7fccac5 100644
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -331,6 +331,7 @@ struct dm_status_raid {
char *dev_health;
/* idle, frozen, resync, recover, check, repair */
char *sync_action;
+ uint64_t data_offset; /* RAID out-of-place reshaping */
};
int dm_get_status_raid(struct dm_pool *mem, const char *params,
@@ -1719,7 +1720,7 @@ int dm_tree_node_add_raid_target(struct dm_tree_node *node,
const char *raid_type,
uint32_t region_size,
uint32_t stripe_size,
- uint64_t rebuilds,
+ uint64_t *rebuilds,
uint64_t flags);
/*
@@ -1738,6 +1739,8 @@ int dm_tree_node_add_raid_target(struct dm_tree_node *node,
*/
#define DM_CACHE_METADATA_MAX_SECTORS DM_THIN_METADATA_MAX_SECTORS
+#define RAID_BITMAP_SIZE 4
+
struct dm_tree_node_raid_params {
const char *raid_type;
@@ -1746,18 +1749,23 @@ struct dm_tree_node_raid_params {
uint32_t region_size;
uint32_t stripe_size;
+ int delta_disks; /* +/- number of disks to add/remove (reshaping) */
+ int data_offset; /* data offset to set (out-of-place reshaping) */
+
/*
* 'rebuilds' and 'writemostly' are bitfields that signify
* which devices in the array are to be rebuilt or marked
- * writemostly. By choosing a 'uint64_t', we limit ourself
- * to RAID arrays with 64 devices.
+ * writemostly. The kernel supports up to 253 legs.
+ * We limit ourselvs by choosing a lower value
+ * for DEFAULT_RAID_MAX_IMAGES.
*/
- uint64_t rebuilds;
- uint64_t writemostly;
- uint32_t writebehind; /* I/Os (kernel default COUNTER_MAX / 2) */
+ uint64_t rebuilds[RAID_BITMAP_SIZE];
+ uint64_t writemostly[RAID_BITMAP_SIZE];
+ uint32_t writebehind; /* I/Os (kernel default COUNTER_MAX / 2) */
uint32_t sync_daemon_sleep; /* ms (kernel default = 5sec) */
uint32_t max_recovery_rate; /* kB/sec/disk */
uint32_t min_recovery_rate; /* kB/sec/disk */
+ uint32_t data_copies; /* RAID # of data copies */
uint32_t stripe_cache; /* sectors */
uint64_t flags; /* [no]sync */
diff --git a/libdm/libdm-common.h b/libdm/libdm-common.h
index 4dc1870..a064db8 100644
--- a/libdm/libdm-common.h
+++ b/libdm/libdm-common.h
@@ -23,6 +23,8 @@
#define DEV_NAME(dmt) (dmt->mangled_dev_name ? : dmt->dev_name)
#define DEV_UUID(DMT) (dmt->mangled_uuid ? : dmt->uuid)
+#define RAID_BITMAP_SIZE 4
+
int mangle_string(const char *str, const char *str_name, size_t len,
char *buf, size_t buf_len, dm_string_mangling_t mode);
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index d658bf9..a26cfcc 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -205,11 +205,14 @@ struct load_segment {
struct dm_tree_node *replicator;/* Replicator-dev */
uint64_t rdevice_index; /* Replicator-dev */
- uint64_t rebuilds; /* raid */
- uint64_t writemostly; /* raid */
+ int delta_disks; /* raid reshape number of disks */
+ int data_offset; /* raid reshape data offset on disk to set */
+ uint64_t rebuilds[RAID_BITMAP_SIZE]; /* raid */
+ uint64_t writemostly[RAID_BITMAP_SIZE]; /* raid */
uint32_t writebehind; /* raid */
uint32_t max_recovery_rate; /* raid kB/sec/disk */
uint32_t min_recovery_rate; /* raid kB/sec/disk */
+ uint32_t data_copies; /* raid10 data_copies */
struct dm_tree_node *metadata; /* Thin_pool + Cache */
struct dm_tree_node *pool; /* Thin_pool, Thin */
@@ -2353,16 +2356,21 @@ static int _mirror_emit_segment_line(struct dm_task *dmt, struct load_segment *s
return 1;
}
-/* Is parameter non-zero? */
-#define PARAM_IS_SET(p) ((p) ? 1 : 0)
+static int _2_if_value(unsigned p)
+{
+ return p ? 2 : 0;
+}
-/* Return number of bits assuming 4 * 64 bit size */
-static int _get_params_count(uint64_t bits)
+/* Return number of bits passed in @bits assuming 2 * 64 bit size */
+static int _get_params_count(uint64_t *bits)
{
int r = 0;
+ int i = RAID_BITMAP_SIZE;
- r += 2 * hweight32(bits & 0xFFFFFFFF);
- r += 2 * hweight32(bits >> 32);
+ while (i--) {
+ r += 2 * hweight32(bits[i] & 0xFFFFFFFF);
+ r += 2 * hweight32(bits[i] >> 32);
+ }
return r;
}
@@ -2373,32 +2381,60 @@ static int _raid_emit_segment_line(struct dm_task *dmt, uint32_t major,
size_t paramsize)
{
uint32_t i;
+ uint32_t area_count = seg->area_count / 2;
int param_count = 1; /* mandatory 'chunk size'/'stripe size' arg */
int pos = 0;
- unsigned type = seg->type;
+ unsigned type;
+
+ if (seg->area_count % 2)
+ return 0;
if ((seg->flags & DM_NOSYNC) || (seg->flags & DM_FORCESYNC))
param_count++;
- param_count += 2 * (PARAM_IS_SET(seg->region_size) +
- PARAM_IS_SET(seg->writebehind) +
- PARAM_IS_SET(seg->min_recovery_rate) +
- PARAM_IS_SET(seg->max_recovery_rate));
+ param_count += _2_if_value(seg->data_offset) +
+ _2_if_value(seg->delta_disks) +
+ _2_if_value(seg->region_size) +
+ _2_if_value(seg->writebehind) +
+ _2_if_value(seg->min_recovery_rate) +
+ _2_if_value(seg->max_recovery_rate) +
+ _2_if_value(seg->data_copies > 1);
- /* rebuilds and writemostly are 64 bits */
+ /* rebuilds and writemostly are BITMAP_SIZE * 64 bits */
param_count += _get_params_count(seg->rebuilds);
param_count += _get_params_count(seg->writemostly);
- if ((type == SEG_RAID1) && seg->stripe_size)
- log_error("WARNING: Ignoring RAID1 stripe size");
+ if ((seg->type == SEG_RAID1) && seg->stripe_size)
+ log_info("WARNING: Ignoring RAID1 stripe size");
/* Kernel only expects "raid0", not "raid0_meta" */
+ type = seg->type;
if (type == SEG_RAID0_META)
type = SEG_RAID0;
+#if 0
+ /* Kernel only expects "raid10", not "raid10_{far,offset}" */
+ else if (type == SEG_RAID10_FAR ||
+ type == SEG_RAID10_OFFSET) {
+ param_count += 2;
+ type = SEG_RAID10_NEAR;
+ }
+#endif
- EMIT_PARAMS(pos, "%s %d %u", _dm_segtypes[type].target,
+ EMIT_PARAMS(pos, "%s %d %u",
+ // type == SEG_RAID10_NEAR ? "raid10" : _dm_segtypes[type].target,
+ type == SEG_RAID10 ? "raid10" : _dm_segtypes[type].target,
param_count, seg->stripe_size);
+#if 0
+ if (seg->type == SEG_RAID10_FAR)
+ EMIT_PARAMS(pos, " raid10_format far");
+ else if (seg->type == SEG_RAID10_OFFSET)
+ EMIT_PARAMS(pos, " raid10_format offset");
+#endif
+
+ if (seg->data_copies > 1 && type == SEG_RAID10)
+ EMIT_PARAMS(pos, " raid10_copies %u", seg->data_copies);
+
if (seg->flags & DM_NOSYNC)
EMIT_PARAMS(pos, " nosync");
else if (seg->flags & DM_FORCESYNC)
@@ -2407,27 +2443,38 @@ static int _raid_emit_segment_line(struct dm_task *dmt, uint32_t major,
if (seg->region_size)
EMIT_PARAMS(pos, " region_size %u", seg->region_size);
- for (i = 0; i < (seg->area_count / 2); i++)
- if (seg->rebuilds & (1ULL << i))
- EMIT_PARAMS(pos, " rebuild %u", i);
+ /* If seg-data_offset == 1, kernel needs a zero offset to adjust to it */
+ if (seg->data_offset)
+ EMIT_PARAMS(pos, " data_offset %d", seg->data_offset == 1 ? 0 : seg->data_offset);
- if (seg->min_recovery_rate)
- EMIT_PARAMS(pos, " min_recovery_rate %u",
- seg->min_recovery_rate);
+ if (seg->delta_disks)
+ EMIT_PARAMS(pos, " delta_disks %d", seg->delta_disks);
- if (seg->max_recovery_rate)
- EMIT_PARAMS(pos, " max_recovery_rate %u",
- seg->max_recovery_rate);
+ for (i = 0; i < area_count; i++)
+ if (seg->rebuilds[i/64] & (1ULL << (i%64)))
+ EMIT_PARAMS(pos, " rebuild %u", i);
- for (i = 0; i < (seg->area_count / 2); i++)
- if (seg->writemostly & (1ULL << i))
+ for (i = 0; i < area_count; i++)
+ if (seg->writemostly[i/64] & (1ULL << (i%64)))
EMIT_PARAMS(pos, " write_mostly %u", i);
if (seg->writebehind)
EMIT_PARAMS(pos, " max_write_behind %u", seg->writebehind);
+ /*
+ * Has to be before "min_recovery_rate" or the kernels
+ * check will fail when both set and min > previous max
+ */
+ if (seg->max_recovery_rate)
+ EMIT_PARAMS(pos, " max_recovery_rate %u",
+ seg->max_recovery_rate);
+
+ if (seg->min_recovery_rate)
+ EMIT_PARAMS(pos, " min_recovery_rate %u",
+ seg->min_recovery_rate);
+
/* Print number of metadata/data device pairs */
- EMIT_PARAMS(pos, " %u", seg->area_count/2);
+ EMIT_PARAMS(pos, " %u", area_count);
if (_emit_areas_line(dmt, seg, params, paramsize, &pos) <= 0)
return_0;
@@ -3267,11 +3314,14 @@ int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node,
seg->region_size = p->region_size;
seg->stripe_size = p->stripe_size;
seg->area_count = 0;
- seg->rebuilds = p->rebuilds;
- seg->writemostly = p->writemostly;
+ seg->delta_disks = p->delta_disks;
+ seg->data_offset = p->data_offset;
+ memcpy(seg->rebuilds, p->rebuilds, sizeof(seg->rebuilds));
+ memcpy(seg->writemostly, p->writemostly, sizeof(seg->writemostly));
seg->writebehind = p->writebehind;
seg->min_recovery_rate = p->min_recovery_rate;
seg->max_recovery_rate = p->max_recovery_rate;
+ seg->data_copies = p->data_copies;
seg->flags = p->flags;
return 1;
@@ -3282,17 +3332,18 @@ int dm_tree_node_add_raid_target(struct dm_tree_node *node,
const char *raid_type,
uint32_t region_size,
uint32_t stripe_size,
- uint64_t rebuilds,
+ uint64_t *rebuilds,
uint64_t flags)
{
struct dm_tree_node_raid_params params = {
.raid_type = raid_type,
.region_size = region_size,
.stripe_size = stripe_size,
- .rebuilds = rebuilds,
.flags = flags
};
+ memcpy(params.rebuilds, rebuilds, sizeof(params.rebuilds));
+
return dm_tree_node_add_raid_target_with_params(node, size, ¶ms);
}
diff --git a/libdm/libdm-targets.c b/libdm/libdm-targets.c
index c94e057..6b83372 100644
--- a/libdm/libdm-targets.c
+++ b/libdm/libdm-targets.c
@@ -89,6 +89,8 @@ static unsigned _count_fields(const char *p)
* <raid_type> <#devs> <health_str> <sync_ratio>
* Versions 1.5.0+ (6 fields):
* <raid_type> <#devs> <health_str> <sync_ratio> <sync_action> <mismatch_cnt>
+ * Versions 1.9.0+ (7 fields):
+ * <raid_type> <#devs> <health_str> <sync_ratio> <sync_action> <mismatch_cnt> <data_offset>
*/
int dm_get_status_raid(struct dm_pool *mem, const char *params,
struct dm_status_raid **status)
@@ -147,6 +149,22 @@ int dm_get_status_raid(struct dm_pool *mem, const char *params,
if (sscanf(p, "%s %" PRIu64, s->sync_action, &s->mismatch_count) != 2)
goto_bad;
+ if (num_fields < 7)
+ goto out;
+
+ /*
+ * All pre-1.9.0 version parameters are read. Now we check
+ * for additional 1.9.0+ parameters (i.e. nr_fields at least 7).
+ *
+ * Note that data_offset will be 0 if the
+ * kernel returns a pre-1.9.0 status.
+ */
+ msg_fields = "<data_offset>";
+ if (!(p = _skip_fields(params, 6))) /* skip pre-1.9.0 params */
+ goto bad;
+ if (sscanf(p, "%" PRIu64, &s->data_offset) != 1)
+ goto bad;
+
out:
*status = s;
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index b9e0665..abec04a 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1228,6 +1228,9 @@ static int _lvconvert_mirrors(struct cmd_context *cmd,
static int _is_valid_raid_conversion(const struct segment_type *from_segtype,
const struct segment_type *to_segtype)
{
+ if (!from_segtype)
+ return 1;
+
if (from_segtype == to_segtype)
return 1;
@@ -1356,7 +1359,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
DEFAULT_RAID1_MAX_IMAGES, lp->segtype->name, display_lvname(lv));
return 0;
}
- if (!lv_raid_change_image_count(lv, image_count, lp->pvh))
+ if (!lv_raid_change_image_count(lv, image_count, /* lp->region_size, */ lp->pvh))
return_0;
log_print_unless_silent("Logical volume %s successfully converted.",
@@ -1365,10 +1368,13 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
return 1;
}
goto try_new_takeover_or_reshape;
- } else if (!*lp->type_str || seg->segtype == lp->segtype) {
+ }
+#if 0
+ } else if ((!*lp->type_str || seg->segtype == lp->segtype) && !lp->stripe_size_supplied) {
log_error("Conversion operation not yet supported.");
return 0;
}
+#endif
if ((seg_is_linear(seg) || seg_is_striped(seg) || seg_is_mirrored(seg) || lv_is_raid(lv)) &&
(lp->type_str && lp->type_str[0])) {
@@ -1390,10 +1396,14 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
return 0;
}
+ /* FIXME This needs changing globally. */
if (!arg_is_set(cmd, stripes_long_ARG))
lp->stripes = 0;
+ if (!arg_is_set(cmd, type_ARG))
+ lp->segtype = NULL;
- if (!lv_raid_convert(lv, lp->segtype, lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size,
+ if (!lv_raid_convert(lv, lp->segtype,
+ lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size,
lp->region_size, lp->pvh))
return_0;
@@ -1410,12 +1420,16 @@ try_new_takeover_or_reshape:
/* FIXME This needs changing globally. */
if (!arg_is_set(cmd, stripes_long_ARG))
lp->stripes = 0;
+ if (!arg_is_set(cmd, type_ARG))
+ lp->segtype = NULL;
/* Only let raid4 through for now. */
- if (lp->type_str && lp->type_str[0] && lp->segtype != seg->segtype &&
- ((seg_is_raid4(seg) && seg_is_striped(lp) && lp->stripes > 1) ||
- (seg_is_striped(seg) && seg->area_count > 1 && seg_is_raid4(lp)))) {
- if (!lv_raid_convert(lv, lp->segtype, lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size,
+ if (!lp->segtype ||
+ (lp->type_str && lp->type_str[0] && lp->segtype != seg->segtype &&
+ ((seg_is_raid4(seg) && seg_is_striped(lp) && lp->stripes > 1) ||
+ (seg_is_striped(seg) && seg->area_count > 1 && seg_is_raid4(lp))))) {
+ if (!lv_raid_convert(lv, lp->segtype,
+ lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size,
lp->region_size, lp->pvh))
return_0;
@@ -1700,6 +1714,8 @@ static int _lvconvert_raid_types(struct cmd_context *cmd, struct logical_volume
/* FIXME This is incomplete */
if (_mirror_or_raid_type_requested(cmd, lp->type_str) || _raid0_type_requested(lp->type_str) ||
_striped_type_requested(lp->type_str) || lp->mirrorlog || lp->corelog) {
+ if (!arg_is_set(cmd, type_ARG))
+ lp->segtype = first_seg(lv)->segtype;
/* FIXME Handle +/- adjustments too? */
if (!get_stripe_params(cmd, lp->segtype, &lp->stripes, &lp->stripe_size, &lp->stripes_supplied, &lp->stripe_size_supplied))
goto_out;
@@ -2990,9 +3006,9 @@ static int _lvconvert_to_pool(struct cmd_context *cmd,
}
/* Allocate a new pool segment */
- if (!(seg = alloc_lv_segment(pool_segtype, pool_lv, 0, data_lv->le_count,
+ if (!(seg = alloc_lv_segment(pool_segtype, pool_lv, 0, data_lv->le_count, 0,
pool_lv->status, 0, NULL, 1,
- data_lv->le_count, 0, 0, 0, NULL)))
+ data_lv->le_count, 0, 0, 0, 0, NULL)))
return_0;
/* Add the new segment to the layer LV */
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ffe3ca26e05f9bb1…
Commit: ffe3ca26e05f9bb10f004bafe6866b189d7ac385
Parent: 3fd3c9430d5f0b3291c0111ddcd4ddd524dd26ed
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Feb 23 17:06:42 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Feb 23 17:06:42 2017 -0600
man: improve line breaks
Borrow tricks from dmsetup man page to improve
the line break and indentation using .ad l, .ad b,
and soft break \%.
---
tools/command.c | 98 +++++++++++++++++++++++++++++++------------------------
1 files changed, 55 insertions(+), 43 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 04b44ad..8d5a96b 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1850,21 +1850,12 @@ static void print_val_man(const char *str)
line = dm_strdup(str);
split_line(line, &line_argc, line_argv, '|');
for (i = 0; i < line_argc; i++) {
- if (i) {
+ if (i)
printf("|");
-
- /* this is a hack to add a line break for
- a long string of opt values */
- if ((len > 40) && (i >= (line_argc / 2) + 1)) {
- printf("\n");
- printf(" ");
- len = 0;
- }
- }
if (strstr(line_argv[i], "Number"))
printf("\\fI%s\\fP", line_argv[i]);
else
- printf("\\fB%s\\fP", line_argv[i]);
+ printf("\\%\\fB%s\\fP", line_argv[i]);
}
return;
}
@@ -2016,8 +2007,10 @@ void print_man_usage(char *lvmname, struct command *cmd)
continue;
if (sep) {
- printf(",");
- printf("\n.br\n");
+ printf(",\n");
+ printf(".ad b\n");
+ printf(".br\n");
+ printf(".ad l\n");
printf(" ");
}
@@ -2046,10 +2039,13 @@ void print_man_usage(char *lvmname, struct command *cmd)
continue;
if (sep) {
- printf(",");
- printf("\n.br\n");
+ printf(",\n");
+ printf(".ad b\n");
+ printf(".br\n");
+ printf(".ad l\n");
printf(" ");
- }
+ } else
+ printf(".ad l\n");
printf(" ");
printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
@@ -2164,9 +2160,9 @@ void print_man_usage(char *lvmname, struct command *cmd)
if ((cname->variants > 1) && cname->common_options[opt_enum])
continue;
- if (sep) {
- printf("\n.br\n");
- }
+ if (sep)
+ printf(".br\n");
+ printf(".ad l\n");
printf("[ \\fB-%c\\fP|\\fB%s\\fP",
opt_names[opt_enum].short_opt,
@@ -2176,7 +2172,8 @@ void print_man_usage(char *lvmname, struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
- printf(" ]");
+ printf(" ]\n");
+ printf(".ad b\n");
sep = 1;
}
@@ -2194,9 +2191,9 @@ void print_man_usage(char *lvmname, struct command *cmd)
if ((cname->variants > 1) && cname->common_options[opt_enum])
continue;
- if (sep) {
- printf("\n.br\n");
- }
+ if (sep)
+ printf(".br\n");
+ printf(".ad l\n");
/* space alignment without short opt */
printf("[ ");
@@ -2207,12 +2204,13 @@ void print_man_usage(char *lvmname, struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
- printf(" ]");
+ printf(" ]\n");
+ printf(".ad b\n");
sep = 1;
}
if (sep) {
- printf("\n.br\n");
+ printf(".br\n");
/* space alignment without short opt */
/* printf(" "); */
}
@@ -2286,9 +2284,9 @@ void print_man_usage_common_lvm(struct command *cmd)
if (!is_lvm_all_opt(opt_enum))
continue;
- if (sep) {
- printf("\n.br\n");
- }
+ if (sep)
+ printf(".br\n");
+ printf(".ad l\n");
for (oo = 0; oo < cmd->oo_count; oo++) {
if (cmd->optional_opt_args[oo].opt != opt_enum)
@@ -2302,7 +2300,8 @@ void print_man_usage_common_lvm(struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
- printf(" ]");
+ printf(" ]\n");
+ printf(".ad b\n");
sep = 1;
break;
}
@@ -2319,9 +2318,9 @@ void print_man_usage_common_lvm(struct command *cmd)
if (!is_lvm_all_opt(opt_enum))
continue;
- if (sep) {
- printf("\n.br\n");
- }
+ if (sep)
+ printf(".br\n");
+ printf(".ad l\n");
for (oo = 0; oo < cmd->oo_count; oo++) {
if (cmd->optional_opt_args[oo].opt != opt_enum)
@@ -2336,7 +2335,8 @@ void print_man_usage_common_lvm(struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
- printf(" ]");
+ printf(" ]\n");
+ printf(".ad b\n");
sep = 1;
break;
}
@@ -2381,9 +2381,9 @@ void print_man_usage_common_cmd(struct command *cmd)
if (is_lvm_all_opt(opt_enum))
continue;
- if (sep) {
- printf("\n.br\n");
- }
+ if (sep)
+ printf(".br\n");
+ printf(".ad l\n");
for (oo = 0; oo < cmd->oo_count; oo++) {
if (cmd->optional_opt_args[oo].opt != opt_enum)
@@ -2397,7 +2397,8 @@ void print_man_usage_common_cmd(struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
- printf(" ]");
+ printf(" ]\n");
+ printf(".ad b\n");
sep = 1;
break;
}
@@ -2421,9 +2422,9 @@ void print_man_usage_common_cmd(struct command *cmd)
if (is_lvm_all_opt(opt_enum))
continue;
- if (sep) {
- printf("\n.br\n");
- }
+ if (sep)
+ printf(".br\n");
+ printf(".ad l\n");
for (oo = 0; oo < cmd->oo_count; oo++) {
if (cmd->optional_opt_args[oo].opt != opt_enum)
@@ -2438,7 +2439,8 @@ void print_man_usage_common_cmd(struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
- printf(" ]");
+ printf(" ]\n");
+ printf(".ad b\n");
sep = 1;
break;
}
@@ -2555,7 +2557,8 @@ void print_man_all_options_list(struct command_name *cname)
continue;
if (sep)
- printf("\n.br\n");
+ printf(".br\n");
+ printf(".ad l\n");
printf(" \\fB-%c\\fP|\\fB%s\\fP",
opt_names[opt_enum].short_opt,
@@ -2575,6 +2578,8 @@ void print_man_all_options_list(struct command_name *cname)
print_val_man(val_names[val_enum].usage);
}
+ printf("\n.ad b\n");
+
sep = 1;
}
@@ -2589,7 +2594,8 @@ void print_man_all_options_list(struct command_name *cname)
continue;
if (sep)
- printf("\n.br\n");
+ printf(".br\n");
+ printf(".ad l\n");
/* space alignment without short opt */
printf(" ");
@@ -2610,6 +2616,8 @@ void print_man_all_options_list(struct command_name *cname)
print_val_man(val_names[val_enum].usage);
}
+ printf("\n.ad b\n");
+
sep = 1;
}
}
@@ -2632,6 +2640,8 @@ void print_man_all_options_desc(struct command_name *cname)
printf("\n.HP\n");
+ printf(".ad l\n");
+
if (opt_names[opt_enum].short_opt) {
printf("\\fB-%c\\fP|\\fB%s\\fP",
opt_names[opt_enum].short_opt,
@@ -2663,6 +2673,8 @@ void print_man_all_options_desc(struct command_name *cname)
print_man_option_desc(cname, opt_enum);
}
+ printf(".ad b\n");
+
sep = 1;
}
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3fd3c9430d5f0b32…
Commit: 3fd3c9430d5f0b3291c0111ddcd4ddd524dd26ed
Parent: 8ab072507706fb826eee05eb369429ad0a7a406a
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Feb 23 14:24:28 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Feb 23 14:24:28 2017 -0600
man/help: change syntax to UNIT
(Change to recent commit 3f4ecaf8c2.)
Use --foo Number[k|UNIT] to indicate that
the default units of the number is k, but other
units listed below are also accepted.
Previously, underlined/italic Unit was used,
like other of variables, but this UNIT is more
like a shortcut than an actual variable.
---
tools/command.c | 18 ++++++++++--------
tools/vals.h | 10 +++++-----
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index c3c1960..04b44ad 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1786,19 +1786,19 @@ static void print_val_man(const char *str)
int i;
/*
- * Doing bold k before underlined Unit creates a lot of
+ * Doing bold k before UNIT creates a lot of
* visual "noise" that makes the text hard to read.
* The extra markup in this case doesn't add anything
* that isn't already obvious.
*/
- if (!strcmp(str, "Number[k|Unit]")) {
- printf("\\fINumber\\fP[k|\\fIUnit\\fP]");
+ if (!strcmp(str, "Number[k|UNIT]")) {
+ printf("\\fINumber\\fP[k|UNIT]");
return;
}
- if (!strcmp(str, "Number[m|Unit]")) {
- printf("\\fINumber\\fP[m|\\fIUnit\\fP]");
+ if (!strcmp(str, "Number[m|UNIT]")) {
+ printf("\\fINumber\\fP[m|UNIT]");
return;
}
@@ -2798,13 +2798,15 @@ void print_man_all_positions_desc(struct command_name *cname)
/* Nearly every command uses a number arg somewhere. */
printf("\n.HP\n");
- printf("\\fINumber\\fP, \\fIUnit\\fP");
+ printf("\\fINumber\\fP, UNIT");
printf("\n");
printf(".br\n");
printf("Input units are always treated as base two values, regardless of unit\n"
"capitalization, e.g. 'k' and 'K' both refer to 1024.\n"
- "The default input unit is specified by letter, followed by |\\fIUnit\\fP\n"
- "which represents other possible input units: \\fBbBsSkKmMgGtTpPeE\\fP.\n");
+ "The default input unit is specified by letter, followed by |UNIT\n"
+ "which represents other possible input units: \\fBbBsSkKmMgGtTpPeE\\fP.\n"
+ "(This should not be confused with the output control --units, where\n"
+ "capital letters mean multiple of 1000.)\n");
printf("\n.HP\n");
printf("Environment");
diff --git a/tools/vals.h b/tools/vals.h
index 3eb27e9..a94f81b 100644
--- a/tools/vals.h
+++ b/tools/vals.h
@@ -85,8 +85,8 @@
* output, and doesn't indicate which unit is the default.
* "Number[Units]" would be cleaner, as would a subset of
* common units, e.g. "Number[kmg...]", but neither helps
- * with default. "Number[k|Unit]" and "Number[m|Unit]" show
- * the default, and "Unit" indicates that other units
+ * with default. "Number[k|UNIT]" and "Number[m|UNIT]" show
+ * the default, and "UNIT" indicates that other units
* are possible without listing them all. This also
* suggests using the preferred lower case letters, because
* --size and other option args treat upper/lower letters
@@ -115,9 +115,9 @@ val(activation_VAL, activation_arg, "Active", "y|n|ay")
val(cachemode_VAL, cachemode_arg, "CacheMode", "writethrough|writeback")
val(discards_VAL, discards_arg, "Discards", "passdown|nopassdown|ignore")
val(mirrorlog_VAL, mirrorlog_arg, "MirrorLog", "core|disk")
-val(sizekb_VAL, size_kb_arg, "SizeKB", "Number[k|Unit]")
-val(sizemb_VAL, size_mb_arg, "SizeMB", "Number[m|Unit]")
-val(regionsize_VAL, regionsize_arg, "RegionSize", "Number[m|Unit]")
+val(sizekb_VAL, size_kb_arg, "SizeKB", "Number[k|UNIT]")
+val(sizemb_VAL, size_mb_arg, "SizeMB", "Number[m|UNIT]")
+val(regionsize_VAL, regionsize_arg, "RegionSize", "Number[m|UNIT]")
val(numsigned_VAL, int_arg_with_sign, "SNumber", "[+|-]Number")
val(numsignedper_VAL, int_arg_with_sign_and_percent, "SNumberP", "[+|-]Number[%VG|%PVS|%FREE]")
val(permission_VAL, permission_arg, "Permission", "rw|r")
1
0
master - lvchange: reject writemostly/writebehind on raid1 during resync
by Heinz Mauelshagen 23 Feb '17
by Heinz Mauelshagen 23 Feb '17
23 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8ab072507706fb82…
Commit: 8ab072507706fb826eee05eb369429ad0a7a406a
Parent: 3f4ecaf8c2b3146e81bcb32bd4f0321beee1192a
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Thu Feb 23 15:09:29 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Thu Feb 23 15:09:29 2017 +0100
lvchange: reject writemostly/writebehind on raid1 during resync
The MD kernel raid1 personality does no use any writemostly leg as the primary.
In case a previous linear LV holding data gets upconverted to
raid1 it becomes the primary leg of the new raid1 LV and a full
resynchronization is started to update the new legs.
No writemostly and/or writebehind setting may be allowed during
this initial, full synchronization period of this new raid1 LV
(using the lvchange(8) command), because that would change the
primary (i.e the previous linear LV) thus causing data loss.
lvchange has a bug not preventing this scenario.
Fix rejects setting writemostly and/or writebehind on resychronizing raid1 LVs.
Once we have status in the lvm2 metadata about the linear -> raid upconversion,
we may relax this constraint for other types of resynchronization
(e.g. for user requested "lvchange --resync ").
New lvchange-raid1-writemostly.sh test is added to the test suite.
Resolves: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855895
---
WHATS_NEW | 1 +
lib/metadata/metadata-exported.h | 1 +
lib/metadata/raid_manip.c | 8 +++++-
test/shell/lvchange-raid1-writemostly.sh | 41 ++++++++++++++++++++++++++++++
tools/lvchange.c | 15 +++++++++++
5 files changed, 65 insertions(+), 1 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 722b6f6..14109fb 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Reject writemostly/writebehind in lvchange during resynchronization.
Deactivate active origin first before removal for improved workflow.
Fix regression of accepting options --type and -m with lvresize (2.02.158).
Add lvconvert --swapmetadata, new specific way to swap pool metadata LVs.
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 573c09d..e4d2267 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -1232,6 +1232,7 @@ uint32_t raid_rimage_extents(const struct segment_type *segtype,
uint32_t raid_ensure_min_region_size(const struct logical_volume *lv, uint64_t raid_size, uint32_t region_size);
int lv_raid_change_region_size(struct logical_volume *lv,
int yes, int force, uint32_t new_region_size);
+int lv_raid_in_sync(const struct logical_volume *lv);
/* -- metadata/raid_manip.c */
/* ++ metadata/cache_manip.c */
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index cdd7af8..b6215a2 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -238,7 +238,7 @@ static int _deactivate_and_remove_lvs(struct volume_group *vg, struct dm_list *r
* Returns: 1 if in-sync, 0 otherwise.
*/
#define _RAID_IN_SYNC_RETRIES 6
-static int _raid_in_sync(struct logical_volume *lv)
+static int _raid_in_sync(const struct logical_volume *lv)
{
int retries = _RAID_IN_SYNC_RETRIES;
dm_percent_t sync_percent;
@@ -269,6 +269,12 @@ static int _raid_in_sync(struct logical_volume *lv)
return (sync_percent == DM_PERCENT_100) ? 1 : 0;
}
+/* External interface to raid in-sync check */
+int lv_raid_in_sync(const struct logical_volume *lv)
+{
+ return _raid_in_sync(lv);
+}
+
/* Check if RaidLV @lv is synced or any raid legs of @lv are not synced */
static int _raid_devs_sync_healthy(struct logical_volume *lv)
{
diff --git a/test/shell/lvchange-raid1-writemostly.sh b/test/shell/lvchange-raid1-writemostly.sh
new file mode 100644
index 0000000..edf11bd
--- /dev/null
+++ b/test/shell/lvchange-raid1-writemostly.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA
+
+SKIP_WITH_LVMLOCKD=1
+SKIP_WITH_LVMPOLLD=1
+
+. lib/inittest
+
+which mkfs.ext4 || skip
+aux have_raid 1 3 5 || skip
+
+aux prepare_vg 4
+
+for d in $dev1 $dev2 $dev3 $dev4
+do
+ aux delay_dev $d 1
+done
+
+#
+# Test writemostly prohibited on resyncrhonizing raid1
+#
+
+# Create 4-way striped LV
+lvcreate -aey --ty raid1 -m 3 -L 32M -n $lv1 $vg
+not lvchange -y --writemostly $dev1 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid1"
+check lv_field $vg/$lv1 stripes 4
+check lv_attr_bit health $vg/${lv1}_rimage_0 "-"
+aux wait_for_sync $vg $lv1
+lvchange -y --writemostly $dev1 $vg/$lv1
+check lv_attr_bit health $vg/${lv1}_rimage_0 "w"
+
+vgremove -ff $vg
diff --git a/tools/lvchange.c b/tools/lvchange.c
index 1c00b76..cba0496 100644
--- a/tools/lvchange.c
+++ b/tools/lvchange.c
@@ -739,6 +739,21 @@ static int _lvchange_writemostly(struct logical_volume *lv)
struct cmd_context *cmd = lv->vg->cmd;
struct lv_segment *raid_seg = first_seg(lv);
+ /*
+ * Prohibit writebehind and writebehind during synchronization.
+ *
+ * FIXME: we can do better once we can distingush between
+ * an initial sync after a linear -> raid1 upconversion
+ * and any later additions of legs, requested resyncs
+ * via lvchange or leg repairs/replacements.
+ */
+ if (!lv_raid_in_sync(lv)) {
+ log_error("Unable to change write%s on %s while it is not in-sync.",
+ arg_is_set(cmd, writemostly_ARG) ? "mostly" : "behind",
+ display_lvname(lv));
+ return 0;
+ }
+
if (arg_is_set(cmd, writebehind_ARG))
raid_seg->writebehind = arg_uint_value(cmd, writebehind_ARG, 0);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3f4ecaf8c2b3146e…
Commit: 3f4ecaf8c2b3146e81bcb32bd4f0321beee1192a
Parent: da634bfc8933619a70284077b499c82802f04ceb
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Feb 22 16:50:30 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Feb 22 16:50:30 2017 -0600
man/help: improve the style of units indicator
We use --foo Number[k|Units] to indicate that
the default units of the number is k, but other
units listed below are also accepted.
Capitalize and underline Units so it is consistent
with other variables, and reference it at the end.
Technically, the k should be bold, but this
tends to make the text visually hard to read
because of the excessive highlights scattered
everywhere. So it's left normal text for now
(it's unlikely to confuse anyone.)
---
tools/command.c | 19 +++++++++----------
tools/vals.h | 12 ++++++------
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 1a5fbb5..c3c1960 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1786,20 +1786,19 @@ static void print_val_man(const char *str)
int i;
/*
- * The suffix [k|unit] is just printed in plain text.
- * Doing bold k and underlined unit creates a lot of
- * visual "noise" that is choppy and hard to read.
+ * Doing bold k before underlined Unit creates a lot of
+ * visual "noise" that makes the text hard to read.
* The extra markup in this case doesn't add anything
* that isn't already obvious.
*/
- if (!strcmp(str, "Number[k|unit]")) {
- printf("\\fINumber\\fP[k|unit]");
+ if (!strcmp(str, "Number[k|Unit]")) {
+ printf("\\fINumber\\fP[k|\\fIUnit\\fP]");
return;
}
- if (!strcmp(str, "Number[m|unit]")) {
- printf("\\fINumber\\fP[m|unit]");
+ if (!strcmp(str, "Number[m|Unit]")) {
+ printf("\\fINumber\\fP[m|\\fIUnit\\fP]");
return;
}
@@ -2799,13 +2798,13 @@ void print_man_all_positions_desc(struct command_name *cname)
/* Nearly every command uses a number arg somewhere. */
printf("\n.HP\n");
- printf("\\fINumber\\fP");
+ printf("\\fINumber\\fP, \\fIUnit\\fP");
printf("\n");
printf(".br\n");
printf("Input units are always treated as base two values, regardless of unit\n"
"capitalization, e.g. 'k' and 'K' both refer to 1024.\n"
- "The default input unit is specified by letter, followed by |unit which\n"
- "represents other possible input units: bBsSkKmMgGtTpPeE.\n");
+ "The default input unit is specified by letter, followed by |\\fIUnit\\fP\n"
+ "which represents other possible input units: \\fBbBsSkKmMgGtTpPeE\\fP.\n");
printf("\n.HP\n");
printf("Environment");
diff --git a/tools/vals.h b/tools/vals.h
index 4dc3a61..3eb27e9 100644
--- a/tools/vals.h
+++ b/tools/vals.h
@@ -83,10 +83,10 @@
* could be "Number[bBsSkKmMgGtTpPeE]" (with implied |),
* but repeating this full specification produces cluttered
* output, and doesn't indicate which unit is the default.
- * "Number[units]" would be cleaner, as would a subset of
+ * "Number[Units]" would be cleaner, as would a subset of
* common units, e.g. "Number[kmg...]", but neither helps
- * with default. "Number[k|unit]" and "Number[m|unit]" show
- * the default, and "unit" indicates that other units
+ * with default. "Number[k|Unit]" and "Number[m|Unit]" show
+ * the default, and "Unit" indicates that other units
* are possible without listing them all. This also
* suggests using the preferred lower case letters, because
* --size and other option args treat upper/lower letters
@@ -115,9 +115,9 @@ val(activation_VAL, activation_arg, "Active", "y|n|ay")
val(cachemode_VAL, cachemode_arg, "CacheMode", "writethrough|writeback")
val(discards_VAL, discards_arg, "Discards", "passdown|nopassdown|ignore")
val(mirrorlog_VAL, mirrorlog_arg, "MirrorLog", "core|disk")
-val(sizekb_VAL, size_kb_arg, "SizeKB", "Number[k|unit]")
-val(sizemb_VAL, size_mb_arg, "SizeMB", "Number[m|unit]")
-val(regionsize_VAL, regionsize_arg, "RegionSize", "Number[m|unit]")
+val(sizekb_VAL, size_kb_arg, "SizeKB", "Number[k|Unit]")
+val(sizemb_VAL, size_mb_arg, "SizeMB", "Number[m|Unit]")
+val(regionsize_VAL, regionsize_arg, "RegionSize", "Number[m|Unit]")
val(numsigned_VAL, int_arg_with_sign, "SNumber", "[+|-]Number")
val(numsignedper_VAL, int_arg_with_sign_and_percent, "SNumberP", "[+|-]Number[%VG|%PVS|%FREE]")
val(permission_VAL, permission_arg, "Permission", "rw|r")
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=da634bfc8933619a…
Commit: da634bfc8933619a70284077b499c82802f04ceb
Parent: 1eb1869626cbdacbeca037fbd81d01756f2faa76
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Feb 22 16:38:54 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Feb 22 16:38:54 2017 -0600
man: indicate repeatable options
Print ... after a repeatable option in the OPTIONS section.
An alternative would be to just mention in the text description
that the option is repeatable.
---
tools/command.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index d170eec..1a5fbb5 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -176,8 +176,8 @@ struct opt_name {
char _padding[7];
const char *long_opt; /* --foo */
int val_enum; /* xyz_VAL when --foo takes a val like "--foo xyz" */
- uint32_t unused1;
- uint32_t unused2;
+ uint32_t flags;
+ uint32_t prio;
const char *desc;
};
@@ -2617,7 +2617,6 @@ void print_man_all_options_list(struct command_name *cname)
/*
* All options used for a given command name, along with descriptions.
- * listed in order of:
*/
void print_man_all_options_desc(struct command_name *cname)
@@ -2656,6 +2655,9 @@ void print_man_all_options_desc(struct command_name *cname)
print_val_man(val_names[val_enum].usage);
}
+ if (opt_names[opt_enum].flags & ARG_COUNTABLE)
+ printf(" ...");
+
if (opt_names[opt_enum].desc) {
printf("\n");
printf(".br\n");
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1eb1869626cbdacb…
Commit: 1eb1869626cbdacbeca037fbd81d01756f2faa76
Parent: aa72caca5a19c67caffefc3f967af630b93ee2f0
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Feb 22 15:20:44 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Feb 22 15:20:44 2017 -0600
man: improve writemostly PV arg
---
tools/command.c | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 0d40af6..d170eec 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1785,16 +1785,6 @@ static void print_val_man(const char *str)
int line_argc;
int i;
- if (!strcmp(str, "Number") ||
- !strcmp(str, "String") ||
- !strncmp(str, "VG", 2) ||
- !strncmp(str, "LV", 2) ||
- !strncmp(str, "PV", 2) ||
- !strcmp(str, "Tag")) {
- printf("\\fI%s\\fP", str);
- return;
- }
-
/*
* The suffix [k|unit] is just printed in plain text.
* Doing bold k and underlined unit creates a lot of
@@ -1823,6 +1813,11 @@ static void print_val_man(const char *str)
return;
}
+ if (!strcmp(str, "PV[:t|n|y]")) {
+ printf("\\fIPV\\fP[\\fB:t\\fP|\\fBn\\fP|\\fBy\\fP]");
+ return;
+ }
+
/*
* I think this bit is almost unnecessary with the specific
* ones checked above.
@@ -1841,6 +1836,16 @@ static void print_val_man(const char *str)
return;
}
+ if (!strcmp(str, "Number") ||
+ !strcmp(str, "String") ||
+ !strncmp(str, "VG", 2) ||
+ !strncmp(str, "LV", 2) ||
+ !strncmp(str, "PV", 2) ||
+ !strcmp(str, "Tag")) {
+ printf("\\fI%s\\fP", str);
+ return;
+ }
+
if (strchr(str, '|')) {
int len = strlen(str);
line = dm_strdup(str);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=aa72caca5a19c67c…
Commit: aa72caca5a19c67caffefc3f967af630b93ee2f0
Parent: f44e69f9fc2dc56d1fec02f6303b2a1101cdf47e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Feb 22 15:16:20 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Feb 22 15:40:59 2017 +0100
tests: support zero_dev
When the test would need to try to write some large amount of data
we can give it 'zero' segments - for obvious reason such written data
can't be verified but in some test cases it doesn't really matter.
Usage follows 'error_dev' style.
For now test suite is not supporting any combination of
error/delay/zero segments so only 1 type could be used per PV.
---
test/lib/aux.sh | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 5108a52..9779358 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -866,7 +866,7 @@ common_dev_() {
else
test -z "${offsets[@]}" && offsets="0:"
fi ;;
- error) offsets=${@:3}
+ error|zero) offsets=${@:3}
test -z "${offsets[@]}" && offsets="0:" ;;
esac
@@ -893,8 +893,8 @@ common_dev_() {
case "$tgtype" in
delay)
echo "$from $len delay $pvdev $(($pos + $offset)) $read_ms $pvdev $(($pos + $offset)) $write_ms" ;;
- error)
- echo "$from $len error" ;;
+ error|zero)
+ echo "$from $len $tgtype" ;;
esac
pos=$(($pos + $len))
done > "$name.devtable"
@@ -1013,12 +1013,23 @@ restore_from_devtable() {
#
# Convert device to device with errors
# Takes the list of pairs of error segment from:len
-# Original device table is replace with multiple lines
+# Combination with zero or delay is unsupported
+# Original device table is replaced with multiple lines
# i.e. error_dev "$dev1" 8:32 96:8
error_dev() {
common_dev_ error "$@"
}
+#
+# Convert existing device to a device with zero segments
+# Takes the list of pairs of zero segment from:len
+# Combination with error or delay is unsupported
+# Original device table is replaced with multiple lines
+# i.e. zero_dev "$dev1" 8:32 96:8
+zero_dev() {
+ common_dev_ zero "$@"
+}
+
backup_dev() {
local dev
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f44e69f9fc2dc56d…
Commit: f44e69f9fc2dc56d1fec02f6303b2a1101cdf47e
Parent: 9712995edd60220cd525c51b6bab9f7bd3b38b5a
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Feb 21 13:06:00 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Feb 22 15:40:28 2017 +0100
tests: not slowing work with metadata
Slows only data extents on a PV.
---
test/shell/pvmove-resume-multiseg.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/shell/pvmove-resume-multiseg.sh b/test/shell/pvmove-resume-multiseg.sh
index a2fbf35..0f4e78d 100644
--- a/test/shell/pvmove-resume-multiseg.sh
+++ b/test/shell/pvmove-resume-multiseg.sh
@@ -33,9 +33,9 @@ test_pvmove_resume() {
# next LV on same VG and differetnt PV (we want to test 2 pvmoves per VG)
lvcreate -an -Zn -l30 -n $lv2 $vg "$dev3"
- aux delay_dev "$dev4" 0 250
+ aux delay_dev "$dev4" 0 250 $(get first_extent_sector "$dev4"):
test -e HAVE_DM_DELAY || { lvremove -f $vg; return 0; }
- aux delay_dev "$dev5" 0 250
+ aux delay_dev "$dev5" 0 250 $(get first_extent_sector "$dev5"):
pvmove -i5 "$dev1" "$dev4" &
PVMOVE=$!
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9712995edd60220c…
Commit: 9712995edd60220cd525c51b6bab9f7bd3b38b5a
Parent: 6716f5a2f46f034f24d01918cc1dc78cd7bac9be
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Feb 22 15:12:54 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Feb 22 15:35:04 2017 +0100
snapshot: improve removal of active origin volume
Previously when lvremove tried to remove 'active' origin,
it had been asking for every 'snapshot' LV separately
and doing individual single snapshot removals first.
To be faster it now deactivates origin before removal
all connected snapshots.
This avoids multiple reloads of dm table for origin volume
which were unnecessary as origin was meant to be removed as well.
---
WHATS_NEW | 1 +
lib/metadata/lv_manip.c | 17 +++++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index b0768cd..722b6f6 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Deactivate active origin first before removal for improved workflow.
Fix regression of accepting options --type and -m with lvresize (2.02.158).
Add lvconvert --swapmetadata, new specific way to swap pool metadata LVs.
Add lvconvert --startpoll, new specific way to start polling conversions.
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index d8f869d..78cc30e 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -6229,12 +6229,21 @@ int lv_remove_with_dependencies(struct cmd_context *cmd, struct logical_volume *
/* Remove snapshot LVs first */
if ((force == PROMPT) &&
/* Active snapshot already needs to confirm each active LV */
- !lv_is_active(lv) &&
- yes_no_prompt("Removing origin %s will also remove %u "
- "snapshots(s). Proceed? [y/n]: ",
- lv->name, lv->origin_count) == 'n')
+ (yes_no_prompt("Do you really want to remove%s "
+ "%sorigin logical volume %s with %u snapshot(s)? [y/n]: ",
+ lv_is_active(lv) ? " active" : "",
+ vg_is_clustered(lv->vg) ? "clustered " : "",
+ display_lvname(lv),
+ lv->origin_count) == 'n'))
goto no_remove;
+ if (!deactivate_lv(cmd, lv)) {
+ stack;
+ goto no_remove;
+ }
+ log_verbose("Removing origin logical volume %s with %u snapshots(s).",
+ display_lvname(lv), lv->origin_count);
+
dm_list_iterate_safe(snh, snht, &lv->snapshot_segs)
if (!lv_remove_with_dependencies(cmd, dm_list_struct_base(snh, struct lv_segment,
origin_list)->cow,
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6716f5a2f46f034f…
Commit: 6716f5a2f46f034f24d01918cc1dc78cd7bac9be
Parent: 263050bc073e509f84de4c4da160887f412376fc
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Feb 22 15:20:23 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Feb 22 15:20:52 2017 +0100
WHATS_NEW: add entry
---
WHATS_NEW | 1 +
tools/toollib.c | 1 -
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index c8b7fdc..b0768cd 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Fix regression of accepting options --type and -m with lvresize (2.02.158).
Add lvconvert --swapmetadata, new specific way to swap pool metadata LVs.
Add lvconvert --startpoll, new specific way to start polling conversions.
Add lvconvert --mergethin, new specific way to merge thin snapshots.
diff --git a/tools/toollib.c b/tools/toollib.c
index 842f67c..0e45d80 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -5755,4 +5755,3 @@ bad:
out:
return 0;
}
-
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=263050bc073e509f…
Commit: 263050bc073e509f84de4c4da160887f412376fc
Parent: c1ce371b59257a236115d2d6a3cb24af17faf55d
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 21 14:59:52 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 21 14:59:52 2017 -0600
man/help: enclose each option in brackets
Placing [] around each individual option is the most
common style, and it improves the readability.
---
tools/command.c | 73 +++++++++++++++++++------------------------------------
1 files changed, 25 insertions(+), 48 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index ed38740..0d40af6 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1654,8 +1654,6 @@ void print_usage(struct command *cmd, int longhelp)
goto op_count;
if (cmd->oo_count) {
- first = 1;
-
for (oo = 0; oo < cmd->oo_count; oo++) {
opt_enum = cmd->optional_opt_args[oo].opt;
@@ -1680,24 +1678,18 @@ void print_usage(struct command *cmd, int longhelp)
if ((cname->variants > 1) && cname->common_options[opt_enum])
continue;
- if (first)
- printf("\n\t[");
- else
- printf("\n\t ");
- first = 0;
+ printf("\n\t[");
printf(" %s", opt_names[opt_enum].long_opt);
if (cmd->optional_opt_args[oo].def.val_bits) {
printf(" ");
print_usage_def(&cmd->optional_opt_args[oo].def);
}
+
+ printf(" ]");
}
- if (first)
- printf("\n\t[");
- else
- printf("\n\t ");
- printf(" COMMON_OPTIONS ]");
+ printf("\n\t[ COMMON_OPTIONS ]");
}
op_count:
@@ -1724,33 +1716,29 @@ void print_usage(struct command *cmd, int longhelp)
void print_usage_common_lvm(struct command_name *cname, struct command *cmd)
{
- int oo, opt_enum, first = 1;
+ int oo, opt_enum;
printf(" Common options for lvm:");
for (oo = 0; oo < lvm_all.oo_count; oo++) {
opt_enum = lvm_all.optional_opt_args[oo].opt;
- if (first)
- printf("\n\t[");
- else
- printf("\n\t ");
- first = 0;
+ printf("\n\t[");
printf(" %s", opt_names[opt_enum].long_opt);
if (lvm_all.optional_opt_args[oo].def.val_bits) {
printf(" ");
print_usage_def(&lvm_all.optional_opt_args[oo].def);
}
+ printf(" ]");
}
- printf(" ]");
printf("\n\n");
}
void print_usage_common_cmd(struct command_name *cname, struct command *cmd)
{
- int oo, opt_enum, first = 1;
+ int oo, opt_enum;
/*
* when there's more than one variant, options that
@@ -1769,11 +1757,7 @@ void print_usage_common_cmd(struct command_name *cname, struct command *cmd)
if (is_lvm_all_opt(opt_enum))
continue;
- if (first)
- printf("\n\t[");
- else
- printf("\n\t ");
- first = 0;
+ printf("\n\t[");
for (oo = 0; oo < cmd->oo_count; oo++) {
if (cmd->optional_opt_args[oo].opt != opt_enum)
@@ -1786,9 +1770,9 @@ void print_usage_common_cmd(struct command_name *cname, struct command *cmd)
}
break;
}
+ printf(" ]");
}
- printf(" ]");
printf("\n\n");
}
@@ -2161,7 +2145,6 @@ void print_man_usage(char *lvmname, struct command *cmd)
if (cmd->oo_count) {
printf(".RS 4\n");
- printf("[");
/* print optional options with short opts */
@@ -2179,10 +2162,9 @@ void print_man_usage(char *lvmname, struct command *cmd)
if (sep) {
printf("\n.br\n");
- printf(" ");
}
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ printf("[ \\fB-%c\\fP|\\fB%s\\fP",
opt_names[opt_enum].short_opt,
man_long_opt_name(cmd->name, opt_enum));
@@ -2190,6 +2172,7 @@ void print_man_usage(char *lvmname, struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
+ printf(" ]");
sep = 1;
}
@@ -2209,11 +2192,10 @@ void print_man_usage(char *lvmname, struct command *cmd)
if (sep) {
printf("\n.br\n");
- printf(" ");
}
/* space alignment without short opt */
- printf(" ");
+ printf("[ ");
printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
@@ -2221,17 +2203,16 @@ void print_man_usage(char *lvmname, struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
+ printf(" ]");
sep = 1;
}
if (sep) {
printf("\n.br\n");
- printf(" ");
/* space alignment without short opt */
/* printf(" "); */
}
- printf(" COMMON_OPTIONS");
- printf(" ]\n");
+ printf("[ COMMON_OPTIONS ]\n");
printf(".RE\n");
printf(".br\n");
}
@@ -2290,7 +2271,6 @@ void print_man_usage_common_lvm(struct command *cmd)
sep = 0;
printf(".RS 4\n");
- printf("[");
/* print those with short opts */
for (i = 0; i < ARG_COUNT; i++) {
@@ -2304,14 +2284,13 @@ void print_man_usage_common_lvm(struct command *cmd)
if (sep) {
printf("\n.br\n");
- printf(" ");
}
for (oo = 0; oo < cmd->oo_count; oo++) {
if (cmd->optional_opt_args[oo].opt != opt_enum)
continue;
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ printf("[ \\fB-%c\\fP|\\fB%s\\fP",
opt_names[opt_enum].short_opt,
man_long_opt_name(cmd->name, opt_enum));
@@ -2319,6 +2298,7 @@ void print_man_usage_common_lvm(struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
+ printf(" ]");
sep = 1;
break;
}
@@ -2337,7 +2317,6 @@ void print_man_usage_common_lvm(struct command *cmd)
if (sep) {
printf("\n.br\n");
- printf(" ");
}
for (oo = 0; oo < cmd->oo_count; oo++) {
@@ -2345,7 +2324,7 @@ void print_man_usage_common_lvm(struct command *cmd)
continue;
/* space alignment without short opt */
- printf(" ");
+ printf("[ ");
printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
@@ -2353,13 +2332,13 @@ void print_man_usage_common_lvm(struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
+ printf(" ]");
sep = 1;
break;
}
}
- printf(" ]\n");
- printf(".RE\n");
+ printf("\n.RE\n");
return;
}
@@ -2380,7 +2359,6 @@ void print_man_usage_common_cmd(struct command *cmd)
sep = 0;
printf(".RS 4\n");
- printf("[");
/* print those with short opts */
for (i = 0; i < ARG_COUNT; i++) {
@@ -2401,14 +2379,13 @@ void print_man_usage_common_cmd(struct command *cmd)
if (sep) {
printf("\n.br\n");
- printf(" ");
}
for (oo = 0; oo < cmd->oo_count; oo++) {
if (cmd->optional_opt_args[oo].opt != opt_enum)
continue;
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ printf("[ \\fB-%c\\fP|\\fB%s\\fP",
opt_names[opt_enum].short_opt,
man_long_opt_name(cmd->name, opt_enum));
@@ -2416,6 +2393,7 @@ void print_man_usage_common_cmd(struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
+ printf(" ]");
sep = 1;
break;
}
@@ -2441,7 +2419,6 @@ void print_man_usage_common_cmd(struct command *cmd)
if (sep) {
printf("\n.br\n");
- printf(" ");
}
for (oo = 0; oo < cmd->oo_count; oo++) {
@@ -2449,7 +2426,7 @@ void print_man_usage_common_cmd(struct command *cmd)
continue;
/* space alignment without short opt */
- printf(" ");
+ printf("[ ");
printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
@@ -2457,13 +2434,13 @@ void print_man_usage_common_cmd(struct command *cmd)
printf(" ");
print_def_man(&cmd->optional_opt_args[oo].def, 1);
}
+ printf(" ]");
sep = 1;
break;
}
}
- printf(" ]\n");
- printf(".RE\n");
+ printf("\n.RE\n");
printf(".br\n");
printf("\n");
return;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c1ce371b59257a23…
Commit: c1ce371b59257a236115d2d6a3cb24af17faf55d
Parent: b7ae57c6a6fd69d23cc8c180920ddca372914419
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 21 14:32:54 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 21 14:32:54 2017 -0600
man/help: use separate common option lists
There are two kinds of common options:
1. options common to all variants of a given command name
2. options common to all lvm commands
Previously, both kinds of common options were listed together
under "Common options". Now the first are printed under
"Common options for command" (when needed), and the second
are printed under "Common options for lvm" (always).
---
tools/command-lines.in | 14 ----
tools/command.c | 193 ++++++++++++++++++++++++++++++++++++++----------
tools/command.h | 3 +-
tools/lvmcmdline.c | 7 +-
4 files changed, 160 insertions(+), 57 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 606d2e7..348e7a4 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -191,20 +191,6 @@ OO_ALL: --commandprofile String, --config String, --debug,
--verbose, --version, --yes, --test
#
-# This list only applies to printing the usage text.
-# These common options are displayed once at the end of
-# a given command's usage. This is done to avoid excessive
-# repetition of common options, which may obscure the more
-# interesting and relevant parts of a common prototype.
-# This definition is *only* used when generating the command
-# usage strings, and is the basis for the division between
-# the "usage" and "usage_common" strings. This OO defn does
-# not relate to which optional opts are accepted by commands,
-# which is defined by the OO line.
-#
-OO_USAGE_COMMON: OO_ALL, --force, --noudevsync
-
-#
# options for pvs, lvs, vgs, fullreport
#
OO_REPORT: --aligned, --all, --binary, --configreport ConfigReport, --foreign,
diff --git a/tools/command.c b/tools/command.c
index e7596df..ed38740 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1506,12 +1506,7 @@ int define_commands(char *run_name)
return 0;
}
- /*
- * For usage.
- * Predefined string of options common to all commands
- * (for compact output)
- */
- include_optional_opt_args(&lvm_all, "OO_USAGE_COMMON");
+ include_optional_opt_args(&lvm_all, "OO_ALL");
return 1;
}
@@ -1665,12 +1660,23 @@ void print_usage(struct command *cmd, int longhelp)
opt_enum = cmd->optional_opt_args[oo].opt;
/*
- * Skip common opts in lvm_all and cname->common_options.
+ * Skip common lvm options in lvm_all which
+ * are printed at the end under "Common options for lvm"
+ * see print_common_options_lvm()
*/
if (is_lvm_all_opt(opt_enum))
continue;
+ /*
+ * When there is more than one variant,
+ * skip common command options from
+ * cname->common_options (options common
+ * to all variants), which are printed at
+ * the end under "Common options for command"
+ * see print_common_options_cmd()
+ */
+
if ((cname->variants > 1) && cname->common_options[opt_enum])
continue;
@@ -1716,11 +1722,35 @@ void print_usage(struct command *cmd, int longhelp)
}
-void print_usage_common(struct command_name *cname, struct command *cmd)
+void print_usage_common_lvm(struct command_name *cname, struct command *cmd)
{
int oo, opt_enum, first = 1;
- printf(" Common options:");
+ printf(" Common options for lvm:");
+
+ for (oo = 0; oo < lvm_all.oo_count; oo++) {
+ opt_enum = lvm_all.optional_opt_args[oo].opt;
+
+ if (first)
+ printf("\n\t[");
+ else
+ printf("\n\t ");
+ first = 0;
+
+ printf(" %s", opt_names[opt_enum].long_opt);
+ if (lvm_all.optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_usage_def(&lvm_all.optional_opt_args[oo].def);
+ }
+ }
+
+ printf(" ]");
+ printf("\n\n");
+}
+
+void print_usage_common_cmd(struct command_name *cname, struct command *cmd)
+{
+ int oo, opt_enum, first = 1;
/*
* when there's more than one variant, options that
@@ -1728,7 +1758,9 @@ void print_usage_common(struct command_name *cname, struct command *cmd)
*/
if (cname->variants < 2)
- goto all;
+ return;
+
+ printf(" Common options for command:");
for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
if (!cname->common_options[opt_enum])
@@ -1756,25 +1788,6 @@ void print_usage_common(struct command_name *cname, struct command *cmd)
}
}
- all:
- /* options that are common to all lvm commands */
-
- for (oo = 0; oo < lvm_all.oo_count; oo++) {
- opt_enum = lvm_all.optional_opt_args[oo].opt;
-
- if (first)
- printf("\n\t[");
- else
- printf("\n\t ");
- first = 0;
-
- printf(" %s", opt_names[opt_enum].long_opt);
- if (lvm_all.optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_usage_def(&lvm_all.optional_opt_args[oo].def);
- }
- }
-
printf(" ]");
printf("\n\n");
}
@@ -2215,7 +2228,7 @@ void print_man_usage(char *lvmname, struct command *cmd)
printf("\n.br\n");
printf(" ");
/* space alignment without short opt */
- printf(" ");
+ /* printf(" "); */
}
printf(" COMMON_OPTIONS");
printf(" ]\n");
@@ -2263,7 +2276,7 @@ void print_man_usage(char *lvmname, struct command *cmd)
* then options with only long names, alphabetically
*/
-void print_man_usage_common(struct command *cmd)
+void print_man_usage_common_lvm(struct command *cmd)
{
struct command_name *cname;
int i, sep, rp, oo, op, opt_enum;
@@ -2271,6 +2284,99 @@ void print_man_usage_common(struct command *cmd)
if (!(cname = find_command_name(cmd->name)))
return;
+ printf("Common options for lvm:\n");
+ printf(".\n");
+
+ sep = 0;
+
+ printf(".RS 4\n");
+ printf("[");
+
+ /* print those with short opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if (!is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (sep) {
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ break;
+ }
+
+ }
+
+ /* print those without short opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if (!is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (sep) {
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ break;
+ }
+ }
+
+ printf(" ]\n");
+ printf(".RE\n");
+ return;
+}
+
+void print_man_usage_common_cmd(struct command *cmd)
+{
+ struct command_name *cname;
+ int i, sep, rp, oo, op, opt_enum;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ if (cname->variants < 2)
+ return;
+
+ printf("Common options for command:\n");
+ printf(".\n");
+
sep = 0;
printf(".RS 4\n");
@@ -2286,7 +2392,11 @@ void print_man_usage_common(struct command *cmd)
if (!opt_names[opt_enum].short_opt)
continue;
- if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
+ /* common cmd options only used with variants */
+ if (cname->variants < 2)
+ continue;
+
+ if (is_lvm_all_opt(opt_enum))
continue;
if (sep) {
@@ -2322,7 +2432,11 @@ void print_man_usage_common(struct command *cmd)
if (opt_names[opt_enum].short_opt)
continue;
- if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
+ /* common cmd options only used with variants */
+ if (cname->variants < 2)
+ continue;
+
+ if (is_lvm_all_opt(opt_enum))
continue;
if (sep) {
@@ -2349,6 +2463,9 @@ void print_man_usage_common(struct command *cmd)
}
printf(" ]\n");
+ printf(".RE\n");
+ printf(".br\n");
+ printf("\n");
return;
}
@@ -2811,9 +2928,8 @@ void print_man(char *name, char *des_file, int include_primary, int include_seco
cmd = &commands[i];
if (prev_cmd && strcmp(prev_cmd->name, cmd->name)) {
- printf("Common options:\n");
- printf(".\n");
- print_man_usage_common(prev_cmd);
+ print_man_usage_common_cmd(prev_cmd);
+ print_man_usage_common_lvm(prev_cmd);
printf("\n");
printf(".SH OPTIONS\n");
@@ -2909,9 +3025,8 @@ void print_man(char *name, char *des_file, int include_primary, int include_seco
print_man_usage(lvmname, cmd);
if (i == (COMMAND_COUNT - 1)) {
- printf("Common options:\n");
- printf(".\n");
- print_man_usage_common(cmd);
+ print_man_usage_common_cmd(cmd);
+ print_man_usage_common_lvm(cmd);
printf("\n");
printf(".SH OPTIONS\n");
diff --git a/tools/command.h b/tools/command.h
index 51c4551..c5c801a 100644
--- a/tools/command.h
+++ b/tools/command.h
@@ -214,7 +214,8 @@ struct command {
int define_commands(char *run_name);
int command_id_to_enum(const char *str);
void print_usage(struct command *cmd, int longhelp);
-void print_usage_common(struct command_name *cname, struct command *cmd);
+void print_usage_common_cmd(struct command_name *cname, struct command *cmd);
+void print_usage_common_lvm(struct command_name *cname, struct command *cmd);
void factor_common_options(void);
#endif
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index ecb5802..02266c9 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1716,9 +1716,10 @@ static int _usage(const char *name, int longhelp)
}
/* Common options are printed once for all variants of a command name. */
- if (longhelp)
- print_usage_common(cname, cmd);
- else
+ if (longhelp) {
+ print_usage_common_cmd(cname, cmd);
+ print_usage_common_lvm(cname, cmd);
+ } else
log_print("Use --longhelp to show all options.");
return 1;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b7ae57c6a6fd69d2…
Commit: b7ae57c6a6fd69d23cc8c180920ddca372914419
Parent: 21fc35dd1bcd068ad4453e5c18b2d754bdcb12b0
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 21 12:05:36 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 21 12:27:51 2017 -0600
man: teaking output format
---
tools/command.c | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index c425fd1..e7596df 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1798,6 +1798,38 @@ static void print_val_man(const char *str)
return;
}
+ /*
+ * The suffix [k|unit] is just printed in plain text.
+ * Doing bold k and underlined unit creates a lot of
+ * visual "noise" that is choppy and hard to read.
+ * The extra markup in this case doesn't add anything
+ * that isn't already obvious.
+ */
+
+ if (!strcmp(str, "Number[k|unit]")) {
+ printf("\\fINumber\\fP[k|unit]");
+ return;
+ }
+
+ if (!strcmp(str, "Number[m|unit]")) {
+ printf("\\fINumber\\fP[m|unit]");
+ return;
+ }
+
+ if (!strcmp(str, "[+|-]Number")) {
+ printf("[\\fB+\\fP|\\fB-\\fP]\\fINumber\\fP");
+ return;
+ }
+
+ if (!strcmp(str, "[+|-]Number[%VG|%PVS|%FREE]")) {
+ printf("[\\fB+\\fP|\\fB-\\fP]\\fINumber\\fP[\\fB%%VG\\fP|\\fB%%PVS\\fP|\\fB%%FREE\\fP]");
+ return;
+ }
+
+ /*
+ * I think this bit is almost unnecessary with the specific
+ * ones checked above.
+ */
if (strstr(str, "Number[") || strstr(str, "]Number")) {
for (i = 0; i < strlen(str); i++) {
if (str[i] == 'N')
@@ -2666,7 +2698,7 @@ void print_man_all_positions_desc(struct command_name *cname)
/* Nearly every command uses a number arg somewhere. */
printf("\n.HP\n");
- printf("\\fINumber\\fP, \\fISize\\fP");
+ printf("\\fINumber\\fP");
printf("\n");
printf(".br\n");
printf("Input units are always treated as base two values, regardless of unit\n"
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=21fc35dd1bcd068a…
Commit: 21fc35dd1bcd068ad4453e5c18b2d754bdcb12b0
Parent: 7e411b111f4d87a1f342a016299fe90c2d64ec2d
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 21 11:40:51 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 21 12:27:51 2017 -0600
commands: adjust default help output
Remove the "usage notes" which should just
live in the man pages.
When there are 3 or more variants of a command,
print all the options produces a lot of output,
so require --longhelp to print all the options
in these cases.
---
tools/command.c | 7 ++++-
tools/command.h | 3 +-
tools/lvmcmdline.c | 54 +++++++++++++++------------------------------------
3 files changed, 23 insertions(+), 41 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index fe8c1f6..c425fd1 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1229,7 +1229,7 @@ static int is_lvm_all_opt(int opt)
/* Find common options for all variants of each command name. */
-static void factor_common_options(void)
+void factor_common_options(void)
{
int cn, opt_enum, ci, oo, ro, found;
struct command *cmd;
@@ -1602,7 +1602,7 @@ static void print_usage_def(struct arg_def *def)
printf(" ...");
}
-void print_usage(struct command *cmd)
+void print_usage(struct command *cmd, int longhelp)
{
struct command_name *cname = find_command_name(cmd->name);
int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
@@ -1652,6 +1652,9 @@ void print_usage(struct command *cmd)
}
}
+ if (!longhelp)
+ goto done;
+
if (!cmd->oo_count)
goto op_count;
diff --git a/tools/command.h b/tools/command.h
index 2d8f628..51c4551 100644
--- a/tools/command.h
+++ b/tools/command.h
@@ -213,7 +213,8 @@ struct command {
int define_commands(char *run_name);
int command_id_to_enum(const char *str);
-void print_usage(struct command *cmd);
+void print_usage(struct command *cmd, int longhelp);
void print_usage_common(struct command_name *cname, struct command *cmd);
+void factor_common_options(void);
#endif
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 9fa8d94..ecb5802 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1564,7 +1564,7 @@ static struct command *_find_command(struct cmd_context *cmd, const char *path,
log_error("Run '%s --help' for more information.", name);
if (close_ro) {
log_warn("Closest command usage is:");
- print_usage(&_cmdline.commands[close_i]);
+ print_usage(&_cmdline.commands[close_i], 0);
}
return NULL;
}
@@ -1677,39 +1677,6 @@ static void _short_usage(const char *name)
log_error("Run `%s --help' for more information.", name);
}
-static void _usage_notes(void)
-{
- /*
- * Excluding commonly understood syntax style like the meanings of:
- * [ ] for optional, ... for repeatable, | for one of the following,
- * -- for an option name, lower case strings and digits for literals.
- */
- log_print("Usage notes:\n"
- ". Variable parameters are: Number, String, PV, VG, LV, Tag.\n"
- ". Select indicates that a required positional parameter can\n"
- " be omitted if the --select option is used.\n"
- ". --size Number can be replaced with --extents NumberExtents.\n"
- ". When --name is omitted from lvcreate, a new LV name is\n"
- " generated with the \"lvol\" prefix and a unique numeric suffix.\n"
- ". The required VG parameter in lvcreate may be omitted when\n"
- " the VG name is included in another option, e.g. --name VG/LV.\n"
- ". For required options listed in parentheses, e.g. (--A, --B),\n"
- " any one is required, after which the others are optional.\n"
- ". The _new suffix indicates the VG or LV must not yet exist.\n"
- ". LV followed by _<type> indicates that an LV of the given type\n"
- " is required. (raid represents any raid<N> type.)\n"
- ". Input units are always treated as base two values, regardless of\n"
- " unit capitalization, e.g. 'k' and 'K' both refer to 1024.\n"
- ". The default input unit is specified by letter, followed by |unit\n"
- " which represents other possible input units: bBsSkKmMgGtTpPeE.\n"
- ". Output units can be specified with the --units option, for which\n"
- " lower/upper case letters refer to base 2/10 values.\n"
- " formats that are recognized, e.g. for compatibility.\n"
- ". See man pages for short option equivalents of long option names,\n"
- " and for more detailed descriptions of variable parameters.\n"
- " \n");
-}
-
static int _usage(const char *name, int longhelp)
{
struct command_name *cname = find_command_name(name);
@@ -1721,8 +1688,19 @@ static int _usage(const char *name, int longhelp)
return 0;
}
+ /*
+ * Looks at all variants of each command name and figures out
+ * which options are common to all variants (for compact output)
+ */
+ factor_common_options();
+
log_print("%s - %s\n", name, cname->desc);
+ /* Reduce the default output when there are several variants. */
+
+ if (cname->variants < 3)
+ longhelp = 1;
+
for (i = 0; i < COMMAND_COUNT; i++) {
if (strcmp(_cmdline.commands[i].name, name))
continue;
@@ -1733,15 +1711,15 @@ static int _usage(const char *name, int longhelp)
if ((_cmdline.commands[i].cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !longhelp)
continue;
- print_usage(&_cmdline.commands[i]);
+ print_usage(&_cmdline.commands[i], longhelp);
cmd = &_cmdline.commands[i];
}
/* Common options are printed once for all variants of a command name. */
- print_usage_common(cname, cmd);
-
if (longhelp)
- _usage_notes();
+ print_usage_common(cname, cmd);
+ else
+ log_print("Use --longhelp to show all options.");
return 1;
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7e411b111f4d87a1…
Commit: 7e411b111f4d87a1f342a016299fe90c2d64ec2d
Parent: f80d37375354b9b9cab5326d9d03e036012a824e
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 21 11:13:23 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 21 12:27:51 2017 -0600
man lvm: update see also list
add several missing references
remove references to lvmdiskscan lvmchange
---
man/lvm.8.in | 108 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 65 insertions(+), 43 deletions(-)
diff --git a/man/lvm.8.in b/man/lvm.8.in
index 0a64e4f..1f3247a 100644
--- a/man/lvm.8.in
+++ b/man/lvm.8.in
@@ -484,48 +484,70 @@ directly.
.SH SEE ALSO
.
.nh
-.BR lvm.conf (5),
-.BR lvmcache (7),
-.BR lvmreport(7),
-.BR lvmthin (7),
-.BR clvmd (8),
+.BR lvm (8)
+.BR lvm.conf (5)
+.BR lvmconfig (8)
+
+.BR pvchange (8)
+.BR pvck (8)
+.BR pvcreate (8)
+.BR pvdisplay (8)
+.BR pvmove (8)
+.BR pvremove (8)
+.BR pvresize (8)
+.BR pvs (8)
+.BR pvscan (8)
+
+.BR vgcfgbackup (8)
+.BR vgcfgrestore (8)
+.BR vgchange (8)
+.BR vgck (8)
+.BR vgcreate (8)
+.BR vgconvert (8)
+.BR vgdisplay (8)
+.BR vgexport (8)
+.BR vgextend (8)
+.BR vgimport (8)
+.BR vgimportclone (8)
+.BR vgmerge (8)
+.BR vgmknodes (8)
+.BR vgreduce (8)
+.BR vgremove (8)
+.BR vgrename (8)
+.BR vgs (8)
+.BR vgscan (8)
+.BR vgsplit (8)
+
+.BR lvcreate (8)
+.BR lvchange (8)
+.BR lvconvert (8)
+.BR lvdisplay (8)
+.BR lvextend (8)
+.BR lvreduce (8)
+.BR lvremove (8)
+.BR lvrename (8)
+.BR lvresize (8)
+.BR lvs (8)
+.BR lvscan (8)
+
+.BR lvm2-activation-generator (8)
+.BR blkdeactivate (8)
+.BR lvmdump (8)
+
+.BR dmeventd (8)
+.BR lvmetad (8)
+.BR lvmpolld (8)
+.BR lvmlockd (8)
+.BR lvmlockctl (8)
+.BR clvmd (8)
+.BR cmirrord (8)
+.BR lvmdbusd (8)
+
+.BR lvmsystemid (7)
+.BR lvmreport (7)
+.BR lvmraid (7)
+.BR lvmthin (7)
+.BR lvmcache (7)
+
.BR dmsetup (8),
-.BR lvchange (8),
-.BR lvcreate (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvmchange (8),
-.BR lvmconfig (8),
-.BR lvmdiskscan (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvresize (8),
-.BR lvs (8),
-.BR lvscan (8),
-.BR pvchange (8),
-.BR pvck (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR pvmove (8),
-.BR pvremove (8),
-.BR pvs (8),
-.BR pvscan (8),
-.BR vgcfgbackup (8),
-.BR vgchange (8),
-.BR vgck (8),
-.BR vgconvert (8),
-.BR vgcreate (8),
-.BR vgdisplay (8),
-.BR vgextend (8),
-.BR vgimport (8),
-.BR vgimportclone (8),
-.BR vgmerge (8),
-.BR vgmknodes (8),
-.BR vgreduce (8),
-.BR vgremove (8),
-.BR vgrename (8),
-.BR vgs (8),
-.BR vgscan (8),
-.BR vgsplit (8),
.BR readline (3)
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f80d37375354b9b9…
Commit: f80d37375354b9b9cab5326d9d03e036012a824e
Parent: d2dbe71fb3e6210b252db94ec214cee6df2ddb4f
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 21 11:09:01 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 21 12:27:51 2017 -0600
man: expand type option description
---
tools/args.h | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index e7a1ab2..036aa87 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -646,7 +646,16 @@ arg(trustcache_ARG, '\0', "trustcache", 0, 0, 0,
"Avoids certain device scanning during command processing. Do not use.\n")
arg(type_ARG, '\0', "type", segtype_VAL, 0, 0,
- "Specifies an LV type, or \"segment type\".\n")
+ "Specifies an LV type, or \"segment type\".\n"
+ "See usage definitions for specific ways to use these types.\n"
+ "For more information about redundancy and performance (\\fBraid\\fP<N>, \\fBmirror\\fP, \\fBstriped\\fP, \\fBlinear\\fP) see \\fBlvmraid\\fP(7).\n"
+ "For thin provisioning (\\fBthin\\fP, \\fBthin-pool\\fP) see \\fBlvmthin\\fP(7).\n"
+ "For performance caching (\\fBcache\\fP, \\fBcache-pool\\fP) see \\fBlvmcache\\fP(7).\n"
+ "For copy-on-write snapshots (\\fBsnapshot\\fP) see usage definitions.\n"
+ "Several commands omit an explicit type option because the type\n"
+ "is inferred from other options or shortcuts\n"
+ "(e.g. --stripes, --mirrors, --snapshot, --virtualsize, --thin, --cache).\n"
+ "Use inferred types with care because it can lead to unexpected results.\n")
arg(unbuffered_ARG, '\0', "unbuffered", 0, 0, 0,
"Produce output immediately without sorting or aligning the columns properly.\n")
1
0
21 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d2dbe71fb3e6210b…
Commit: d2dbe71fb3e6210b252db94ec214cee6df2ddb4f
Parent: 1c1ce2739ed40d02ae2d41cb9e9de54d0948967c
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Tue Feb 21 11:25:18 2017 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Tue Feb 21 11:25:18 2017 +0000
dmsetup: Indicate device repetition in usage summaries.
---
man/dmsetup.8.in | 20 ++++++++++----------
tools/dmsetup.c | 45 ++++++++++++++++++++++-----------------------
2 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in
index bd26efa..4261fc4 100644
--- a/man/dmsetup.8.in
+++ b/man/dmsetup.8.in
@@ -41,7 +41,7 @@ dmsetup \(em low level logical volume management
. BR deps
. RB [ \-o
. IR options ]
-. RI [ device_name ]
+. RI [ device_name ...]
. ad b
..
.CMD_DEPS
@@ -58,7 +58,7 @@ dmsetup \(em low level logical volume management
.B dmsetup
.de CMD_INFO
. BR info
-. RI [ device_name ]
+. RI [ device_name ...]
..
.CMD_INFO
.
@@ -117,7 +117,7 @@ dmsetup \(em low level logical volume management
.B dmsetup
.de CMD_MANGLE
. BR mangle
-. RI [ device_name ]
+. RI [ device_name ...]
..
.CMD_MANGLE
.
@@ -135,7 +135,7 @@ dmsetup \(em low level logical volume management
.B dmsetup
.de CMD_MKNODES
. BR mknodes
-. RI [ device_name ]
+. RI [ device_name ...]
..
.CMD_MKNODES
.
@@ -159,7 +159,7 @@ dmsetup \(em low level logical volume management
. RB [ \-f | \-\-force ]
. RB [ \-\-retry ]
. RB [ \-\-deferred ]
-. IR device_name
+. IR device_name ...
. ad b
..
.CMD_REMOVE
@@ -197,7 +197,7 @@ dmsetup \(em low level logical volume management
.de CMD_RESUME
. ad l
. BR resume
-. IR device_name
+. IR device_name ...
. RB [ \-\-addnodeoncreate | \-\-addnodeonresume ]
. RB [ \-\-noflush ]
. RB [ \-\-nolockfs ]
@@ -247,7 +247,7 @@ dmsetup \(em low level logical volume management
. RB [ \-\-target
. IR target_type ]
. RB [ \-\-noflush ]
-. RI [ device_name ]
+. RI [ device_name ...]
. ad b
..
.CMD_STATUS
@@ -259,7 +259,7 @@ dmsetup \(em low level logical volume management
. BR suspend
. RB [ \-\-nolockfs ]
. RB [ \-\-noflush ]
-. IR device_name
+. IR device_name ...
. ad b
..
.CMD_SUSPEND
@@ -272,7 +272,7 @@ dmsetup \(em low level logical volume management
. RB [ \-\-target
. IR target_type ]
. RB [ \-\-showkeys ]
-. RI [ device_name ]
+. RI [ device_name ...]
. ad b
..
.CMD_TABLE
@@ -354,7 +354,7 @@ dmsetup \(em low level logical volume management
.de CMD_WIPE_TABLE
. ad l
. BR wipe_table
-. IR device_name
+. IR device_name ...
. RB [ \-f | \-\-force ]
. RB [ \-\-noflush ]
. RB [ \-\-nolockfs ]
diff --git a/tools/dmsetup.c b/tools/dmsetup.c
index 6464069..549a8c5 100644
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
@@ -5726,32 +5726,32 @@ static int _stats_help(CMD_ARGS);
* dmsetup stats <cmd> [options] [device_name]
* dmstats <cmd> [options] [device_name]
*
- * clear [--allregions|--regionid id] [--alldevices|<device...>]
+ * clear [--allregions|--regionid id] [--alldevices|<device>...]
* create [--start <start> [--length <len>]
* [--areas <nr_areas>] [--areasize <size>]
* [--programid <id>] [--userdata <data> ]
* [--bounds histogram_boundaries] [--precise]
- * [--alldevices|<device...>]
+ * [--alldevices|<device>...]
* create --filemap [--nogroup]
* [--programid <id>] [--userdata <data> ]
* [--bounds histogram_boundaries] [--precise] [<file_path>]
* delete [--allprograms|--programid id]
* [--allregions|--regionid id]
- * [--alldevices|<device...>]
+ * [--alldevices|<device>...]
* group [--alias NAME] --regions <regions>
- * [--allprograms|--programid id] [--alldevices|<device...>]
+ * [--allprograms|--programid id] [--alldevices|<device>...]
* list [--allprograms|--programid id] [--allregions|--regionid id]
* print [--clear] [--allprograms|--programid id]
* [--allregions|--regionid id]
- * [--alldevices|<device...>]
+ * [--alldevices|<device>...]
* report [--interval <seconds>] [--count <cnt>]
* [--units <u>] [--programid <id>] [--regionid <id>]
* [-o <fields>] [-O|--sort <sort_fields>]
* [-S|--select <selection>] [--nameprefixes]
* [--noheadings] [--separator <separator>]
- * [--allprograms|--programid id] [<device...>]
+ * [--allprograms|--programid id] [<device>...]
* ungroup --groupid <id> [--allprograms|--programid id]
- * [--alldevices|<device...>]
+ * [--alldevices|<device>...]
*/
#define INDENT "\n\t "
@@ -5766,7 +5766,7 @@ static int _stats_help(CMD_ARGS);
#define EXTRA_OPTS HIST_OPTS PRECISE_OPTS
#define ALL_PROGS_OPT "[--allprograms|--programid id] "
#define ALL_REGIONS_OPT "[--allregions|--regionid id] "
-#define ALL_DEVICES_OPT "[--alldevices|<device...>] "
+#define ALL_DEVICES_OPT "[--alldevices|<device>...] "
#define ALL_PROGS_REGIONS_DEVICES ALL_PROGS_OPT INDENT ALL_REGIONS_OPT INDENT ALL_DEVICES_OPT
#define FIELD_OPTS "[-o <fields>] [-O|--sort <sort_fields>]"
#define DM_REPORT_OPTS FIELD_OPTS INDENT "[-S|--select <selection>] [--nameprefixes]" INDENT \
@@ -5795,7 +5795,7 @@ static struct command _stats_subcommands[] = {
{"group", GROUP_OPTS, 1, -1, 1, 0, _stats_group},
{"list", ALL_PROGS_OPT ALL_REGIONS_OPT, 0, -1, 1, 0, _stats_report},
{"print", PRINT_OPTS, 0, -1, 1, 0, _stats_print},
- {"report", REPORT_OPTS "[<device...>]", 0, -1, 1, 0, _stats_report},
+ {"report", REPORT_OPTS "[<device>...]", 0, -1, 1, 0, _stats_report},
{"ungroup", "--groupid <id> " UNGROUP_OPTS, 1, -1, 1, 0, _stats_ungroup},
{"update_filemap", "--groupid <id> <file_path>", 1, 1, 0, 0, _stats_update_file},
{"version", "", 0, -1, 1, 0, _version},
@@ -5832,27 +5832,27 @@ static struct command _dmsetup_commands[] = {
"\t [-u|uuid <uuid>] [--addnodeonresume|--addnodeoncreate]\n"
"\t [--readahead {[+]<sectors>|auto|none}]\n"
"\t [-n|--notable|--table {<table>|<table_file>}]", 1, 2, 0, 0, _create},
- {"remove", "[--deferred] [-f|--force] [--retry] <device>", 0, -1, 1, 0, _remove},
+ {"remove", "[--deferred] [-f|--force] [--retry] <device>...", 0, -1, 1, 0, _remove},
{"remove_all", "[-f|--force]", 0, 0, 0, 0, _remove_all},
- {"suspend", "[--noflush] [--nolockfs] <device>", 0, -1, 1, 0, _suspend},
- {"resume", "[--noflush] [--nolockfs] <device>\n"
+ {"suspend", "[--noflush] [--nolockfs] <device>...", 0, -1, 1, 0, _suspend},
+ {"resume", "[--noflush] [--nolockfs] <device>...\n"
"\t [--addnodeonresume|--addnodeoncreate]\n"
"\t [--readahead {[+]<sectors>|auto|none}]", 0, -1, 1, 0, _resume},
{"load", "<device> [<table>|<table_file>]", 0, 2, 0, 0, _load},
{"clear", "<device>", 0, -1, 1, 0, _clear},
{"reload", "<device> [<table>|<table_file>]", 0, 2, 0, 0, _load},
- {"wipe_table", "[-f|--force] [--noflush] [--nolockfs] <device>", 1, -1, 1, 0, _error_device},
+ {"wipe_table", "[-f|--force] [--noflush] [--nolockfs] <device>...", 1, -1, 1, 0, _error_device},
{"rename", "<device> [--setuuid] <new_name_or_uuid>", 1, 2, 0, 0, _rename},
{"message", "<device> <sector> <message>", 2, -1, 0, 0, _message},
{"ls", "[--target <target_type>] [--exec <command>] [-o <options>] [--tree]", 0, 0, 0, 0, _ls},
- {"info", "[<device>]", 0, -1, 1, 0, _info},
- {"deps", "[-o <options>] [<device>]", 0, -1, 1, 0, _deps},
- {"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
- {"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
- {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status},
+ {"info", "[<device>...]", 0, -1, 1, 0, _info},
+ {"deps", "[-o <options>] [<device>...]", 0, -1, 1, 0, _deps},
+ {"stats", "<command> [<options>] [<device>...]", 1, -1, 1, 1, _stats},
+ {"status", "[<device>...] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
+ {"table", "[<device>...] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status},
{"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait},
- {"mknodes", "[<device>]", 0, -1, 1, 0, _mknodes},
- {"mangle", "[<device>]", 0, -1, 1, 0, _mangle},
+ {"mknodes", "[<device>...]", 0, -1, 1, 0, _mknodes},
+ {"mangle", "[<device>...]", 0, -1, 1, 0, _mangle},
{"udevcreatecookie", "", 0, 0, 0, 0, _udevcreatecookie},
{"udevreleasecookie", "[<cookie>]", 0, 1, 0, 0, _udevreleasecookie},
{"udevflags", "<cookie>", 1, 1, 0, 0, _udevflags},
@@ -5894,8 +5894,7 @@ static void _stats_usage(FILE *out)
for (i = 0; _stats_subcommands[i].name; i++)
fprintf(out, "\t%s %s\n", _stats_subcommands[i].name, _stats_subcommands[i].help);
- fprintf(out, "\n<device> may be device name or -u <uuid> or "
- "-j <major> -m <minor>\n");
+ fprintf(out, "\n<device> may be device name or (if only one) -u <uuid> or -j <major> -m <minor>\n");
fprintf(out, "<fields> are comma-separated. Use 'help -c' for list.\n");
fprintf(out, "\n");
}
@@ -5920,7 +5919,7 @@ static void _dmsetup_usage(FILE *out)
for (i = 0; _dmsetup_commands[i].name; i++)
fprintf(out, "\t%s %s\n", _dmsetup_commands[i].name, _dmsetup_commands[i].help);
- fprintf(out, "\n<device> may be device name or -u <uuid> or "
+ fprintf(out, "\n<device> may be device name or (if only one) -u <uuid> or "
"-j <major> -m <minor>\n");
fprintf(out, "<mangling_mode> is one of 'none', 'auto' and 'hex'.\n");
fprintf(out, "<fields> are comma-separated. Use 'help -c' for list.\n");
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1c1ce2739ed40d02…
Commit: 1c1ce2739ed40d02ae2d41cb9e9de54d0948967c
Parent: 2a65e2d49e9056bfe291f291c70f1ba9ec72e2e7
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Feb 21 09:40:21 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 21 09:40:21 2017 +0100
tests: some debug code
Checking if --deferred would make it any faster - but it's as slow
as without this new optional flag anyway (4.10).
---
test/lib/aux.sh | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 10f6f92..5108a52 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -406,8 +406,11 @@ teardown_devs_prefixed() {
# Remove devices, start with closed (sorted by open count)
# Run 'dmsetup remove' in parallel
- rm -f REMOVE_FAILED
local need_udev_wait=0
+ rm -f REMOVE_FAILED
+ #local listdevs=( $(dm_info name,open --sort open,name | grep "$prefix.*:0") )
+ #dmsetup remove --deferred ${listdevs[@]%%:0} || touch REMOVE_FAILED
+
init_udev_transaction
for dm in $(dm_info name --sort open,name | grep "$prefix"); do
dmsetup remove "$dm" &>/dev/null || touch REMOVE_FAILED &
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2a65e2d49e9056bf…
Commit: 2a65e2d49e9056bfe291f291c70f1ba9ec72e2e7
Parent: 7c14004f69f18aeb6fbb022f0ef81f109177022c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Feb 21 09:38:49 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 21 09:38:49 2017 +0100
tests: ensure first call is version test
Check 'dmsetup version' is called before starting any more
advanced logic in $DM_DEV_DIR.
Call also replaces mkdir as it creates needed path with control node.
---
test/lib/inittest.sh | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/test/lib/inittest.sh b/test/lib/inittest.sh
index dcc1304..b75eddc 100644
--- a/test/lib/inittest.sh
+++ b/test/lib/inittest.sh
@@ -77,6 +77,11 @@ find "$TESTOLDPWD/lib" ! \( -name '*.sh' -o -name '*.[cdo]' \
DM_DEFAULT_NAME_MANGLING_MODE=none
DM_DEV_DIR="$TESTDIR/dev"
LVM_SYSTEM_DIR="$TESTDIR/etc"
+# abort on the internal dm errors in the tests (allowing test user override)
+DM_ABORT_ON_INTERNAL_ERRORS=${DM_ABORT_ON_INTERNAL_ERRORS:-1}
+
+export DM_DEFAULT_NAME_MANGLING_MODE DM_DEV_DIR LVM_SYSTEM_DIR DM_ABORT_ON_INTERNAL_ERRORS
+
mkdir "$LVM_SYSTEM_DIR" "$DM_DEV_DIR"
if test -n "$LVM_TEST_DEVDIR" ; then
test -d "$LVM_TEST_DEVDIR" || die "Test device directory LVM_TEST_DEVDIR=\"$LVM_TEST_DEVDIR\" is not valid."
@@ -85,14 +90,11 @@ else
mknod "$DM_DEV_DIR/testnull" c 1 3 || die "mknod failed"
echo >"$DM_DEV_DIR/testnull" || \
die "Filesystem does support devices in $DM_DEV_DIR (mounted with nodev?)"
- mkdir "$DM_DEV_DIR/mapper"
+ # dmsetup makes here needed control entry if still missing
+ dmsetup version || \
+ die "Dmsetup in $DM_DEV_DIR can't report version?"
fi
-# abort on the internal dm errors in the tests (allowing test user override)
-DM_ABORT_ON_INTERNAL_ERRORS=${DM_ABORT_ON_INTERNAL_ERRORS:-1}
-
-export DM_DEFAULT_NAME_MANGLING_MODE DM_DEV_DIR LVM_SYSTEM_DIR DM_ABORT_ON_INTERNAL_ERRORS
-
echo "$TESTNAME" >TESTNAME
echo "Kernel is $(uname -a)"
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7c14004f69f18aeb…
Commit: 7c14004f69f18aeb6fbb022f0ef81f109177022c
Parent: d409fec079d27c349b4e570a619bd860ce4fde7e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Feb 21 09:38:04 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 21 09:38:04 2017 +0100
tests: make sure which PV is used for allocation
---
test/shell/lvm1-basic.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/shell/lvm1-basic.sh b/test/shell/lvm1-basic.sh
index 8884bc1..166d5bf 100644
--- a/test/shell/lvm1-basic.sh
+++ b/test/shell/lvm1-basic.sh
@@ -28,7 +28,7 @@ grep "$dev1" out
# check for RHBZ 1080189 -- SEGV in lvremove/vgremove
pvcreate -ff -y --metadatatype 1 "$dev1" "$dev2"
vgcreate --metadatatype 1 $vg1 "$dev1" "$dev2"
-lvcreate -l1 $vg1
+lvcreate -l1 $vg1 "$dev1"
pvremove -ff -y "$dev2"
vgchange -an $vg1
not lvremove $vg1
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d409fec079d27c34…
Commit: d409fec079d27c349b4e570a619bd860ce4fde7e
Parent: 921d5972e8bfa778f7389c4abdaa8691ce432c70
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Feb 21 00:49:49 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 21 00:52:05 2017 +0100
tests: paralelize creation and teardown
To speedup initial construction and destruction of test devices
(mainly in case more then 1 is needed) call dmsetup
in parallel.
---
test/lib/aux.sh | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 7c3daa5..10f6f92 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -405,23 +405,25 @@ teardown_devs_prefixed() {
fi
# Remove devices, start with closed (sorted by open count)
- local remfail=no
+ # Run 'dmsetup remove' in parallel
+ rm -f REMOVE_FAILED
local need_udev_wait=0
init_udev_transaction
- for dm in $(dm_info name --sort open | grep "$prefix"); do
- dmsetup remove "$dm" &>/dev/null || remfail=yes
+ for dm in $(dm_info name --sort open,name | grep "$prefix"); do
+ dmsetup remove "$dm" &>/dev/null || touch REMOVE_FAILED &
need_udev_wait=1
done
+ wait
finish_udev_transaction
test $need_udev_wait -eq 0 || udev_wait
- if test $remfail = yes; then
+ if test -f REMOVE_FAILED; then
local num_devs
local num_remaining_devs=999
while num_devs=$(dm_table | grep "$prefix" | wc -l) && \
test $num_devs -lt $num_remaining_devs -a $num_devs -ne 0; do
test "$stray" -eq 0 || echo "Removing $num_devs stray mapped devices with names beginning with $prefix: "
- # HACK: sort also by minors - so we try to close 'possibly later' created device first
+ # HACK: sort also by minors - so we try to close 'possibly later' created device first
for dm in $(dm_info name --sort open,-minor | grep "$prefix") ; do
dmsetup remove -f "$dm" || true
done
@@ -794,6 +796,7 @@ prepare_devs() {
local size=$(($devsize*2048)) # sectors
local count=0
+ rm -f CREATE_FAILED
init_udev_transaction
for i in $(seq 1 $n); do
local name="${PREFIX}$pvname$i"
@@ -801,17 +804,19 @@ prepare_devs() {
DEVICES[$count]=$dev
count=$(( $count + 1 ))
echo 0 $size linear "$BACKING_DEV" $((($i-1)*$size + $shift)) > "$name.table"
- if not dmsetup create -u "TEST-$name" "$name" "$name.table" &&
- test -n "$LVM_TEST_BACKING_DEVICE";
- then # maybe the backing device is too small for this test
- LVM_TEST_BACKING_DEVICE=
- rm -f BACKING_DEV
- prepare_devs "$@"
- return $?
- fi
+ dmsetup create -u "TEST-$name" "$name" "$name.table" || touch CREATE_FAILED &
+ test -f CREATE_FAILED && break;
done
+ wait
finish_udev_transaction
+ if test -f CREATE_FAILED -a -n "$LVM_TEST_BACKING_DEVICE"; then
+ LVM_TEST_BACKING_DEVICE=
+ rm -f BACKING_DEV CREATE_FAILED
+ prepare_devs "$@"
+ return $?
+ fi
+
# non-ephemeral devices need to be cleared between tests
test -f LOOP || for d in ${DEVICES[@]}; do
blkdiscard "$d" 2>/dev/null || true
@@ -833,9 +838,11 @@ prepare_devs() {
# ( IFS=$'\n'; echo "${DEVICES[*]}" ) >DEVICES
echo "ok"
- for dev in "${DEVICES[@]}"; do
- notify_lvmetad "$dev"
- done
+ if test -e LOCAL_LVMETAD; then
+ for dev in "${DEVICES[@]}"; do
+ notify_lvmetad "$dev"
+ done
+ fi
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=921d5972e8bfa778…
Commit: 921d5972e8bfa778f7389c4abdaa8691ce432c70
Parent: 86a660be7b31809500488792a93670a703e12a27
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Feb 20 23:50:27 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 21 00:52:05 2017 +0100
tests: use exclusive activation for mirror
Test suite does not support clustered mirroring.
---
test/shell/lvresize-usage.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/test/shell/lvresize-usage.sh b/test/shell/lvresize-usage.sh
index 35f6e57..30cb8d5 100644
--- a/test/shell/lvresize-usage.sh
+++ b/test/shell/lvresize-usage.sh
@@ -42,7 +42,7 @@ not lvreduce -L 32M $vg/lv
lvremove -ff $vg
-lvcreate --type mirror -L 4 -n $lv1 $vg
+lvcreate --type mirror -aey -L 4 -n $lv1 $vg
# Incorrent name for resized LV
not lvextend --type mirror -L 10 -n $lv1 $vg
# Same size
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=86a660be7b318095…
Commit: 86a660be7b31809500488792a93670a703e12a27
Parent: e13639053b0d413624fb10baab535fde2c2c5bd5
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 20 17:10:11 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 20 17:10:11 2017 -0600
man: use .HP instead of .TP
---
tools/command.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index b1fdc1b..fe8c1f6 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -2498,7 +2498,7 @@ void print_man_all_options_desc(struct command_name *cname)
if (!cname->all_options[opt_enum])
continue;
- printf("\n.TP\n");
+ printf("\n.HP\n");
if (opt_names[opt_enum].short_opt) {
printf("\\fB-%c\\fP|\\fB%s\\fP",
@@ -2591,7 +2591,7 @@ void print_man_all_positions_desc(struct command_name *cname)
}
if (has_vg_val) {
- printf("\n.TP\n");
+ printf("\n.HP\n");
printf("\\fI%s\\fP", val_names[vg_VAL].name);
printf("\n");
@@ -2605,7 +2605,7 @@ void print_man_all_positions_desc(struct command_name *cname)
}
if (has_lv_val) {
- printf("\n.TP\n");
+ printf("\n.HP\n");
printf("\\fI%s\\fP", val_names[lv_VAL].name);
printf("\n");
@@ -2619,7 +2619,7 @@ void print_man_all_positions_desc(struct command_name *cname)
}
if (has_pv_val) {
- printf("\n.TP\n");
+ printf("\n.HP\n");
printf("\\fI%s\\fP", val_names[pv_VAL].name);
printf("\n");
@@ -2632,7 +2632,7 @@ void print_man_all_positions_desc(struct command_name *cname)
}
if (has_tag_val) {
- printf("\n.TP\n");
+ printf("\n.HP\n");
printf("\\fI%s\\fP", val_names[tag_VAL].name);
printf("\n");
@@ -2642,7 +2642,7 @@ void print_man_all_positions_desc(struct command_name *cname)
}
if (has_select_val) {
- printf("\n.TP\n");
+ printf("\n.HP\n");
printf("\\fI%s\\fP", val_names[select_VAL].name);
printf("\n");
@@ -2654,7 +2654,7 @@ void print_man_all_positions_desc(struct command_name *cname)
/* Every command uses a string arg somewhere. */
- printf("\n.TP\n");
+ printf("\n.HP\n");
printf("\\fI%s\\fP", val_names[string_VAL].name);
printf("\n");
printf(".br\n");
@@ -2662,7 +2662,7 @@ void print_man_all_positions_desc(struct command_name *cname)
/* Nearly every command uses a number arg somewhere. */
- printf("\n.TP\n");
+ printf("\n.HP\n");
printf("\\fINumber\\fP, \\fISize\\fP");
printf("\n");
printf(".br\n");
@@ -2671,7 +2671,7 @@ void print_man_all_positions_desc(struct command_name *cname)
"The default input unit is specified by letter, followed by |unit which\n"
"represents other possible input units: bBsSkKmMgGtTpPeE.\n");
- printf("\n.TP\n");
+ printf("\n.HP\n");
printf("Environment");
printf("\n");
printf(".br\n");
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e13639053b0d4136…
Commit: e13639053b0d413624fb10baab535fde2c2c5bd5
Parent: d22cccdf631576d4fd0504ffd17812d778f9d37b
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 20 15:41:24 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 20 15:41:24 2017 -0600
man/help: print general raid type as "raid"
Instead of printing "raid*". There are already
notes mentioning that "raid" refers to "raid<N>"
---
tools/vals.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/vals.h b/tools/vals.h
index 88c446e..4dc3a61 100644
--- a/tools/vals.h
+++ b/tools/vals.h
@@ -123,7 +123,7 @@ val(numsignedper_VAL, int_arg_with_sign_and_percent, "SNumberP", "[+|-]Number[%V
val(permission_VAL, permission_arg, "Permission", "rw|r")
val(metadatatype_VAL, metadatatype_arg, "MetadataType", "lvm2|lvm1")
val(units_VAL, string_arg, "Units", "r|R|h|H|b|B|s|S|k|K|m|M|g|G|t|T|p|P|e|E")
-val(segtype_VAL, segtype_arg, "SegType", "linear|striped|snapshot|mirror|raid*|thin|cache|thin-pool|cache-pool")
+val(segtype_VAL, segtype_arg, "SegType", "linear|striped|snapshot|mirror|raid|thin|cache|thin-pool|cache-pool")
val(alloc_VAL, alloc_arg, "Alloc", "contiguous|cling|cling_by_tags|normal|anywhere|inherit")
val(locktype_VAL, locktype_arg, "LockType", "sanlock|dlm|none")
val(readahead_VAL, readahead_arg, "Readahead", "auto|none|NumberSectors")
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d22cccdf631576d4…
Commit: d22cccdf631576d4fd0504ffd17812d778f9d37b
Parent: a2d2cd8777ea0f387383743ba2739007ef1b3baf
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 20 15:26:24 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 20 15:36:30 2017 -0600
man vgchange/lvchange: note special option usage
---
tools/command-lines.in | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 092f941..606d2e7 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -250,7 +250,9 @@ OO_LVCHANGE_META: --addtag Tag, --deltag Tag,
lvchange OO_LVCHANGE_META VG|LV|Tag|Select ...
OO: --activate Active, OO_LVCHANGE
ID: lvchange_properties
-DESC: Change a general LV property.
+DESC: Change a general LV attribute.
+DESC: For options listed in parentheses, any one is
+DESC: required, after which the others are optional.
RULE: all not lv_is_pvmove lv_is_mirror_log lv_is_mirror_image
RULE: all and lv_is_vg_writable
RULE: --contiguous not --alloc
@@ -1408,7 +1410,9 @@ vgchange OO_VGCHANGE_META
OO: OO_VGCHANGE
OP: VG|Tag|Select ...
ID: vgchange_properties
-DESC: Change a general VG property.
+DESC: Change a general VG attribute.
+DESC: For options listed in parentheses, any one is
+DESC: required, after which the others are optional.
vgchange --monitor Bool
OO: --sysinit, --ignorelockingfailure, --poll Bool, OO_VGCHANGE
1
0
20 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a2d2cd8777ea0f38…
Commit: a2d2cd8777ea0f387383743ba2739007ef1b3baf
Parent: 2396c506890e62da5d13c4f3bcd1f715272ab382
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 20 15:17:10 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 20 15:36:30 2017 -0600
man lvcreate: add special option notes at the start
The --name, --size, --extents options deserve a special
note at the start of the man page, before appearing in
the usage section.
---
man/lvcreate.8.des | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/man/lvcreate.8.des b/man/lvcreate.8.des
index e18affe..488dab4 100644
--- a/man/lvcreate.8.des
+++ b/man/lvcreate.8.des
@@ -26,3 +26,14 @@ virtual size rather than a physical size. A cache LV is the combination of
a standard LV with a cache pool, used to cache active portions of the LV
to improve performance.
+.SS Usage notes
+
+In the usage section below, \fB--size\fP \fINumber\fP can be replaced
+in each case with \fB--extents\fP \fINumberExtents\fP. Also see both
+descriptions the options section.
+
+In the usage section below, \fB--name\fP is omitted from the required
+options, even though it is typically used. When the name is not
+specified, a new LV name is generated with the "lvol" prefix and a unique
+numeric suffix. Also see the description in the options section.
+
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2396c506890e62da…
Commit: 2396c506890e62da5d13c4f3bcd1f715272ab382
Parent: 4d29d9afb21a4571b45fe18d16cc4b57cd7ec187
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 20 15:09:02 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 20 15:36:10 2017 -0600
man: add variables descriptions
Add a section describing variables.
In the full options list, include common
options in the alphabetical listing instead
of at the end.
---
tools/command.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 152 insertions(+), 20 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 06dcc77..b1fdc1b 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -2484,35 +2484,20 @@ void print_man_all_options_list(struct command_name *cname)
/*
* All options used for a given command name, along with descriptions.
* listed in order of:
- * 1. options that are not common to all lvm commands, alphabetically
- * 2. options common to all lvm commands, alphabetically
*/
void print_man_all_options_desc(struct command_name *cname)
{
int opt_enum, val_enum;
- int print_common = 0;
int sep = 0;
int i;
- again:
- /*
- * Loop 1: print options that are not common to all lvm commands.
- * Loop 2: print options common to all lvm commands (lvm_all)
- */
-
for (i = 0; i < ARG_COUNT; i++) {
opt_enum = opt_names_alpha[i]->opt_enum;
if (!cname->all_options[opt_enum])
continue;
- if (!print_common && is_lvm_all_opt(opt_enum))
- continue;
-
- if (print_common && !is_lvm_all_opt(opt_enum))
- continue;
-
printf("\n.TP\n");
if (opt_names[opt_enum].short_opt) {
@@ -2545,11 +2530,153 @@ void print_man_all_options_desc(struct command_name *cname)
sep = 1;
}
+}
- if (!print_common) {
- print_common = 1;
- goto again;
+void print_man_all_positions_desc(struct command_name *cname)
+{
+ struct command *cmd;
+ int ci, rp, op;
+ int has_vg_val = 0;
+ int has_lv_val = 0;
+ int has_pv_val = 0;
+ int has_tag_val = 0;
+ int has_select_val = 0;
+ int has_lv_type = 0;
+
+ for (ci = 0; ci < COMMAND_COUNT; ci++) {
+ cmd = &commands[ci];
+
+ if (strcmp(cmd->name, cname->name))
+ continue;
+
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits & val_enum_to_bit(vg_VAL))
+ has_vg_val = 1;
+
+ if (cmd->required_pos_args[rp].def.val_bits & val_enum_to_bit(lv_VAL)) {
+ has_lv_val = 1;
+ if (cmd->required_pos_args[rp].def.lvt_bits)
+ has_lv_type = 1;
+ }
+
+ if (cmd->required_pos_args[rp].def.val_bits & val_enum_to_bit(pv_VAL))
+ has_pv_val = 1;
+
+ if (cmd->required_pos_args[rp].def.val_bits & val_enum_to_bit(tag_VAL))
+ has_tag_val = 1;
+
+ if (cmd->required_pos_args[rp].def.val_bits & val_enum_to_bit(select_VAL))
+ has_select_val = 1;
+ }
+
+ for (op = 0; op < cmd->op_count; op++) {
+ if (cmd->optional_pos_args[op].def.val_bits & val_enum_to_bit(vg_VAL))
+ has_vg_val = 1;
+
+ if (cmd->optional_pos_args[op].def.val_bits & val_enum_to_bit(lv_VAL)) {
+ has_lv_val = 1;
+ if (cmd->optional_pos_args[op].def.lvt_bits)
+ has_lv_type = 1;
+ }
+
+ if (cmd->optional_pos_args[op].def.val_bits & val_enum_to_bit(pv_VAL))
+ has_pv_val = 1;
+
+ if (cmd->optional_pos_args[op].def.val_bits & val_enum_to_bit(tag_VAL))
+ has_tag_val = 1;
+
+ if (cmd->optional_pos_args[op].def.val_bits & val_enum_to_bit(select_VAL))
+ has_select_val = 1;
+ }
+ }
+
+ if (has_vg_val) {
+ printf("\n.TP\n");
+
+ printf("\\fI%s\\fP", val_names[vg_VAL].name);
+ printf("\n");
+ printf(".br\n");
+ printf("Volume Group name. See \\fBlvm\\fP(8) for valid names.\n");
+
+ if (!strcmp(cname->name, "lvcreate"))
+ printf("For lvcreate, the required VG positional arg may be\n"
+ "omitted when the VG name is included in another option,\n"
+ "e.g. --name VG/LV.\n");
}
+
+ if (has_lv_val) {
+ printf("\n.TP\n");
+
+ printf("\\fI%s\\fP", val_names[lv_VAL].name);
+ printf("\n");
+ printf(".br\n");
+ printf("Logical Volume name. See \\fBlvm\\fP(8) for valid names.\n"
+ "An LV positional arg generally includes the VG name and LV name, e.g. VG/LV.\n");
+
+ if (has_lv_type)
+ printf("LV followed by _<type> indicates that an LV of the\n"
+ "given type is required. (raid represents raid<N> type)\n");
+ }
+
+ if (has_pv_val) {
+ printf("\n.TP\n");
+
+ printf("\\fI%s\\fP", val_names[pv_VAL].name);
+ printf("\n");
+ printf(".br\n");
+ printf("Physical Volume name, a device path under /dev.\n"
+ "For commands managing physical extents, a PV positional arg\n"
+ "generally accepts a suffix indicating a range of physical extents.\n"
+ "Start and end range (inclusive): \\fIPV\\fP[:\\fIPE\\fP[-\\fIPE\\fP].\n"
+ "Start and length range (counting from 0): \\fIPV\\fP[:\\fIPE\\fP[+\\fIPE\\fP].\n");
+ }
+
+ if (has_tag_val) {
+ printf("\n.TP\n");
+
+ printf("\\fI%s\\fP", val_names[tag_VAL].name);
+ printf("\n");
+ printf(".br\n");
+ printf("Tag name. See \\fBlvm\\fP(8) for information about tag names and using tags\n"
+ "in place of a VG, LV or PV.\n");
+ }
+
+ if (has_select_val) {
+ printf("\n.TP\n");
+
+ printf("\\fI%s\\fP", val_names[select_VAL].name);
+ printf("\n");
+ printf(".br\n");
+ printf("Select indicates that a required positional parameter can\n"
+ "be omitted if the \\fB--select\\fP option is used.\n"
+ "No arg appears in this position.\n");
+ }
+
+ /* Every command uses a string arg somewhere. */
+
+ printf("\n.TP\n");
+ printf("\\fI%s\\fP", val_names[string_VAL].name);
+ printf("\n");
+ printf(".br\n");
+ printf("See the option description for information about the string content.\n");
+
+ /* Nearly every command uses a number arg somewhere. */
+
+ printf("\n.TP\n");
+ printf("\\fINumber\\fP, \\fISize\\fP");
+ printf("\n");
+ printf(".br\n");
+ printf("Input units are always treated as base two values, regardless of unit\n"
+ "capitalization, e.g. 'k' and 'K' both refer to 1024.\n"
+ "The default input unit is specified by letter, followed by |unit which\n"
+ "represents other possible input units: bBsSkKmMgGtTpPeE.\n");
+
+ printf("\n.TP\n");
+ printf("Environment");
+ printf("\n");
+ printf(".br\n");
+ printf("See \\fBlvm\\fP(8) for information about environment variables used by lvm.\n"
+ "For example, LVM_VG_NAME can generally be substituted for a required VG parameter.\n");
}
void print_desc_man(const char *desc)
@@ -2641,7 +2768,7 @@ void print_man(char *name, char *des_file, int include_primary, int include_seco
cname = find_command_name(name);
- printf(".TH %s 8 \"LVM TOOLS #VERSION#\" \"Sistina Software UK\"\n",
+ printf(".TH %s 8 \"LVM TOOLS #VERSION#\" \"Red Hat, Inc.\"\n",
upper_command_name(lvmname));
for (i = 0; i < COMMAND_COUNT; i++) {
@@ -2657,6 +2784,9 @@ void print_man(char *name, char *des_file, int include_primary, int include_seco
printf(".SH OPTIONS\n");
printf(".br\n");
print_man_all_options_desc(cname);
+ printf(".SH VARIABLES\n");
+ printf(".br\n");
+ print_man_all_positions_desc(cname);
prev_cmd = NULL;
}
@@ -2752,7 +2882,9 @@ void print_man(char *name, char *des_file, int include_primary, int include_seco
printf(".SH OPTIONS\n");
printf(".br\n");
print_man_all_options_desc(cname);
-
+ printf(".SH VARIABLES\n");
+ printf(".br\n");
+ print_man_all_positions_desc(cname);
}
printf("\n");
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4d29d9afb21a4571…
Commit: 4d29d9afb21a4571b45fe18d16cc4b57cd7ec187
Parent: 5f2639d01d8e1ac6e95ad7855abb93b5cd260a22
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 20 11:23:46 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 20 11:23:46 2017 -0600
lvresize/lvextend: accept type option
The --type option has previously been accepted for
lvresize/lvextend. Using it did not affect the operation
of the command. The value was simply verified as matching
the current seg type of the LV.
---
tools/command-lines.in | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index aed38e7..092f941 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -1126,12 +1126,17 @@ ID: lvdisplay_general
---
+# --type is an option in lvextend/lvresize only so that the specified type
+# value can be checked to match the existing type; using it doesn't
+# currently enable any different behavior.
+
# --extents is not specified; it's an automatic alternative for --size
lvextend --size SizeMB LV
OO: --alloc Alloc, --autobackup Bool, --force, --mirrors SNumber,
--nofsck, --nosync, --noudevsync, --reportformat ReportFmt, --resizefs,
---stripes Number, --stripesize SizeKB, --poolmetadatasize SizeMB
+--stripes Number, --stripesize SizeKB, --poolmetadatasize SizeMB,
+--type SegType
OP: PV ...
ID: lvextend_by_size
DESC: Extend an LV by a specified size.
@@ -1139,7 +1144,8 @@ DESC: Extend an LV by a specified size.
lvextend LV PV ...
OO: --alloc Alloc, --autobackup Bool, --force, --mirrors SNumber,
--nofsck, --nosync, --noudevsync,
---reportformat ReportFmt, --resizefs, --stripes Number, --stripesize SizeKB
+--reportformat ReportFmt, --resizefs, --stripes Number, --stripesize SizeKB,
+--type SegType
ID: lvextend_by_pv
DESC: Extend an LV by specified PV extents.
FLAGS: SECONDARY_SYNTAX
@@ -1147,7 +1153,8 @@ FLAGS: SECONDARY_SYNTAX
lvextend --poolmetadatasize SizeMB LV_thinpool
OO: --alloc Alloc, --autobackup Bool, --force, --mirrors SNumber,
--nofsck, --nosync, --noudevsync,
---reportformat ReportFmt, --stripes Number, --stripesize SizeKB
+--reportformat ReportFmt, --stripes Number, --stripesize SizeKB,
+--type SegType
OP: PV ...
ID: lvextend_pool_metadata_by_size
DESC: Extend a pool metadata SubLV by a specified size.
@@ -1155,7 +1162,8 @@ DESC: Extend a pool metadata SubLV by a specified size.
lvextend --usepolicies LV_thinpool_snapshot
OO: --alloc Alloc, --autobackup Bool, --force, --mirrors SNumber,
--nofsck, --nosync, --noudevsync,
---reportformat ReportFmt, --resizefs
+--reportformat ReportFmt, --resizefs,
+--type SegType
OP: PV ...
ID: lvextend_by_policy
DESC: Extend an LV according to a predefined policy.
@@ -1193,10 +1201,15 @@ ID: lvrename_lv_lv
---
+# --type is an option in lvextend/lvresize only so that the specified type
+# value can be checked to match the existing type; using it doesn't
+# currently enable any different behavior.
+
lvresize --size SizeMB LV
OO: --alloc Alloc, --autobackup Bool, --force,
--nofsck, --nosync, --noudevsync, --reportformat ReportFmt, --resizefs,
---stripes Number, --stripesize SizeKB, --poolmetadatasize SizeMB
+--stripes Number, --stripesize SizeKB, --poolmetadatasize SizeMB,
+--type SegType
OP: PV ...
ID: lvresize_by_size
DESC: Resize an LV by a specified size.
@@ -1204,7 +1217,8 @@ DESC: Resize an LV by a specified size.
lvresize LV PV ...
OO: --alloc Alloc, --autobackup Bool, --force,
--nofsck, --nosync, --noudevsync,
---reportformat ReportFmt, --resizefs, --stripes Number, --stripesize SizeKB
+--reportformat ReportFmt, --resizefs, --stripes Number, --stripesize SizeKB,
+--type SegType
ID: lvresize_by_pv
DESC: Resize an LV by specified PV extents.
FLAGS: SECONDARY_SYNTAX
@@ -1212,7 +1226,8 @@ FLAGS: SECONDARY_SYNTAX
lvresize --poolmetadatasize SizeMB LV_thinpool
OO: --alloc Alloc, --autobackup Bool, --force,
--nofsck, --nosync, --noudevsync,
---reportformat ReportFmt, --stripes Number, --stripesize SizeKB
+--reportformat ReportFmt, --stripes Number, --stripesize SizeKB,
+--type SegType
OP: PV ...
ID: lvresize_pool_metadata_by_size
DESC: Resize a pool metadata SubLV by a specified size.
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5f2639d01d8e1ac6…
Commit: 5f2639d01d8e1ac6e95ad7855abb93b5cd260a22
Parent: 13dd1ca757ab861bcd8f761f60e3c17384ae6326
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 19 22:59:21 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 20 00:44:12 2017 +0100
tests: update lvresize testing
Add missing tests for some lvresize acceptable options.
---
test/shell/lvresize-usage.sh | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/test/shell/lvresize-usage.sh b/test/shell/lvresize-usage.sh
index a136147..35f6e57 100644
--- a/test/shell/lvresize-usage.sh
+++ b/test/shell/lvresize-usage.sh
@@ -34,9 +34,26 @@ lvremove -ff $vg
lvcreate -L 10M -n lv $vg "$dev1"
lvextend -L +10M $vg/lv "$dev2"
+lvextend --type striped -m0 -L +10M $vg/lv "$dev2"
# Attempt to reduce with lvextend and vice versa:
not lvextend -L 16M $vg/lv
not lvreduce -L 32M $vg/lv
lvremove -ff $vg
+
+lvcreate --type mirror -L 4 -n $lv1 $vg
+# Incorrent name for resized LV
+not lvextend --type mirror -L 10 -n $lv1 $vg
+# Same size
+not lvextend --type mirror -L 4 $vg/$lv1
+# Cannot use any '-' or '+' sign for --mirror arg
+not lvextend --type mirror -L+2 -m-1 $vg/$lv1
+not lvextend --type mirror -L+2 -m+1 $vg/$lv1
+
+lvextend --type mirror -L+4 -m1 $vg/$lv1
+
+lvs -a $vg
+check lv_field $vg/$lv1 size "8.00m"
+
+lvremove -ff $vg
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=13dd1ca757ab861b…
Commit: 13dd1ca757ab861bcd8f761f60e3c17384ae6326
Parent: 2260c6d1e6c9b6332bf24e4237258e92543ce37f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 18 19:46:22 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 20 00:43:40 2017 +0100
cleanup: simplier code
Already know string is 'lvm-' so use name[3].
---
tools/command.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index f99d025..06dcc77 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -2635,8 +2635,7 @@ void print_man(char *name, char *des_file, int include_primary, int include_seco
int i;
if (!strncmp(name, "lvm-", 4)) {
- char *space = strchr(lvmname, '-');
- *space = ' ';
+ name[3] = ' ';
name += 4;
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2260c6d1e6c9b633…
Commit: 2260c6d1e6c9b6332bf24e4237258e92543ce37f
Parent: d8514b24e115f4c45fb7b6263f553a30e776a3da
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 18 19:45:17 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 20 00:43:40 2017 +0100
cleanup: same sign for compare
---
tools/command.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index f46fb3d..f99d025 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -912,8 +912,6 @@ static void update_prev_opt_arg(struct command *cmd, char *str, int required)
cmd->optional_opt_args[cmd->oo_count-1].def = def;
else if (required < 0)
cmd->ignore_opt_args[cmd->io_count-1].def = def;
- else
- return;
}
/*
@@ -1529,7 +1527,7 @@ static void _print_usage_description(struct command *cmd)
{
const char *desc = cmd->desc;
char buf[MAX_LINE] = {0};
- int di = 0;
+ unsigned di = 0;
int bi = 0;
for (di = 0; di < strlen(desc); di++) {
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d8514b24e115f4c4…
Commit: d8514b24e115f4c45fb7b6263f553a30e776a3da
Parent: aff62c74b7b947d19dda7f03e79d0f2437ad4730
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 18 19:09:24 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 20 00:43:40 2017 +0100
cleanup: use multiline string
---
tools/lvmcmdline.c | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index e796873..9fa8d94 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1684,30 +1684,30 @@ static void _usage_notes(void)
* [ ] for optional, ... for repeatable, | for one of the following,
* -- for an option name, lower case strings and digits for literals.
*/
- log_print("Usage notes:");
- log_print(". Variable parameters are: Number, String, PV, VG, LV, Tag.");
- log_print(". Select indicates that a required positional parameter can");
- log_print(" be omitted if the --select option is used.");
- log_print(". --size Number can be replaced with --extents NumberExtents.");
- log_print(". When --name is omitted from lvcreate, a new LV name is");
- log_print(" generated with the \"lvol\" prefix and a unique numeric suffix.");
- log_print(". The required VG parameter in lvcreate may be omitted when");
- log_print(" the VG name is included in another option, e.g. --name VG/LV.");
- log_print(". For required options listed in parentheses, e.g. (--A, --B),");
- log_print(" any one is required, after which the others are optional.");
- log_print(". The _new suffix indicates the VG or LV must not yet exist.");
- log_print(". LV followed by _<type> indicates that an LV of the given type");
- log_print(" is required. (raid represents any raid<N> type.)");
- log_print(". Input units are always treated as base two values, regardless of");
- log_print(" unit capitalization, e.g. 'k' and 'K' both refer to 1024.");
- log_print(". The default input unit is specified by letter, followed by |unit");
- log_print(" which represents other possible input units: bBsSkKmMgGtTpPeE.");
- log_print(". Output units can be specified with the --units option, for which");
- log_print(" lower/upper case letters refer to base 2/10 values.");
- log_print(" formats that are recognized, e.g. for compatibility.");
- log_print(". See man pages for short option equivalents of long option names,");
- log_print(" and for more detailed descriptions of variable parameters.");
- log_print(" ");
+ log_print("Usage notes:\n"
+ ". Variable parameters are: Number, String, PV, VG, LV, Tag.\n"
+ ". Select indicates that a required positional parameter can\n"
+ " be omitted if the --select option is used.\n"
+ ". --size Number can be replaced with --extents NumberExtents.\n"
+ ". When --name is omitted from lvcreate, a new LV name is\n"
+ " generated with the \"lvol\" prefix and a unique numeric suffix.\n"
+ ". The required VG parameter in lvcreate may be omitted when\n"
+ " the VG name is included in another option, e.g. --name VG/LV.\n"
+ ". For required options listed in parentheses, e.g. (--A, --B),\n"
+ " any one is required, after which the others are optional.\n"
+ ". The _new suffix indicates the VG or LV must not yet exist.\n"
+ ". LV followed by _<type> indicates that an LV of the given type\n"
+ " is required. (raid represents any raid<N> type.)\n"
+ ". Input units are always treated as base two values, regardless of\n"
+ " unit capitalization, e.g. 'k' and 'K' both refer to 1024.\n"
+ ". The default input unit is specified by letter, followed by |unit\n"
+ " which represents other possible input units: bBsSkKmMgGtTpPeE.\n"
+ ". Output units can be specified with the --units option, for which\n"
+ " lower/upper case letters refer to base 2/10 values.\n"
+ " formats that are recognized, e.g. for compatibility.\n"
+ ". See man pages for short option equivalents of long option names,\n"
+ " and for more detailed descriptions of variable parameters.\n"
+ " \n");
}
static int _usage(const char *name, int longhelp)
@@ -3285,6 +3285,6 @@ int lvm2_main(int argc, char **argv)
out:
lvm_fin(cmd);
+
return lvm_return_code(ret);
}
-
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=aff62c74b7b947d1…
Commit: aff62c74b7b947d19dda7f03e79d0f2437ad4730
Parent: f16ad760cb828228affd13cb6d701dfb54a5f249
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 18 18:50:22 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 20 00:43:40 2017 +0100
cleanup: use const
---
tools/command.c | 4 ++--
tools/command.h | 2 +-
tools/lvmcmdline.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 0ec5176..f46fb3d 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1302,8 +1302,8 @@ static void factor_common_options(void)
static int long_name_compare(const void *on1, const void *on2)
{
- struct opt_name **optname1 = (void *)on1;
- struct opt_name **optname2 = (void *)on2;
+ const struct opt_name * const *optname1 = (const void *)on1;
+ const struct opt_name * const *optname2 = (const void *)on2;
return strcmp((*optname1)->long_opt + 2, (*optname2)->long_opt + 2);
}
diff --git a/tools/command.h b/tools/command.h
index 95bd797..2d8f628 100644
--- a/tools/command.h
+++ b/tools/command.h
@@ -177,7 +177,7 @@ struct command {
int command_enum; /* <command_id>_CMD */
int command_index; /* position in commands[] */
- struct command_function *functions; /* new style */
+ const struct command_function *functions; /* new style */
command_fn fn; /* old style */
unsigned int cmd_flags; /* CMD_FLAG_ */
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index c304602..e796873 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -109,7 +109,7 @@ static struct cmdline_context _cmdline;
* to use these functions instead of the old per-command-name function.
* For now, any command id not included here uses the old command fn.
*/
-struct command_function command_functions[CMD_COUNT] = {
+static const struct command_function command_functions[CMD_COUNT] = {
{ lvmconfig_general_CMD, lvmconfig },
{ lvchange_properties_CMD, lvchange_properties_cmd },
{ lvchange_resync_CMD, lvchange_resync_cmd },
@@ -1112,7 +1112,7 @@ static struct command_name *find_command_name(const char *name)
return NULL;
}
-static struct command_function *_find_command_id_function(int command_enum)
+static const struct command_function *_find_command_id_function(int command_enum)
{
int i;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f16ad760cb828228…
Commit: f16ad760cb828228affd13cb6d701dfb54a5f249
Parent: cd24e6de898f9f20a56430d4a6d55c635a65bc65
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 19 15:50:19 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 20 00:43:12 2017 +0100
man: thin dmeventd plugin update
Document new dmeventd/thin_command lvm.conf configurable.
---
man/dmeventd.8.in | 108 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 34 deletions(-)
diff --git a/man/dmeventd.8.in b/man/dmeventd.8.in
index aa62451..057f756 100644
--- a/man/dmeventd.8.in
+++ b/man/dmeventd.8.in
@@ -23,40 +23,6 @@ dmeventd is the event monitoring daemon for device-mapper devices.
Library plugins can register and carry out actions triggered when
particular events occur.
.
-.SH LVM PLUGINS
-.
-.HP
-.IR Mirror
-.br
-Attempts to handle device failure automatically. See
-.BR lvm.conf (5).
-.
-.HP
-.IR Raid
-.br
-Attempts to handle device failure automatically. See
-.BR lvm.conf (5).
-.
-.HP
-.IR Snapshot
-.br
-Monitors how full a snapshot is becoming and emits a warning to
-syslog when it exceeds 80% full.
-The warning is repeated when 85%, 90% and 95% of the snapshot is filled.
-See
-.BR lvm.conf (5).
-Snapshot which runs out of space gets invalid and when it is mounted,
-it gets umounted if possible.
-.
-.HP
-.IR Thin
-.br
-Monitors how full a thin pool data and metadata is becoming and emits
-a warning to syslog when it exceeds 80% full.
-The warning is repeated when 85%, 90% and 95% of the thin pool is filled.
-See
-.BR lvm.conf (5).
-If the thin-pool runs out of space, thin volumes are umounted if possible.
.
.SH OPTIONS
.
@@ -104,6 +70,80 @@ events to monitor from the currently running daemon.
.br
Show version of dmeventd.
.
+.SH LVM PLUGINS
+.
+.HP
+.BR Mirror
+.br
+Attempts to handle device failure automatically. See
+.BR lvm.conf (5).
+.
+.HP
+.BR Raid
+.br
+Attempts to handle device failure automatically. See
+.BR lvm.conf (5).
+.
+.HP
+.BR Snapshot
+.br
+Monitors how full a snapshot is becoming and emits a warning to
+syslog when it exceeds 80% full.
+The warning is repeated when 85%, 90% and 95% of the snapshot is filled.
+See
+.BR lvm.conf (5).
+Snapshot which runs out of space gets invalid and when it is mounted,
+it gets umounted if possible.
+.
+.HP
+.BR Thin
+.br
+Monitors how full a thin pool data and metadata is becoming and emits
+a warning to syslog when it exceeds 80% full.
+The warning is repeated when more then 85%, 90% and 95%
+of the thin pool is filled. See
+.BR lvm.conf (5).
+When a thin pool fills over 50% (data or metadata) thin plugin calls
+configured \fIdmeventd/thin_command\fP with every 5% increase.
+With default setting it calls internal
+\fBlvm lvextend --use-policies\fP to resize thin pool
+when it's been filled above configured threshold
+\fIactivation/thin_pool_autoextend_threshold\fP.
+If the command fails, dmeventd thin plugin will keep
+retrying execution with increasing time delay between
+retries upto 42 minutes.
+User may also configure external command to support more advanced
+maintenance operations of a thin pool.
+Such external command can e.g. remove some unneeded snapshots,
+use \fBfstrim\fP(8) to free recover space in a thin pool,
+but also can use \fBlvextend --use-policies\fP if other actions
+have not released enough space.
+Command is executed with environmental variable
+\fBLVM_RUN_BY_DMEVENTD=1\fP so any lvm2 command executed
+in this environment will not try to interact with dmeventd.
+To see the fullness of a thin pool command may check these
+two environmental variables
+\fBDMEVENTD_THIN_POOL_DATA\fP and \fBDMEVENTD_THIN_POOL_DATA\fP.
+Command can also read status with tools like \fBlvs\fP(8).
+.
+.SH ENVIRONMENT VARIABLES
+.
+.TP
+.B DMEVENTD_THIN_POOL_DATA
+Variable is set by thin plugin and is available to executed program. Value present
+actual usage of thin pool data volume. Variable is not set when error event
+is processed.
+.TP
+.B DMEVENTD_THIN_POOL_DATA
+Variable is set by thin plugin and is available to executed program. Value present
+actual usage of thin pool metadata volume. Variable is not set when error event
+is processed.
+.TP
+.B LVM_RUN_BY_DMEVENTD
+Variable is set by thin plugin to prohibit recursive interation
+with dmeventd by any executed lvm2 command from
+a thin_command environment.
+.
.SH SEE ALSO
.
.BR lvm (8),
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cd24e6de898f9f20…
Commit: cd24e6de898f9f20a56430d4a6d55c635a65bc65
Parent: 665479b818a7e43ca8176fcfdbe34f0fad03451e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 19 15:51:06 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 19 22:59:43 2017 +0100
man: dmstats update
Fixing colorization bugs
---
man/dmstats.8.in | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/man/dmstats.8.in b/man/dmstats.8.in
index 167711c..ba828dc 100644
--- a/man/dmstats.8.in
+++ b/man/dmstats.8.in
@@ -44,7 +44,7 @@ dmstats \(em device-mapper statistics management
.B dmsetup
.B stats
.I command
-.RB [ options ]
+[OPTIONS]
.sp
.
.PD 0
@@ -53,13 +53,13 @@ dmstats \(em device-mapper statistics management
.de CMD_COMMAND
. ad l
. IR command
-. RI [ device_name |
-. RB [ \-u | \-\-uuid
-. IR uuid ]
-. RB | [ \-\-major
+. IR device_name " |"
+. BR \-\-major
. IR major
. BR \-\-minor
-. IR minor ]
+. IR minor " |"
+. BR \-u | \-\-uuid
+. IR uuid
. RB \%[ \-v | \-\-verbose]
. ad b
..
@@ -82,9 +82,7 @@ dmstats \(em device-mapper statistics management
.de CMD_CREATE
. ad l
. BR create
-. RB [ device_name...
-. RB | file_path...
-. RB | [ \-\-alldevices ]]
+. IR device_name... | file_path... | \fB\-\-alldevices
. RB [ \-\-areas
. IR nr_areas | \fB\-\-areasize
. IR area_size ]
@@ -110,8 +108,7 @@ dmstats \(em device-mapper statistics management
.de CMD_DELETE
. ad l
. BR delete
-. RI [ device_name ]
-. RB [ \-\-alldevices ]
+. IR device_name | \fB\-\-alldevices
. OPT_PROGRAMS
. OPT_REGIONS
. ad b
@@ -123,10 +120,9 @@ dmstats \(em device-mapper statistics management
.de CMD_GROUP
. ad l
. BR group
-. RI [ device_name ]
+. RI [ device_name | \fB\-\-alldevices ]
. RB [ \-\-alias
. IR name ]
-. RB [ \-\-alldevices ]
. RB [ \-\-regions
. IR regions ]
. ad b
@@ -205,8 +201,7 @@ dmstats \(em device-mapper statistics management
.de CMD_UNGROUP
. ad l
. BR ungroup
-. RI [ device_name ]
-. RB [ \-\-alldevices ]
+. RI [ device_name | \fB\-\-alldevices ]
. RB [ \-\-groupid
. IR id ]
. ad b
@@ -217,7 +212,7 @@ dmstats \(em device-mapper statistics management
.de CMD_UPDATE_FILEMAP
. ad l
. BR update_filemap
-. RI file_path
+. IR file_path
. RB [ \-\-groupid
. IR id ]
. ad b
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=665479b818a7e43c…
Commit: 665479b818a7e43ca8176fcfdbe34f0fad03451e
Parent: 2a21a19d904c34e56e3ab3fe026dbc5658f68925
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 19 15:50:49 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 19 22:59:43 2017 +0100
man: dmsetup update
---
man/dmsetup.8.in | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in
index 36a6d74..bd26efa 100644
--- a/man/dmsetup.8.in
+++ b/man/dmsetup.8.in
@@ -27,9 +27,9 @@ dmsetup \(em low level logical volume management
. IR uuid ]
. RB \%[ \-\-addnodeoncreate | \-\-addnodeonresume ]
. RB \%[ \-n | \-\-notable | \-\-table
-. RI \%{ table | table_file }]
+. IR \%table | table_file ]
. RB [ \-\-readahead
-. RB \%{[ + ] \fIsectors | auto | none }]
+. RB \%[ + ] \fIsectors | auto | none ]
. ad b
..
.CMD_CREATE
@@ -92,7 +92,7 @@ dmsetup \(em low level logical volume management
. BR load
. IR device_name
. RB [ \-\-table
-. RI { table | table_file }]
+. IR table | table_file ]
. ad b
..
.CMD_LOAD
@@ -146,7 +146,7 @@ dmsetup \(em low level logical volume management
. BR reload
. IR device_name
. RB [ \-\-table
-. RI { table | table_file }]
+. IR table | table_file ]
. ad b
..
.CMD_RELOAD
@@ -202,7 +202,7 @@ dmsetup \(em low level logical volume management
. RB [ \-\-noflush ]
. RB [ \-\-nolockfs ]
. RB \%[ \-\-readahead
-. RB \%{[ + ] \fIsectors | auto | none }]
+. RB \%[ + ] \fIsectors | auto | none ]
. ad b
..
.CMD_RESUME
@@ -447,7 +447,7 @@ The default interval is one second.
.
.HP
.BR \-\-manglename
-.RB { auto | hex | none }
+.BR auto | hex | none
.br
Mangle any character not on a whitelist using mangling_mode when
processing device-mapper device names and UUIDs. The names and UUIDs
@@ -529,7 +529,7 @@ Specify which fields to display.
.
.HP
.BR \-\-readahead
-.RB {[ + ] \fIsectors | auto | none }
+.RB [ + ] \fIsectors | auto | none
.br
Specify read ahead size in units of sectors.
The default value is \fBauto\fP which allows the kernel to choose
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2a21a19d904c34e5…
Commit: 2a21a19d904c34e56e3ab3fe026dbc5658f68925
Parent: 87c89ac2791e9b443db8c009db67610cbd97b4f2
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 18 18:49:19 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 19 22:59:43 2017 +0100
commands: fix memleak
Keep all allocations 'mempool' allocated for simple cleanup.
---
tools/lvmcmdline.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 26f7476..c304602 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -2519,7 +2519,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
/* each command should start out with sigint flag cleared */
sigint_clear();
- cmd->name = strdup(argv[0]);
+ cmd->name = dm_pool_strdup(cmd->mem, argv[0]);
/* eliminate '-' from all options starting with -- */
for (i = 1; i < argc; i++) {
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=87c89ac2791e9b44…
Commit: 87c89ac2791e9b443db8c009db67610cbd97b4f2
Parent: 13944738d49ee420cb8b6b9eab4984b0a01b700d
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 19 19:08:48 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 19 22:59:43 2017 +0100
lvresize: fix regressiong on accepting args
Commit f45b68940667563e1a8d3bbd5d30864c04381bdf caused regression
of lvresize -m and --type parameter
After fix this sequence may work when we also fix syntax description:
lvcreate -l1 -m1 -n lv1 vg
lvextend --type mirror -m1 -l+1 vg/lv1
---
tools/lvresize.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tools/lvresize.c b/tools/lvresize.c
index 28fd0fd..1d59239 100644
--- a/tools/lvresize.c
+++ b/tools/lvresize.c
@@ -21,7 +21,7 @@ static int _lvresize_params(struct cmd_context *cmd, int argc, char **argv,
const char *cmd_name = command_name(cmd);
const char *type_str = arg_str_value(cmd, type_ARG, NULL);
- if (type_str && (lp->segtype = get_segtype_from_string(cmd, type_str)))
+ if (type_str && !(lp->segtype = get_segtype_from_string(cmd, type_str)))
return_0;
if (!strcmp(cmd_name, "lvreduce"))
@@ -122,10 +122,13 @@ static int _lvresize_params(struct cmd_context *cmd, int argc, char **argv,
return 0;
}
- if ((lp->mirrors = arg_count(cmd, mirrors_ARG)) &&
- (arg_sign_value(cmd, mirrors_ARG, SIGN_NONE) == SIGN_MINUS)) {
- log_error("Mirrors argument may not be signed.");
- return 0;
+ if (arg_is_set(cmd, mirrors_ARG)) {
+ if (arg_sign_value(cmd, mirrors_ARG, SIGN_NONE) != SIGN_NONE) {
+ log_error("Mirrors argument may not be signed.");
+ return 0;
+ }
+ if ((lp->mirrors = arg_uint_value(cmd, mirrors_ARG, 0)))
+ lp->mirrors++;
}
if ((lp->stripes = arg_uint_value(cmd, stripes_ARG, 0)) &&
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=13944738d49ee420…
Commit: 13944738d49ee420cb8b6b9eab4984b0a01b700d
Parent: fab0d63121f0ac59996526db40b70cb1efceb306
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 17 15:44:26 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 17 15:44:26 2017 -0600
man/help: fix description of r|R unit
---
tools/args.h | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index 0575a2f..e7a1ab2 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -673,12 +673,11 @@ arg(unconfigured_ARG, '\0', "unconfigured", 0, 0, 0,
arg(units_ARG, '\0', "units", units_VAL, 0, 0,
"All sizes are output in these units:\n"
- "human-(r)eadable with rounding,\n"
+ "human-(r)eadable with '<' rounding indicator,\n"
"(h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,\n"
"(g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.\n"
"Capitalise to use multiples of 1000 (S.I.) instead of 1024.\n"
- "Custom units can be specified, e.g. --units 3M.\n"
- "r|R rounds numbers and displays the '<' prefix before rounded values.\n")
+ "Custom units can be specified, e.g. --units 3M.\n")
arg(unquoted_ARG, '\0', "unquoted", 0, 0, 0,
"When used with --nameprefixes, output values in the field=value\n"
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fab0d63121f0ac59…
Commit: fab0d63121f0ac59996526db40b70cb1efceb306
Parent: 87fe9328d30660e2eecd990bfce893ae65817f44
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 17 15:33:04 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 17 15:33:35 2017 -0600
man: print space before built-in name
print 'lvm config' not 'lvm-config'
---
tools/command.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 2897c65..0ec5176 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -2636,8 +2636,11 @@ void print_man(char *name, char *des_file, int include_primary, int include_seco
char *lvmname = name;
int i;
- if (!strncmp(name, "lvm-", 4))
+ if (!strncmp(name, "lvm-", 4)) {
+ char *space = strchr(lvmname, '-');
+ *space = ' ';
name += 4;
+ }
cname = find_command_name(name);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=87fe9328d30660e2…
Commit: 87fe9328d30660e2eecd990bfce893ae65817f44
Parent: 6064b0359a7f3fbc07e56dd7094732ea184c199e
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 17 15:28:00 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 17 15:28:00 2017 -0600
man pvmove: move details to notes
---
man/pvmove.8.des | 45 ---------------------------------------------
man/pvmove.8.end | 47 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/man/pvmove.8.des b/man/pvmove.8.des
index 5286ef4..c003c5e 100644
--- a/man/pvmove.8.des
+++ b/man/pvmove.8.des
@@ -14,48 +14,3 @@ More than one pvmove can run concurrently if they are moving data from
different source PVs, but additional pvmoves will ignore any LVs already
in the process of being changed, so some data might not get moved.
-pvmove works as follows:
-
-1. A temporary 'pvmove' LV is created to store details of all the data
-movements required.
-
-2. Every LV in the VG is searched for contiguous data that need moving
-according to the command line arguments.
-For each piece of data found, a new segment is added to the end of the
-pvmove LV.
-This segment takes the form of a temporary mirror to copy the data
-from the original location to a newly allocated location.
-The original LV is updated to use the new temporary mirror segment
-in the pvmove LV instead of accessing the data directly.
-
-3. The VG metadata is updated on disk.
-
-4. The first segment of the pvmove LV is activated and starts to mirror
-the first part of the data. Only one segment is mirrored at once as this
-is usually more efficient.
-
-5. A daemon repeatedly checks progress at the specified time interval.
-When it detects that the first temporary mirror is in sync, it breaks that
-mirror so that only the new location for that data gets used and writes a
-checkpoint into the VG metadata on disk. Then it activates the mirror for
-the next segment of the pvmove LV.
-
-6. When there are no more segments left to be mirrored, the temporary LV
-is removed and the VG metadata is updated so that the LVs reflect the new
-data locations.
-
-Note that this new process cannot support the original LVM1
-type of on-disk metadata. Metadata can be converted using
-\fBvgconvert\fP(8).
-
-If the \fB\-\-atomic\fP option is used, a slightly different approach is
-used for the move. Again, a temporary 'pvmove' LV is created to store the
-details of all the data movements required. This temporary LV contains
-all the segments of the various LVs that need to be moved. However, in
-this case, an identical LV is allocated that contains the same number of
-segments and a mirror is created to copy the contents from the first
-temporary LV to the second. After a complete copy is made, the temporary
-LVs are removed, leaving behind the segments on the destination PV. If an
-abort is issued during the move, all LVs being moved will remain on the
-source PV.
-
diff --git a/man/pvmove.8.end b/man/pvmove.8.end
index 9dd3adc..906606d 100644
--- a/man/pvmove.8.end
+++ b/man/pvmove.8.end
@@ -1,3 +1,50 @@
+.SH NOTES
+
+pvmove works as follows:
+
+1. A temporary 'pvmove' LV is created to store details of all the data
+movements required.
+
+2. Every LV in the VG is searched for contiguous data that need moving
+according to the command line arguments.
+For each piece of data found, a new segment is added to the end of the
+pvmove LV.
+This segment takes the form of a temporary mirror to copy the data
+from the original location to a newly allocated location.
+The original LV is updated to use the new temporary mirror segment
+in the pvmove LV instead of accessing the data directly.
+
+3. The VG metadata is updated on disk.
+
+4. The first segment of the pvmove LV is activated and starts to mirror
+the first part of the data. Only one segment is mirrored at once as this
+is usually more efficient.
+
+5. A daemon repeatedly checks progress at the specified time interval.
+When it detects that the first temporary mirror is in sync, it breaks that
+mirror so that only the new location for that data gets used and writes a
+checkpoint into the VG metadata on disk. Then it activates the mirror for
+the next segment of the pvmove LV.
+
+6. When there are no more segments left to be mirrored, the temporary LV
+is removed and the VG metadata is updated so that the LVs reflect the new
+data locations.
+
+Note that this new process cannot support the original LVM1
+type of on-disk metadata. Metadata can be converted using
+\fBvgconvert\fP(8).
+
+If the \fB\-\-atomic\fP option is used, a slightly different approach is
+used for the move. Again, a temporary 'pvmove' LV is created to store the
+details of all the data movements required. This temporary LV contains
+all the segments of the various LVs that need to be moved. However, in
+this case, an identical LV is allocated that contains the same number of
+segments and a mirror is created to copy the contents from the first
+temporary LV to the second. After a complete copy is made, the temporary
+LVs are removed, leaving behind the segments on the destination PV. If an
+abort is issued during the move, all LVs being moved will remain on the
+source PV.
+
.SH EXAMPLES
Move all physical extents that are used by simple LVs on the specified PV to
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6064b0359a7f3fbc…
Commit: 6064b0359a7f3fbc07e56dd7094732ea184c199e
Parent: 50e0345f9d245cdcb29e4988760e788defa5e88e
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 17 15:11:19 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 17 15:11:19 2017 -0600
man: mention force behavior in various places
---
man/lvremove.8.des | 5 +++++
man/pvcreate.8.des | 3 +++
man/pvremove.8.des | 5 +++++
man/vgcfgrestore.8.des | 3 +++
man/vgremove.8.des | 3 +++
5 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/man/lvremove.8.des b/man/lvremove.8.des
index d049c63..14587c1 100644
--- a/man/lvremove.8.des
+++ b/man/lvremove.8.des
@@ -6,6 +6,11 @@ removal. LVs cannot be deactivated or removed while they are open (e.g.
if they contain a mounted filesystem). Removing an origin LV will also
remove all dependent snapshots.
+When a single force option is used, LVs are removed without confirmation,
+and the command will try to deactivate unused LVs.
+
+To remove damaged LVs, two force options may be required (\fB-ff\fP).
+
\fBHistorical LVs\fP
If the configuration setting \fBmetadata/record_lvs_history\fP is enabled
diff --git a/man/pvcreate.8.des b/man/pvcreate.8.des
index 3dfddbc..1b00e9e 100644
--- a/man/pvcreate.8.des
+++ b/man/pvcreate.8.des
@@ -16,3 +16,6 @@ data on that disk. This can be done by zeroing the first sector with:
Use \fBvgcreate\fP(8) to create a new VG on the PV, or \fBvgextend\fP(8)
to add the PV to existing VG.
+The force option will create a PV without confirmation. Repeating the
+force option (\fB-ff\fP) will forcibly create a PV, overriding checks that
+normally prevent it, e.g. if the PV is already in a VG.
diff --git a/man/pvremove.8.des b/man/pvremove.8.des
index f12b76e..cc84148 100644
--- a/man/pvremove.8.des
+++ b/man/pvremove.8.des
@@ -1,2 +1,7 @@
pvremove wipes the label on a device so that LVM will no longer recognise
it as a PV.
+
+A PV cannot be removed from a VG while it is used by an active LV.
+
+Repeat the force option (\fB-ff\fP) to forcibly remove a PV belonging to
+an existing VG. Normally, \fBvgreduce\fP(8) should be used instead.
diff --git a/man/vgcfgrestore.8.des b/man/vgcfgrestore.8.des
index cb7867d..ee3a99e 100644
--- a/man/vgcfgrestore.8.des
+++ b/man/vgcfgrestore.8.des
@@ -6,3 +6,6 @@ A back up file can be specified with \fB\-\-file\fP. If no backup file is
specified, the most recent one is used. Use \fB\-\-list\fP for a list of
the available back up and archive files of a VG.
+WARNING: When a VG contains thin pools, changes to thin metadata cannot be
+reverted, and data loss may occur if thin metadata has changed. The force
+option is required to restore in this case.
diff --git a/man/vgremove.8.des b/man/vgremove.8.des
index 04dc0e3..6414c73 100644
--- a/man/vgremove.8.des
+++ b/man/vgremove.8.des
@@ -4,3 +4,6 @@ to confirm LV removal.
If one or more PVs in the VG are lost, consider
\fBvgreduce \-\-removemissing\fP to make the VG
metadata consistent again.
+
+Repeat the force option (\fB-ff\fP) to forcibly remove LVs in the VG
+without confirmation.
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=50e0345f9d245cdc…
Commit: 50e0345f9d245cdcb29e4988760e788defa5e88e
Parent: 10cb8e0ec08d430d697fb8a58caaefb5aea32928
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 17 14:46:10 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 17 14:46:10 2017 -0600
man lvmconfig: refer to typeconfig option name
---
tools/args.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index 1f3ace7..0575a2f 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -546,7 +546,7 @@ arg(shared_ARG, '\0', "shared", 0, 0, 0,
arg(sinceversion_ARG, '\0', "sinceversion", string_VAL, 0, 0,
"Specify an LVM version in x.y.z format where x is the major version,\n"
"the y is the minor version and z is the patchlevel (e.g. 2.2.106).\n"
- "This option is currently applicable only with --type new\n"
+ "This option is currently applicable only with --typeconfig new\n"
"to display all configuration settings introduced since given version.\n")
arg(splitcache_ARG, '\0', "splitcache", 0, 0, 0,
@@ -1024,7 +1024,7 @@ arg(list_ARG, 'l', "list", 0, 0, 0,
"#dumpconfig\n"
"#config\n"
"List config settings with summarizing comment. This is the same as using\n"
- "options --type list --withsummary.\n"
+ "options --typeconfig list --withsummary.\n"
"#vgcfgrestore\n"
"List metadata backup and archive files pertaining to the VG.\n"
"May be used with --file. Does not restore the VG.\n"
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=10cb8e0ec08d430d…
Commit: 10cb8e0ec08d430d697fb8a58caaefb5aea32928
Parent: 3cf394389896a1bd6b3780671e6a6654a925bdd3
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 17 14:02:13 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 17 14:44:11 2017 -0600
man/help: show recently added r|R unit
---
tools/args.h | 11 +++++++----
tools/vals.h | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index 149b5f6..1f3ace7 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -672,10 +672,13 @@ arg(unconfigured_ARG, '\0', "unconfigured", 0, 0, 0,
"Internal option used for generating config file during build.\n")
arg(units_ARG, '\0', "units", units_VAL, 0, 0,
- "All sizes are output in these units: (h)uman-readable, (b)ytes, (s)ectors,\n"
- "(k)ilobytes, (m)egabytes, (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.\n"
- "Capitalise to use multiples of 1000 (S.I.) instead of 1024. Can also specify\n"
- "custom units e.g. --units 3M.\n")
+ "All sizes are output in these units:\n"
+ "human-(r)eadable with rounding,\n"
+ "(h)uman-readable, (b)ytes, (s)ectors, (k)ilobytes, (m)egabytes,\n"
+ "(g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.\n"
+ "Capitalise to use multiples of 1000 (S.I.) instead of 1024.\n"
+ "Custom units can be specified, e.g. --units 3M.\n"
+ "r|R rounds numbers and displays the '<' prefix before rounded values.\n")
arg(unquoted_ARG, '\0', "unquoted", 0, 0, 0,
"When used with --nameprefixes, output values in the field=value\n"
diff --git a/tools/vals.h b/tools/vals.h
index d9b0064..88c446e 100644
--- a/tools/vals.h
+++ b/tools/vals.h
@@ -122,7 +122,7 @@ val(numsigned_VAL, int_arg_with_sign, "SNumber", "[+|-]Number")
val(numsignedper_VAL, int_arg_with_sign_and_percent, "SNumberP", "[+|-]Number[%VG|%PVS|%FREE]")
val(permission_VAL, permission_arg, "Permission", "rw|r")
val(metadatatype_VAL, metadatatype_arg, "MetadataType", "lvm2|lvm1")
-val(units_VAL, string_arg, "Units", "h|H|b|B|s|S|k|K|m|M|g|G|t|T|p|P|e|E")
+val(units_VAL, string_arg, "Units", "r|R|h|H|b|B|s|S|k|K|m|M|g|G|t|T|p|P|e|E")
val(segtype_VAL, segtype_arg, "SegType", "linear|striped|snapshot|mirror|raid*|thin|cache|thin-pool|cache-pool")
val(alloc_VAL, alloc_arg, "Alloc", "contiguous|cling|cling_by_tags|normal|anywhere|inherit")
val(locktype_VAL, locktype_arg, "LockType", "sanlock|dlm|none")
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3cf394389896a1bd…
Commit: 3cf394389896a1bd6b3780671e6a6654a925bdd3
Parent: f88ce5fb9954721b41fa1fc19c53abc18006c395
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 17 14:42:13 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 17 14:44:11 2017 -0600
args: in yes option mention qq for auto-no
---
tools/args.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index 06595a6..149b5f6 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -1369,7 +1369,8 @@ arg(resizeable_ARG, 'x', "resizeable", bool_VAL, 0, 0,
arg(yes_ARG, 'y', "yes", 0, 0, 0,
"Do not prompt for confirmation interactively but always assume the\n"
- "answer yes. Use with extreme caution.\n")
+ "answer yes. Use with extreme caution.\n"
+ "(For automatic no, see -qq.)\n")
arg(zero_ARG, 'Z', "zero", bool_VAL, 0, 0,
"#lvchange\n"
1
0
17 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f88ce5fb9954721b…
Commit: f88ce5fb9954721b41fa1fc19c53abc18006c395
Parent: 56deed9d54c9070cc586f040264a8e1985b19bdc
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 17 11:45:13 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Feb 17 13:20:15 2017 -0600
lvconvert: include swap behavior in generic pool syntax
For this syntax:
lvconvert --thinpool LV1 --poolmetadata LV2
lvconvert --cachepool LV1 --poolmetadata LV2
Restore the metadata swapping behavior in addition to
the pool creation behavior. When LV1 is already a pool,
the metadata LV will be swapped with LV2.
When LV1 is not a pool, it will be converted to a
pool using the specified LV for metadata.
This syntax is no longer advertised because of the
ambiguous behavior. The primary syntaxes for pool
creation and metadata swapping will be the advertised
methods.
---
man/lvconvert.8.end | 21 +++++++
man/lvmthin.7.in | 16 ------
tools/args.h | 9 ++-
tools/command-lines.in | 66 ++++++++++++++++++-----
tools/command.c | 5 ++
tools/command.h | 3 +-
tools/lvconvert.c | 136 ++++++++++++++++++++++++++----------------------
tools/lvmcmdline.c | 7 ++-
tools/tools.h | 2 +-
9 files changed, 166 insertions(+), 99 deletions(-)
diff --git a/man/lvconvert.8.end b/man/lvconvert.8.end
index fa8cc1d..5a3d475 100644
--- a/man/lvconvert.8.end
+++ b/man/lvconvert.8.end
@@ -1,3 +1,24 @@
+.SH NOTES
+
+This previous command syntax would perform two different operations:
+.br
+\fBlvconvert --thinpool\fP \fILV1\fP \fB--poolmetadata\fP \fILV2\fP
+.br
+If LV1 was not a thin pool, the command would convert LV1 to
+a thin pool, optionally using a specified LV for metadata.
+But, if LV1 was already a thin pool, the command would swap
+the current metadata LV with LV2 (for repair purposes.)
+
+In the same way, this previous command syntax would perform two different
+operations:
+.br
+\fBlvconvert --cachepool\fP \fILV1\fP \fB--poolmetadata\fP \fILV2\fP
+.br
+If LV1 was not a cache pool, the command would convert LV1 to
+a cache pool, optionally using a specified LV for metadata.
+But, if LV1 was already a cache pool, the command would swap
+the current metadata LV with LV2 (for repair purposes.)
+
.SH EXAMPLES
Convert a linear LV to a two-way mirror LV.
diff --git a/man/lvmthin.7.in b/man/lvmthin.7.in
index 714233e..f6f8548 100644
--- a/man/lvmthin.7.in
+++ b/man/lvmthin.7.in
@@ -278,22 +278,6 @@ or vgchange to activate thin snapshots with the "k" attribute.
\&
-.SS Alternate syntax for specifying type thin\-pool
-
-\&
-
-The fully specified syntax for creating a thin pool LV shown above is:
-
-.B lvconvert \-\-type thin-pool \-\-poolmetadata VG/ThinMetaLV VG/ThinDataLV
-
-An alternate syntax may be used for the same operation:
-
-.B lvconvert \-\-thinpool VG/ThinDataLV \-\-poolmetadata VG/ThinMetaLV
-
-The thin-pool type is inferred by lvm; the \-\-thinpool option is not an
-alias for \-\-type thin\-pool.
-
-
.SS Automatic pool metadata LV
\&
diff --git a/tools/args.h b/tools/args.h
index f64b126..06595a6 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -589,9 +589,12 @@ arg(stripes_long_ARG, '\0', "stripes", number_VAL, 0, 0,
"existing allocated space, only newly allocated space can be striped.\n")
arg(swapmetadata_ARG, '\0', "swapmetadata", 0, 0, 0,
- "Remove the metadata LV in a pool and replace it with another specified LV.\n"
- "The removed LV is preserved and given the name of the LV that replaced it.\n"
- "Used for repair only.\n")
+ "Extracts the metadata LV from a pool and replaces it with another specified LV.\n"
+ "The extracted LV is preserved and given the name of the LV that replaced it.\n"
+ "Use for repair only. When the metadata LV is swapped out of the pool, it can\n"
+ "be activated directly and used with thin provisioning tools:\n"
+ "\\fBcache_dump\\fP(8), \\fBcache_repair\\fP(8), \\fBcache_restore\\fP(8),\n"
+ "\\fBthin_dump\\fP(8), \\fBthin_repair\\fP(8), \\fBthin_restore\\fP(8).\n")
arg(syncaction_ARG, '\0', "syncaction", syncaction_VAL, 0, 0,
"Initiate different types of RAID synchronization.\n"
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 377e536..aed38e7 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -454,17 +454,36 @@ DESC: Convert LV to type thin-pool.
RULE: all and lv_is_visible
RULE: all not lv_is_locked lv_is_origin lv_is_merging_origin lv_is_external_origin lv_is_virtual
-# alternate form of lvconvert --type thin-pool
-# deprecated because of non-standard syntax (missing positional arg)
-# Commands in this form are converted to standard form so that
-# the validation of LV types and rules specified above will apply.
-lvconvert --thinpool LV_linear_striped_raid_cache
+# This command syntax has two different meanings depending on
+# whether the LV pos arg is already a thin pool or not.
+#
+# 1. When the LV arg is not a pool, this command converts
+# the LV into a pool, optionally using a specified meta LV.
+# This is an alternate form of the primary command:
+# lvconvert --type thin-pool LV
+#
+# 2. When the LV is is already a pool and a meta LV is specified,
+# the meta LV is swapped. Swapping a meta LV is a very specialized
+# operation that users should never use.
+# This is an alternate form of the primary command:
+# lvconvert --swapmetadata --poolmetadata LV LV
+#
+# The command def cannot include --poolmetadata as a required
+# option, otherwise 1 would not pass, so the validation of
+# this option cannot be done by the command defs, but has to
+# be done ad hoc in the lvconvert implementation.
+#
+# This command syntax is deprecated, and the primary forms
+# of creating a pool or swapping metadata should be used.
+
+lvconvert --thinpool LV_linear_striped_raid_cache_thinpool
OO: --type thin-pool, --stripes_long Number, --stripesize SizeKB,
--discards Discards, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
OP: PV ...
-ID: lvconvert_to_thinpool_noarg
+ID: lvconvert_to_thinpool_or_swap_metadata
DESC: Convert LV to type thin-pool (variant, use --type thin-pool).
-FLAGS: SECONDARY_SYNTAX
+DESC: Swap metadata LV in a thin pool (variant, use --swapmetadata).
+FLAGS: PREVIOUS_SYNTAX
---
@@ -475,17 +494,36 @@ OP: PV ...
ID: lvconvert_to_cachepool
DESC: Convert LV to type cache-pool.
-# alternate form of lvconvert --type cache-pool
-# deprecated because of non-standard syntax (missing positional arg)
-# Commands in this form are converted to standard form so that
-# the validation of LV types and rules specified above will apply.
-lvconvert --cachepool LV_linear_striped_raid
+# This command syntax has two different meanings depending on
+# whether the LV pos arg is already a cache pool or not.
+#
+# 1. When the LV arg is not a pool, this command converts
+# the LV into a pool, optionally using a specified meta LV.
+# This is an alternate form of the primary command:
+# lvconvert --type cache-pool LV
+#
+# 2. When the LV is is already a pool and a meta LV is specified,
+# the meta LV is swapped. Swapping a meta LV is a very specialized
+# operation that users should never use.
+# This is an alternate form of the primary command:
+# lvconvert --swapmetadata --poolmetadata LV LV
+#
+# The command def cannot include --poolmetadata as a required
+# option, otherwise 1 would not pass, so the validation of
+# this option cannot be done by the command defs, but has to
+# be done ad hoc in the lvconvert implementation.
+#
+# This command syntax is deprecated, and the primary forms
+# of creating a pool or swapping metadata should be used.
+
+lvconvert --cachepool LV_linear_striped_raid_cachepool
OO: --type cache-pool, OO_LVCONVERT_POOL, OO_LVCONVERT,
--cachemode CacheMode, --cachepolicy String, --cachesettings String
OP: PV ...
-ID: lvconvert_to_cachepool_noarg
+ID: lvconvert_to_cachepool_or_swap_metadata
DESC: Convert LV to type cache-pool (variant, use --type cache-pool).
-FLAGS: SECONDARY_SYNTAX
+DESC: Swap metadata LV in a cache pool (variant, use --swapmetadata).
+FLAGS: PREVIOUS_SYNTAX
---
diff --git a/tools/command.c b/tools/command.c
index 6cd4d68..2897c65 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1128,6 +1128,8 @@ static void add_flags(struct command *cmd, char *line)
{
if (strstr(line, "SECONDARY_SYNTAX"))
cmd->cmd_flags |= CMD_FLAG_SECONDARY_SYNTAX;
+ if (strstr(line, "PREVIOUS_SYNTAX"))
+ cmd->cmd_flags |= CMD_FLAG_PREVIOUS_SYNTAX;
}
#define MAX_RULE_OPTS 64
@@ -2659,6 +2661,9 @@ void print_man(char *name, char *des_file, int include_primary, int include_seco
prev_cmd = NULL;
}
+ if (cmd->cmd_flags & CMD_FLAG_PREVIOUS_SYNTAX)
+ continue;
+
if ((cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_secondary)
continue;
diff --git a/tools/command.h b/tools/command.h
index fcf0ccb..95bd797 100644
--- a/tools/command.h
+++ b/tools/command.h
@@ -166,7 +166,8 @@ struct cmd_rule {
*/
#define CMD_FLAG_ONE_REQUIRED_OPT 1 /* lvchange/vgchage require one item from required_opt_args */
#define CMD_FLAG_SECONDARY_SYNTAX 2 /* allows syntax variants to be suppressed in certain output */
-#define CMD_FLAG_PARSE_ERROR 4 /* error parsing command-lines.in def */
+#define CMD_FLAG_PREVIOUS_SYNTAX 4 /* allows syntax variants to not be advertised in output */
+#define CMD_FLAG_PARSE_ERROR 8 /* error parsing command-lines.in def */
/* a register of the lvm commands */
struct command {
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index a2ad115..b9e0665 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -3790,51 +3790,6 @@ int lvconvert_to_pool_cmd(struct cmd_context *cmd, int argc, char **argv)
NULL, NULL, &_lvconvert_to_pool_single);
}
-/*
- * Reformats non-standard command form into standard command form.
- *
- * In the command variants with no position LV arg, the LV arg is taken from
- * the --thinpool/--cachepool arg, and the position args are modified to match
- * the standard command form.
- */
-
-int lvconvert_to_pool_noarg_cmd(struct cmd_context *cmd, int argc, char **argv)
-{
- struct command *new_command;
- char *pool_data_name;
- int i, p;
-
- switch (cmd->command->command_enum) {
- case lvconvert_to_thinpool_noarg_CMD:
- pool_data_name = (char *)arg_str_value(cmd, thinpool_ARG, NULL);
- new_command = get_command(lvconvert_to_thinpool_CMD);
- break;
- case lvconvert_to_cachepool_noarg_CMD:
- pool_data_name = (char *)arg_str_value(cmd, cachepool_ARG, NULL);
- new_command = get_command(lvconvert_to_cachepool_CMD);
- break;
- default:
- log_error(INTERNAL_ERROR "Unknown pool conversion.");
- return 0;
- };
-
- log_debug("Changing command %d:%s to standard form %d:%s",
- cmd->command->command_index, cmd->command->command_id,
- new_command->command_index, new_command->command_id);
-
- /* Make the LV the first position arg. */
-
- p = cmd->position_argc;
- for (i = 0; i < cmd->position_argc; i++)
- cmd->position_argv[p] = cmd->position_argv[p-1];
-
- cmd->position_argv[0] = pool_data_name;
- cmd->position_argc++;
- cmd->command = new_command;
-
- return lvconvert_to_pool_cmd(cmd, argc, argv);
-}
-
static int _lvconvert_to_cache_vol_single(struct cmd_context *cmd,
struct logical_volume *lv,
struct processing_handle *handle)
@@ -4077,39 +4032,96 @@ int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **a
NULL, NULL, &_lvconvert_swap_pool_metadata_single);
}
-#if 0
-int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, char **argv)
+static int _lvconvert_to_pool_or_swap_metadata_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
{
- struct command *new_command;
- char *pool_name;
+ struct dm_list *use_pvh = NULL;
+ int to_thinpool = 0;
+ int to_cachepool = 0;
switch (cmd->command->command_enum) {
- case lvconvert_swap_thinpool_metadata_CMD:
- pool_name = (char *)arg_str_value(cmd, thinpool_ARG, NULL);
+ case lvconvert_to_thinpool_or_swap_metadata_CMD:
+ to_thinpool = 1;
break;
- case lvconvert_swap_cachepool_metadata_CMD:
- pool_name = (char *)arg_str_value(cmd, cachepool_ARG, NULL);
+ case lvconvert_to_cachepool_or_swap_metadata_CMD:
+ to_cachepool = 1;
break;
default:
- log_error(INTERNAL_ERROR "Unknown pool conversion.");
+ log_error(INTERNAL_ERROR "Invalid lvconvert pool command");
return 0;
};
- new_command = get_command(lvconvert_swap_pool_metadata_CMD);
+ if (cmd->position_argc > 1) {
+ /* First pos arg is required LV, remaining are optional PVs. */
+ if (!(use_pvh = create_pv_list(cmd->mem, lv->vg, cmd->position_argc - 1, cmd->position_argv + 1, 0)))
+ return_ECMD_FAILED;
+ } else
+ use_pvh = &lv->vg->pvs;
+
+ /*
+ * We can finally determine if this command is supposed to create
+ * a pool or swap the metadata in an existing pool.
+ *
+ * This allows the ambiguous command:
+ * 'lvconvert --thinpool LV1 --poolmetadata LV2' to mean either:
+ * 1. convert LV2 to a pool using the specified meta LV2
+ * 2. swap the meta lv in LV1 with LV2
+ *
+ * In case 2, the poolmetadata option is required, but in case 1
+ * it is optional. So, the command def is not able to validate
+ * the required/optional option, and we have to check here
+ * for missing poolmetadata in case 2.
+ */
+ if (lv_is_pool(lv)) {
+ if (!arg_is_set(cmd, poolmetadata_ARG)) {
+ log_error("The --poolmetadata option is required to swap metadata.");
+ return ECMD_FAILED;
+ }
+ return _lvconvert_swap_pool_metadata_single(cmd, lv, handle);
+ }
+
+ if (!_lvconvert_to_pool(cmd, lv, to_thinpool, to_cachepool, use_pvh))
+ return_ECMD_FAILED;
+
+ return ECMD_PROCESSED;
+}
+
+/*
+ * In the command variants with no position LV arg, the LV arg is taken from
+ * the --thinpool/--cachepool arg, and the position args are modified to match
+ * the standard command form.
+ */
+
+int lvconvert_to_pool_or_swap_metadata_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ char *pool_data_name;
+ int i, p;
- log_debug("Changing command %d:%s to standard form %d:%s",
- cmd->command->command_index, cmd->command->command_id,
- new_command->command_index, new_command->command_id);
+ switch (cmd->command->command_enum) {
+ case lvconvert_to_thinpool_or_swap_metadata_CMD:
+ pool_data_name = (char *)arg_str_value(cmd, thinpool_ARG, NULL);
+ break;
+ case lvconvert_to_cachepool_or_swap_metadata_CMD:
+ pool_data_name = (char *)arg_str_value(cmd, cachepool_ARG, NULL);
+ break;
+ default:
+ log_error(INTERNAL_ERROR "Unknown pool conversion.");
+ return 0;
+ };
/* Make the LV the first position arg. */
- cmd->position_argv[0] = pool_name;
+ p = cmd->position_argc;
+ for (i = 0; i < cmd->position_argc; i++)
+ cmd->position_argv[p] = cmd->position_argv[p-1];
+
+ cmd->position_argv[0] = pool_data_name;
cmd->position_argc++;
- cmd->command = new_command;
- return lvconvert_swap_pool_metadata_cmd(cmd, argc, argv);
+ return process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, NULL, &_lvconvert_to_pool_or_swap_metadata_single);
}
-#endif
static int _lvconvert_merge_thin_single(struct cmd_context *cmd,
struct logical_volume *lv,
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 7e50d05..26f7476 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -135,12 +135,12 @@ struct command_function command_functions[CMD_COUNT] = {
/* lvconvert utilities for creating/maintaining thin and cache objects. */
{ lvconvert_to_thinpool_CMD, lvconvert_to_pool_cmd },
- { lvconvert_to_thinpool_noarg_CMD, lvconvert_to_pool_noarg_cmd },
{ lvconvert_to_cachepool_CMD, lvconvert_to_pool_cmd },
- { lvconvert_to_cachepool_noarg_CMD, lvconvert_to_pool_noarg_cmd },
{ lvconvert_to_thin_with_external_CMD, lvconvert_to_thin_with_external_cmd },
{ lvconvert_to_cache_vol_CMD, lvconvert_to_cache_vol_cmd },
{ lvconvert_swap_pool_metadata_CMD, lvconvert_swap_pool_metadata_cmd },
+ { lvconvert_to_thinpool_or_swap_metadata_CMD, lvconvert_to_pool_or_swap_metadata_cmd },
+ { lvconvert_to_cachepool_or_swap_metadata_CMD, lvconvert_to_pool_or_swap_metadata_cmd },
{ lvconvert_merge_thin_CMD, lvconvert_merge_thin_cmd },
{ lvconvert_split_and_keep_cachepool_CMD, lvconvert_split_cachepool_cmd },
{ lvconvert_split_and_remove_cachepool_CMD, lvconvert_split_cachepool_cmd },
@@ -1727,6 +1727,9 @@ static int _usage(const char *name, int longhelp)
if (strcmp(_cmdline.commands[i].name, name))
continue;
+ if (_cmdline.commands[i].cmd_flags & CMD_FLAG_PREVIOUS_SYNTAX)
+ continue;
+
if ((_cmdline.commands[i].cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !longhelp)
continue;
diff --git a/tools/tools.h b/tools/tools.h
index b3858a0..62db506 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -274,10 +274,10 @@ int lvconvert_combine_split_snapshot_cmd(struct cmd_context *cmd, int argc, char
int lvconvert_start_poll_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_to_pool_cmd(struct cmd_context *cmd, int argc, char **argv);
-int lvconvert_to_pool_noarg_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_to_cache_vol_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_to_thin_with_external_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_to_pool_or_swap_metadata_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_merge_thin_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=56deed9d54c9070c…
Commit: 56deed9d54c9070cc586f040264a8e1985b19bdc
Parent: 00f299b93265ea2a9a930f26c68d887b8708da5a
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 17 13:57:59 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 17 13:57:59 2017 +0100
commands: compensate --uuid
As we now user binary search - it's nondeterministict
which of the same 'args' will be give - so duplicates
need 'extra' care.
So provide same hack for output for --uuidstr_ARG as
for input.
Solves 'pvscan -u'.
---
tools/command.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 1abac20..6cd4d68 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -866,6 +866,11 @@ static void add_opt_arg(struct command *cmd, char *str, int *takes_arg, int requ
}
opt = opt_str_to_num(cmd, str);
+
+ /* If the binary-search finds uuidstr_ARG switch to uuid_ARG */
+ if (opt == uuidstr_ARG)
+ opt = uuid_ARG;
+
skip:
if (required > 0)
cmd->required_opt_args[cmd->ro_count++].opt = opt;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=00f299b93265ea2a…
Commit: 00f299b93265ea2a9a930f26c68d887b8708da5a
Parent: 238a79aac41fcba65e7ac9c75f05275ab5915de6
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 17 13:36:57 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 17 13:36:57 2017 +0100
commands: some more dm wrappers
As man-generator is not liked with libdm as of now - some more wrappers.
---
tools/command.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index a4139f0..1abac20 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -48,6 +48,18 @@ do { \
#define dm_malloc malloc
#define dm_free free
#define dm_strdup strdup
+#define dm_snprintf snprintf
+
+static int dm_strncpy(char *dest, const char *src, size_t n)
+{
+ if (memccpy(dest, src, 0, n))
+ return 1;
+
+ if (n > 0)
+ dest[n - 1] = '\0';
+
+ return 0;
+}
/* needed to include args.h */
#define ARG_COUNTABLE 0x00000001
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=238a79aac41fcba6…
Commit: 238a79aac41fcba65e7ac9c75f05275ab5915de6
Parent: 995f7aa92fb4a80ccb3bb9f78a396be15932baf3
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 17 13:16:27 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 17 13:20:55 2017 +0100
cleanup: unused uninit vars
---
tools/command.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index cdea72c..a4139f0 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1326,7 +1326,7 @@ static int copy_line(char *line, int max_line, int *position)
int define_commands(char *run_name)
{
- struct command *cmd;
+ struct command *cmd = NULL;
char line[MAX_LINE];
char line_orig[MAX_LINE];
char *line_argv[MAX_LINE_ARGC];
@@ -1824,7 +1824,6 @@ static void print_def_man(struct arg_def *def, int usage)
int val_enum;
int lvt_enum;
int sep = 0;
- int i;
for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
if (def->val_bits & val_enum_to_bit(val_enum)) {
@@ -1927,7 +1926,7 @@ void print_man_usage(char *lvmname, struct command *cmd)
{
struct command_name *cname;
int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
- int i, sep, ro, rp, oo, op, opt_enum;
+ int sep, ro, rp, oo, op, opt_enum;
int need_ro_indent_end = 0;
if (!(cname = find_command_name(cmd->name)))
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=995f7aa92fb4a80c…
Commit: 995f7aa92fb4a80ccb3bb9f78a396be15932baf3
Parent: 46d6c7d3ad0f5a4151960202635f3805dc0e3f15
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 17 13:09:06 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 17 13:20:55 2017 +0100
cleanup: use strchr for 1-byte lookup
---
tools/command.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 5342ba2..cdea72c 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -337,7 +337,7 @@ static int val_str_to_num(char *str)
/* compare the name before any suffix like _new or _<lvtype> */
dm_strncpy(name, str, sizeof(name));
- if ((new = strstr(name, "_")))
+ if ((new = strchr(name, '_')))
*new = '\0';
for (i = 0; i < VAL_COUNT; i++) {
@@ -561,7 +561,7 @@ static int is_pos_name(char *str)
static int is_oo_definition(char *str)
{
- if (!strncmp(str, "OO_", 3) && strstr(str, ":"))
+ if (!strncmp(str, "OO_", 3) && strchr(str, ':'))
return 1;
return 0;
}
@@ -644,7 +644,7 @@ static void set_pos_def(struct command *cmd, char *str, struct arg_def *def)
def->val_bits |= val_enum_to_bit(val_enum);
- if ((val_enum == lv_VAL) && strstr(name, "_"))
+ if ((val_enum == lv_VAL) && strchr(name, '_'))
def->lvt_bits = lv_to_bits(cmd, name);
if (strstr(name, "_new")) {
@@ -702,7 +702,7 @@ static void set_opt_def(struct command *cmd, char *str, struct arg_def *def)
def->str = dm_strdup(name);
if (val_enum == lv_VAL) {
- if (strstr(name, "_"))
+ if (strchr(name, '_'))
def->lvt_bits = lv_to_bits(cmd, name);
}
@@ -735,7 +735,7 @@ static void add_oo_definition_line(struct command *cmd, const char *name, const
oo = &oo_lines[oo_line_count++];
oo->name = dm_strdup(name);
- if ((colon = strstr(oo->name, ":")))
+ if ((colon = strchr(oo->name, ':')))
*colon = '\0';
else {
log_error("Parsing command defs: invalid OO definition");
@@ -743,7 +743,7 @@ static void add_oo_definition_line(struct command *cmd, const char *name, const
return;
}
- start = strstr(line, ":") + 2;
+ start = strchr(line, ':') + 2;
oo->line = dm_strdup(start);
}
@@ -786,9 +786,9 @@ static char *get_oo_line(const char *str)
int i;
dm_strncpy(str2, str, sizeof(str2));
- if ((end = strstr(str2, ":")))
+ if ((end = strchr(str2, ':')))
*end = '\0';
- if ((end = strstr(str2, ",")))
+ if ((end = strchr(str2, ',')))
*end = '\0';
for (i = 0; i < oo_line_count; i++) {
@@ -840,7 +840,7 @@ static void add_opt_arg(struct command *cmd, char *str, int *takes_arg, int requ
/* opt_arg.opt set here */
/* opt_arg.def will be set in update_prev_opt_arg() if needed */
- if ((comma = strstr(str, ",")))
+ if ((comma = strchr(str, ',')))
*comma = '\0';
/*
@@ -884,7 +884,7 @@ static void update_prev_opt_arg(struct command *cmd, char *str, int required)
/* opt_arg.def set here */
/* opt_arg.opt was previously set in add_opt_arg() when --foo was read */
- if ((comma = strstr(str, ",")))
+ if ((comma = strchr(str, ',')))
*comma = '\0';
set_opt_def(cmd, str, &def);
@@ -1792,7 +1792,7 @@ static void print_val_man(const char *str)
return;
}
- if (strstr(str, "|")) {
+ if (strchr(str, '|')) {
int len = strlen(str);
line = dm_strdup(str);
split_line(line, &line_argc, line_argv, '|');
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=46d6c7d3ad0f5a41…
Commit: 46d6c7d3ad0f5a4151960202635f3805dc0e3f15
Parent: 772834e40aef44a8f7bc884050e1b88087073706
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 17 11:51:24 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 17 13:20:55 2017 +0100
cleanup: add comment for longer macro
---
tools/command.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index b202878..5342ba2 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -145,11 +145,11 @@ enum {
#undef lvt
};
-#else
+#else /* MAN_PAGE_GENERATOR */
#include "tools.h"
-#endif
+#endif /* MAN_PAGE_GENERATOR */
#include "command.h" /* defines struct command */
#include "command-count.h" /* defines COMMAND_COUNT */
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=772834e40aef44a8…
Commit: 772834e40aef44a8f7bc884050e1b88087073706
Parent: 582a272b3f401e1bb6eafaa52d0ed1d318d04a9f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 17 10:00:43 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 17 13:20:55 2017 +0100
commands: optimize binary search
Since there is a lot of options and lot of searches,
use binary search to keep strcmp at minimum.
The interesting part is - alphabetically sorted array contains
duplicates and some of them are not the 'right anwer', so
after we find matching string but not matching long_ARG,
we may need to check if the surrouding strings are the right matching
one.
The single loops is used also for strictly define --foo_long
(i.e. --stripes) and just differs at final part.
TODO1: replace strstr call with some flag (just like short_opt).
TODO2: drop '--' from being stored and tests by strcmp.
---
tools/command.c | 79 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index e5a4640..b202878 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -359,46 +359,57 @@ static int opt_str_to_num(struct command *cmd, char *str)
char long_name[MAX_LONG_OPT_NAME_LEN];
char *p;
int i;
+ int first = 0, last = ARG_COUNT - 1, middle;
- /*
- * --foo_long means there are two args entries
- * for --foo, one with a short option and one
- * without, and we want the one without the
- * short option.
- */
- if (strstr(str, "_long")) {
- memset(long_name, 0, sizeof(long_name));
- strncpy(long_name, str, MAX_LONG_OPT_NAME_LEN-1);
- if ((p = strstr(long_name, "_long")))
- *p = '\0';
-
- for (i = 0; i < ARG_COUNT; i++) {
- if (!opt_names[i].long_opt)
- continue;
- /* skip anything with a short opt */
- if (opt_names[i].short_opt)
- continue;
- if (!strcmp(opt_names[i].long_opt, long_name))
- return opt_names[i].opt_enum;
- }
+ dm_strncpy(long_name, str, sizeof(long_name));
- log_error("Parsing command defs: unknown opt str: %s %s", str, long_name);
- cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
- return ARG_UNUSED;
- }
+ if ((p = strstr(long_name, "_long")))
+ /*
+ * --foo_long means there are two args entries
+ * for --foo, one with a short option and one
+ * without, and we want the one without the
+ * short option (== 0).
+ */
+ *p = '\0';
- for (i = 0; i < ARG_COUNT; i++) {
- if (!opt_names[i].long_opt)
- continue;
- /* These are only selected using --foo_long */
- if (strstr(opt_names[i].name, "_long_ARG"))
- continue;
- if (!strcmp(opt_names[i].long_opt, str))
- return opt_names[i].opt_enum;
+ /* Binary search in sorted array of long options (with duplicates) */
+ while (first <= last) {
+ middle = first + (last - first) / 2;
+ if ((i = strcmp(opt_names_alpha[middle]->long_opt, long_name)) < 0)
+ first = middle + 1;
+ else if (i > 0)
+ last = middle - 1;
+ else {
+ /* Matching long option string found.
+ * As sorted array contains duplicates, we need to also
+ * check left & right side for possible match
+ */
+ for (i = middle;;) {
+ if ((!p && !strstr(opt_names_alpha[i]->name, "_long_ARG")) ||
+ (p && !opt_names_alpha[i]->short_opt))
+ return opt_names_alpha[i]->opt_enum; /* Found */
+ /* Check if there is something on the 'left-side' */
+ if ((i <= first) || strcmp(opt_names_alpha[--i]->long_opt, long_name))
+ break;
+ }
+
+ /* Nothing on the left, so look on the 'right-side' */
+ for (i = middle + 1; i <= last; ++i) {
+ if (strcmp(opt_names_alpha[i]->long_opt, long_name))
+ break;
+ if ((!p && !strstr(opt_names_alpha[i]->name, "_long_ARG")) ||
+ (p && !opt_names_alpha[i]->short_opt))
+ return opt_names_alpha[i]->opt_enum; /* Found */
+ }
+
+ break; /* Nothing... */
+ }
}
- log_error("Parsing command defs: unknown opt str: \"%s\"", str);
+ log_error("Parsing command defs: unknown opt str: \"%s\"%s%s.",
+ str, p ? " ": "", p ? long_name : "");
cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+
return ARG_UNUSED;
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=582a272b3f401e1b…
Commit: 582a272b3f401e1bb6eafaa52d0ed1d318d04a9f
Parent: 80b717af0c1c0602537a6e4d5fad76e09733f028
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 17 09:59:29 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 17 13:11:33 2017 +0100
commands: use dm_strncpy
Easier code using dm_strncpy() an dm_snprintf().
---
tools/command.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index f1b9d8e..e5a4640 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -330,13 +330,13 @@ static char *split_line(char *buf, int *argc, char **argv, char sep)
static int val_str_to_num(char *str)
{
- char name[32] = { 0 };
+ char name[32];
char *new;
int i;
/* compare the name before any suffix like _new or _<lvtype> */
- strncpy(name, str, 31);
+ dm_strncpy(name, str, sizeof(name));
if ((new = strstr(name, "_")))
*new = '\0';
@@ -757,12 +757,8 @@ static void append_oo_definition_line(struct command *cmd, const char *new_line)
cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
return;
}
- memset(line, 0, len);
-
- strcat(line, old_line);
- strcat(line, " ");
- strcat(line, new_line);
+ (void) dm_snprintf(line, len, "%s %s", old_line, new_line);
dm_free(oo->line);
oo->line = line;
}
@@ -778,8 +774,7 @@ static char *get_oo_line(const char *str)
char str2[OO_NAME_LEN];
int i;
- memset(str2, 0, sizeof(str2));
- strncpy(str2, str, OO_NAME_LEN-1);
+ dm_strncpy(str2, str, sizeof(str2));
if ((end = strstr(str2, ":")))
*end = '\0';
if ((end = strstr(str2, ",")))
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=80b717af0c1c0602…
Commit: 80b717af0c1c0602537a6e4d5fad76e09733f028
Parent: 298b11aed1f1517329dc6e5ead661855b1abfb05
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 17 11:52:37 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 17 13:00:05 2017 +0100
commands: cheap optimisation for parser
Some low-hanging fruits to cut of signification number of strcmp calls.
---
tools/command.c | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 5b31b4e..f1b9d8e 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -495,31 +495,32 @@ static struct command_name *find_command_name(const char *name)
{
int i;
+ if (!islower(name[0]))
+ return NULL; /* Commands starts with lower-case */
+
for (i = 0; i < MAX_COMMAND_NAMES; i++) {
if (!command_names[i].name)
break;
if (!strcmp(command_names[i].name, name))
return &command_names[i];
}
+
return NULL;
}
static const char *is_command_name(char *str)
{
- int i;
+ const struct command_name *c;
+
+ if ((c = find_command_name(str)))
+ return c->name;
- for (i = 0; i < MAX_COMMAND_NAMES; i++) {
- if (!command_names[i].name)
- break;
- if (!strcmp(command_names[i].name, str))
- return command_names[i].name;
- }
return NULL;
}
static int is_opt_name(char *str)
{
- if (!strncmp(str, "--", 2))
+ if ((str[0] == '-') && (str[1] == '-'))
return 1;
if ((str[0] == '-') && (str[1] != '-'))
@@ -535,18 +536,15 @@ static int is_opt_name(char *str)
static int is_pos_name(char *str)
{
- if (!strncmp(str, "VG", 2))
- return 1;
- if (!strncmp(str, "LV", 2))
- return 1;
- if (!strncmp(str, "PV", 2))
- return 1;
- if (!strncmp(str, "Tag", 3))
- return 1;
- if (!strncmp(str, "String", 6))
- return 1;
- if (!strncmp(str, "Select", 6))
- return 1;
+ switch (str[0]) {
+ case 'V': return (str[1] == 'G'); /* VG */
+ case 'L': return (str[1] == 'V'); /* LV */
+ case 'P': return (str[1] == 'V'); /* PV */
+ case 'T': return (strncmp(str, "Tag", 3) == 0);
+ case 'S': return ((strncmp(str, "String", 6) == 0) ||
+ (strncmp(str, "Select", 6) == 0));
+ }
+
return 0;
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=298b11aed1f15173…
Commit: 298b11aed1f1517329dc6e5ead661855b1abfb05
Parent: 1cb95fa5a050c5056d882ef9cbb01ce8040df019
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Feb 16 15:26:42 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Feb 16 15:26:42 2017 -0600
commands: track errors in command def parsing
When parsing command defs, track and report all
errors that are found. Add an error return case
from define_commands so the standard error exit
path is used.
---
tools/command.c | 126 +++++++++++++++++++++++++++++++--------------------
tools/command.h | 1 +
tools/lvm2cmdline.h | 2 +-
tools/lvmcmdlib.c | 3 +-
tools/lvmcmdline.c | 22 +++++++--
5 files changed, 97 insertions(+), 57 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 6814a54..5b31b4e 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -354,7 +354,7 @@ static int val_str_to_num(char *str)
#define MAX_LONG_OPT_NAME_LEN 32
-static int opt_str_to_num(char *str)
+static int opt_str_to_num(struct command *cmd, char *str)
{
char long_name[MAX_LONG_OPT_NAME_LEN];
char *p;
@@ -383,7 +383,8 @@ static int opt_str_to_num(char *str)
}
log_error("Parsing command defs: unknown opt str: %s %s", str, long_name);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return ARG_UNUSED;
}
for (i = 0; i < ARG_COUNT; i++) {
@@ -397,7 +398,8 @@ static int opt_str_to_num(char *str)
}
log_error("Parsing command defs: unknown opt str: \"%s\"", str);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return ARG_UNUSED;
}
/* "foo" string to foo_CMD int */
@@ -410,13 +412,13 @@ int command_id_to_enum(const char *str)
if (!strcmp(str, cmd_names[i].name))
return cmd_names[i].cmd_enum;
}
- log_error("Parsing command defs: unknown cmd name %s", str);
- exit(EXIT_FAILURE);
+
+ return CMD_NONE;
}
/* "lv_is_prop" to is_prop_LVP */
-static int lvp_name_to_enum(char *str)
+static int lvp_name_to_enum(struct command *cmd, char *str)
{
int i;
@@ -424,13 +426,15 @@ static int lvp_name_to_enum(char *str)
if (!strcmp(str, lvp_names[i].name))
return lvp_names[i].lvp_enum;
}
+
log_error("Parsing command defs: unknown lv property %s", str);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return LVP_NONE;
}
/* "type" to type_LVT */
-static int lvt_name_to_enum(char *str)
+static int lvt_name_to_enum(struct command *cmd, char *str)
{
int i;
@@ -438,15 +442,17 @@ static int lvt_name_to_enum(char *str)
if (!strcmp(str, lvt_names[i].name))
return lvt_names[i].lvt_enum;
}
+
log_error("Parsing command defs: unknown lv type %s", str);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return LVT_NONE;
}
/* LV_<type> to <type>_LVT */
-static int lv_to_enum(char *name)
+static int lv_to_enum(struct command *cmd, char *name)
{
- return lvt_name_to_enum(name + 3);
+ return lvt_name_to_enum(cmd, name + 3);
}
/*
@@ -460,7 +466,7 @@ static int lv_to_enum(char *name)
#define LVTYPE_LEN 64
-static uint64_t lv_to_bits(char *name)
+static uint64_t lv_to_bits(struct command *cmd, char *name)
{
char buf[LVTYPE_LEN];
char *argv[MAX_LINE_ARGC];
@@ -478,7 +484,7 @@ static uint64_t lv_to_bits(char *name)
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "new"))
continue;
- lvt_enum = lvt_name_to_enum(argv[i]);
+ lvt_enum = lvt_name_to_enum(cmd, argv[i]);
lvt_bits |= lvt_enum_to_bit(lvt_enum);
}
@@ -516,10 +522,8 @@ static int is_opt_name(char *str)
if (!strncmp(str, "--", 2))
return 1;
- if ((str[0] == '-') && (str[1] != '-')) {
+ if ((str[0] == '-') && (str[1] != '-'))
log_error("Parsing command defs: options must be specified in long form: %s", str);
- exit(EXIT_FAILURE);
- }
return 0;
}
@@ -625,13 +629,14 @@ static void set_pos_def(struct command *cmd, char *str, struct arg_def *def)
if (!val_enum) {
log_error("Parsing command defs: unknown pos arg: %s", name);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
def->val_bits |= val_enum_to_bit(val_enum);
if ((val_enum == lv_VAL) && strstr(name, "_"))
- def->lvt_bits = lv_to_bits(name);
+ def->lvt_bits = lv_to_bits(cmd, name);
if (strstr(name, "_new")) {
if (val_enum == lv_VAL)
@@ -673,7 +678,8 @@ static void set_opt_def(struct command *cmd, char *str, struct arg_def *def)
else {
log_error("Parsing command defs: unknown opt arg: %s", name);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
}
@@ -688,7 +694,7 @@ static void set_opt_def(struct command *cmd, char *str, struct arg_def *def)
if (val_enum == lv_VAL) {
if (strstr(name, "_"))
- def->lvt_bits = lv_to_bits(name);
+ def->lvt_bits = lv_to_bits(cmd, name);
}
if (strstr(name, "_new")) {
@@ -711,7 +717,7 @@ static void set_opt_def(struct command *cmd, char *str, struct arg_def *def)
* oo->line = "--opt1 ...";
*/
-static void add_oo_definition_line(const char *name, const char *line)
+static void add_oo_definition_line(struct command *cmd, const char *name, const char *line)
{
struct oo_line *oo;
char *colon;
@@ -724,7 +730,8 @@ static void add_oo_definition_line(const char *name, const char *line)
*colon = '\0';
else {
log_error("Parsing command defs: invalid OO definition");
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
start = strstr(line, ":") + 2;
@@ -733,7 +740,7 @@ static void add_oo_definition_line(const char *name, const char *line)
/* Support OO_FOO: continuing on multiple lines. */
-static void append_oo_definition_line(const char *new_line)
+static void append_oo_definition_line(struct command *cmd, const char *new_line)
{
struct oo_line *oo;
char *old_line;
@@ -749,7 +756,8 @@ static void append_oo_definition_line(const char *new_line)
line = dm_malloc(len);
if (!line) {
log_error("Parsing command defs: no memory");
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
memset(line, 0, len);
@@ -801,11 +809,14 @@ static void include_optional_opt_args(struct command *cmd, const char *str)
if (!(oo_line = get_oo_line(str))) {
log_error("Parsing command defs: no OO line found for %s", str);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
- if (!(line = dm_strdup(oo_line)))
- exit(EXIT_FAILURE);
+ if (!(line = dm_strdup(oo_line))) {
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
+ }
split_line(line, &line_argc, line_argv, ' ');
add_optional_opt_line(cmd, line_argc, line_argv);
@@ -838,7 +849,7 @@ static void add_opt_arg(struct command *cmd, char *str, int *takes_arg, int requ
goto skip;
}
- opt = opt_str_to_num(str);
+ opt = opt_str_to_num(cmd, str);
skip:
if (required > 0)
cmd->required_opt_args[cmd->ro_count++].opt = opt;
@@ -846,8 +857,6 @@ skip:
cmd->optional_opt_args[cmd->oo_count++].opt = opt;
else if (required < 0)
cmd->ignore_opt_args[cmd->io_count++].opt = opt;
- else
- exit(EXIT_FAILURE);
*takes_arg = opt_names[opt].val_enum ? 1 : 0;
}
@@ -864,7 +873,8 @@ static void update_prev_opt_arg(struct command *cmd, char *str, int required)
if (str[0] == '-') {
log_error("Parsing command defs: option %s must be followed by an arg.", str);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
/* opt_arg.def set here */
@@ -882,7 +892,7 @@ static void update_prev_opt_arg(struct command *cmd, char *str, int required)
else if (required < 0)
cmd->ignore_opt_args[cmd->io_count-1].def = def;
else
- exit(EXIT_FAILURE);
+ return;
}
/*
@@ -926,7 +936,8 @@ static void update_prev_pos_arg(struct command *cmd, char *str, int required)
def->flags |= ARG_DEF_FLAG_MAY_REPEAT;
else {
log_error("Parsing command defs: unknown pos arg: %s", str);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
}
@@ -949,7 +960,8 @@ static void add_optional_opt_line(struct command *cmd, int argc, char *argv[])
else {
log_error("Parsing command defs: can't parse argc %d argv %s prev %s",
i, argv[i], argv[i-1]);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
}
}
@@ -971,7 +983,8 @@ static void add_ignore_opt_line(struct command *cmd, int argc, char *argv[])
else {
log_error("Parsing command defs: can't parse argc %d argv %s prev %s",
i, argv[i], argv[i-1]);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
}
}
@@ -1005,7 +1018,8 @@ static void add_required_opt_line(struct command *cmd, int argc, char *argv[])
else {
log_error("Parsing command defs: can't parse argc %d argv %s prev %s",
i, argv[i], argv[i-1]);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
}
}
@@ -1028,11 +1042,14 @@ static void include_required_opt_args(struct command *cmd, char *str)
if (!(oo_line = get_oo_line(str))) {
log_error("Parsing command defs: no OO line found for %s", str);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
- if (!(line = dm_strdup(oo_line)))
- exit(EXIT_FAILURE);
+ if (!(line = dm_strdup(oo_line))) {
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
+ }
split_line(line, &line_argc, line_argv, ' ');
add_required_opt_line(cmd, line_argc, line_argv);
@@ -1080,9 +1097,9 @@ static void add_required_line(struct command *cmd, int argc, char *argv[])
} else {
log_error("Parsing command defs: can't parse argc %d argv %s prev %s",
i, argv[i], argv[i-1]);
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
-
}
}
@@ -1105,7 +1122,8 @@ static void add_rule(struct command *cmd, char *line)
if (cmd->rule_count == CMD_MAX_RULES) {
log_error("Parsing command defs: too many rules for cmd");
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
rule = &cmd->rules[cmd->rule_count++];
@@ -1134,7 +1152,8 @@ static void add_rule(struct command *cmd, char *line)
if (!rule->opts) {
if (!(rule->opts = dm_malloc(MAX_RULE_OPTS * sizeof(int)))) {
log_error("Parsing command defs: no mem");
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
memset(rule->opts, 0, MAX_RULE_OPTS * sizeof(int));
}
@@ -1142,19 +1161,20 @@ static void add_rule(struct command *cmd, char *line)
if (!rule->check_opts) {
if (!(rule->check_opts = dm_malloc(MAX_RULE_OPTS * sizeof(int)))) {
log_error("Parsing command defs: no mem");
- exit(EXIT_FAILURE);
+ cmd->cmd_flags |= CMD_FLAG_PARSE_ERROR;
+ return;
}
memset(rule->check_opts, 0, MAX_RULE_OPTS * sizeof(int));
}
if (check)
- rule->check_opts[rule->check_opts_count++] = opt_str_to_num(arg);
+ rule->check_opts[rule->check_opts_count++] = opt_str_to_num(cmd, arg);
else
- rule->opts[rule->opts_count++] = opt_str_to_num(arg);
+ rule->opts[rule->opts_count++] = opt_str_to_num(cmd, arg);
}
else if (!strncmp(arg, "LV_", 3)) {
- lvt_enum = lv_to_enum(arg);
+ lvt_enum = lv_to_enum(cmd, arg);
if (check)
rule->check_lvt_bits |= lvt_enum_to_bit(lvt_enum);
@@ -1163,7 +1183,7 @@ static void add_rule(struct command *cmd, char *line)
}
else if (!strncmp(arg, "lv_is_", 6)) {
- lvp_enum = lvp_name_to_enum(arg);
+ lvp_enum = lvp_name_to_enum(cmd, arg);
if (check)
rule->check_lvp_bits |= lvp_enum_to_bit(lvp_enum);
@@ -1315,6 +1335,7 @@ int define_commands(char *run_name)
int prev_was_op = 0;
int copy_pos = 0;
int skip = 0;
+ int i;
if (run_name && !strcmp(run_name, "help"))
run_name = NULL;
@@ -1408,7 +1429,7 @@ int define_commands(char *run_name)
/* OO_FOO: ... */
if (is_oo_definition(line_argv[0])) {
- add_oo_definition_line(line_argv[0], line_orig);
+ add_oo_definition_line(cmd, line_argv[0], line_orig);
prev_was_oo_def = 1;
prev_was_oo = 0;
prev_was_op = 0;
@@ -1444,7 +1465,7 @@ int define_commands(char *run_name)
/* handle OO_FOO:, OO:, OP: continuing on multiple lines */
if (prev_was_oo_def) {
- append_oo_definition_line(line_orig);
+ append_oo_definition_line(cmd, line_orig);
continue;
}
@@ -1459,6 +1480,11 @@ int define_commands(char *run_name)
}
}
+ for (i = 0; i < COMMAND_COUNT; i++) {
+ if (commands[i].cmd_flags & CMD_FLAG_PARSE_ERROR)
+ return 0;
+ }
+
/*
* For usage.
* Predefined string of options common to all commands
diff --git a/tools/command.h b/tools/command.h
index 0c3f9f3..fcf0ccb 100644
--- a/tools/command.h
+++ b/tools/command.h
@@ -166,6 +166,7 @@ struct cmd_rule {
*/
#define CMD_FLAG_ONE_REQUIRED_OPT 1 /* lvchange/vgchage require one item from required_opt_args */
#define CMD_FLAG_SECONDARY_SYNTAX 2 /* allows syntax variants to be suppressed in certain output */
+#define CMD_FLAG_PARSE_ERROR 4 /* error parsing command-lines.in def */
/* a register of the lvm commands */
struct command {
diff --git a/tools/lvm2cmdline.h b/tools/lvm2cmdline.h
index 00162a4..5c5eaee 100644
--- a/tools/lvm2cmdline.h
+++ b/tools/lvm2cmdline.h
@@ -32,7 +32,7 @@ void *cmdlib_lvm2_init(unsigned static_compile);
void lvm_fin(struct cmd_context *cmd);
struct cmd_context *init_lvm(unsigned set_connections, unsigned set_filters);
-void lvm_register_commands(char *name);
+int lvm_register_commands(char *name);
int lvm_split(char *str, int *argc, char **argv, int max);
int lvm_run_command(struct cmd_context *cmd, int argc, char **argv);
int lvm_return_code(int ret);
diff --git a/tools/lvmcmdlib.c b/tools/lvmcmdlib.c
index 9e50343..8f15c1f 100644
--- a/tools/lvmcmdlib.c
+++ b/tools/lvmcmdlib.c
@@ -34,7 +34,8 @@ void *cmdlib_lvm2_init(unsigned static_compile)
if (!(cmd = init_lvm(1, 1)))
return NULL;
- lvm_register_commands(NULL);
+ if (!lvm_register_commands(NULL))
+ return NULL;
return (void *) cmd;
}
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index e599ded..7e50d05 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1126,13 +1126,13 @@ static struct command_function *_find_command_id_function(int command_enum)
return NULL;
}
-void lvm_register_commands(char *name)
+int lvm_register_commands(char *name)
{
int i;
/* already initialized */
if (_cmdline.commands)
- return;
+ return 1;
memset(&commands, 0, sizeof(commands));
@@ -1141,8 +1141,8 @@ void lvm_register_commands(char *name)
* by parsing command-lines.in/command-lines-input.h
*/
if (!define_commands(name)) {
- log_error("Failed to parse command definitions.");
- return;
+ log_error(INTERNAL_ERROR "Failed to parse command definitions.");
+ return 0;
}
_cmdline.commands = commands;
@@ -1151,6 +1151,13 @@ void lvm_register_commands(char *name)
for (i = 0; i < COMMAND_COUNT; i++) {
commands[i].command_enum = command_id_to_enum(commands[i].command_id);
+ if (!commands[i].command_enum) {
+ log_error(INTERNAL_ERROR "Failed to find command id %s.", commands[i].command_id);
+ _cmdline.commands = NULL;
+ _cmdline.num_commands = 0;
+ return 0;
+ }
+
/* new style */
commands[i].functions = _find_command_id_function(commands[i].command_enum);
@@ -1172,6 +1179,8 @@ void lvm_register_commands(char *name)
for (i = 0; i < _cmdline.num_command_names; i++)
_set_valid_args_for_command_name(i);
+
+ return 1;
}
struct lv_props *get_lv_prop(int lvp_enum)
@@ -3214,7 +3223,10 @@ int lvm2_main(int argc, char **argv)
else
name = argv[1];
- lvm_register_commands(name);
+ if (!lvm_register_commands(name)) {
+ ret = ECMD_FAILED;
+ goto out;
+ }
if (_lvm1_fallback(cmd)) {
/* Attempt to run equivalent LVM1 tool instead */
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1cb95fa5a050c505…
Commit: 1cb95fa5a050c5056d882ef9cbb01ce8040df019
Parent: 15f51bc42113494bfb49fbc0d6a1913f68fb80a8
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Feb 16 13:59:52 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Feb 16 13:59:52 2017 -0600
commands: initialize commands[] once
When using liblvm2cmd, a process can do multiple
init/exit calls, i.e.
lvm2_init(); lvm2_run(); lvm2_exit();
lvm2_init(); lvm2_run(); lvm2_exit();
...
define_commands() needs to set up the global commands[]
definitions only the first time.
---
tools/lvmcmdline.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index ed32f1c..e599ded 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1130,6 +1130,10 @@ void lvm_register_commands(char *name)
{
int i;
+ /* already initialized */
+ if (_cmdline.commands)
+ return;
+
memset(&commands, 0, sizeof(commands));
/*
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=15f51bc42113494b…
Commit: 15f51bc42113494bfb49fbc0d6a1913f68fb80a8
Parent: 22bee4fbdbf3cf52ac6a390b3c1ae983b5350760
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Feb 16 09:36:55 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Thu Feb 16 09:37:28 2017 -0600
commands: avoid factoring options until needed
---
tools/command.c | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 9f2256b..6814a54 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1197,6 +1197,10 @@ static void factor_common_options(void)
if (!command_names[cn].name)
break;
+ /* already factored */
+ if (command_names[cn].variants)
+ continue;
+
for (ci = 0; ci < COMMAND_COUNT; ci++) {
cmd = &commands[ci];
@@ -1457,17 +1461,10 @@ int define_commands(char *run_name)
/*
* For usage.
- * Looks at all variants of each command name and figures out
- * which options are common to all variants (for compact output)
- */
- factor_common_options();
-
- /*
- * For usage.
* Predefined string of options common to all commands
* (for compact output)
*/
- include_optional_opt_args(&lvm_all, "OO_USAGE_COMMON");
+ include_optional_opt_args(&lvm_all, "OO_USAGE_COMMON");
return 1;
}
@@ -1564,6 +1561,12 @@ void print_usage(struct command *cmd)
int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
int ro, rp, oo, op, opt_enum, first;
+ /*
+ * Looks at all variants of each command name and figures out
+ * which options are common to all variants (for compact output)
+ */
+ factor_common_options();
+
if (cmd->desc)
_print_usage_description(cmd);
@@ -2717,6 +2720,8 @@ int main(int argc, char *argv[])
define_commands(NULL);
+ factor_common_options();
+
print_man(argv[1], (argc > 2) ? argv[2] : NULL, 1, 1);
return 0;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=22bee4fbdbf3cf52…
Commit: 22bee4fbdbf3cf52ac6a390b3c1ae983b5350760
Parent: 81c0ed9fc6d598ef221e2089e1fd125990a7a626
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Feb 15 14:00:09 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Feb 15 15:51:46 2017 -0600
help/man: remove commas from list of options
Using commas between options does not seem to
be done anywhere else, so remove them.
---
tools/command.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index ac72c49..9f2256b 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1624,7 +1624,7 @@ void print_usage(struct command *cmd)
if (first)
printf("\n\t[");
else
- printf(",\n\t ");
+ printf("\n\t ");
first = 0;
printf(" %s", opt_names[opt_enum].long_opt);
@@ -1637,7 +1637,7 @@ void print_usage(struct command *cmd)
if (first)
printf("\n\t[");
else
- printf(",\n\t ");
+ printf("\n\t ");
printf(" COMMON_OPTIONS ]");
}
@@ -1687,7 +1687,7 @@ void print_usage_common(struct command_name *cname, struct command *cmd)
if (first)
printf("\n\t[");
else
- printf(",\n\t ");
+ printf("\n\t ");
first = 0;
for (oo = 0; oo < cmd->oo_count; oo++) {
@@ -1712,7 +1712,7 @@ void print_usage_common(struct command_name *cname, struct command *cmd)
if (first)
printf("\n\t[");
else
- printf(",\n\t ");
+ printf("\n\t ");
first = 0;
printf(" %s", opt_names[opt_enum].long_opt);
@@ -2081,7 +2081,6 @@ void print_man_usage(char *lvmname, struct command *cmd)
continue;
if (sep) {
- printf(",");
printf("\n.br\n");
printf(" ");
}
@@ -2112,7 +2111,6 @@ void print_man_usage(char *lvmname, struct command *cmd)
continue;
if (sep) {
- printf(",");
printf("\n.br\n");
printf(" ");
}
@@ -2130,7 +2128,6 @@ void print_man_usage(char *lvmname, struct command *cmd)
}
if (sep) {
- printf(",");
printf("\n.br\n");
printf(" ");
/* space alignment without short opt */
@@ -2209,7 +2206,6 @@ void print_man_usage_common(struct command *cmd)
continue;
if (sep) {
- printf(",");
printf("\n.br\n");
printf(" ");
}
@@ -2246,7 +2242,6 @@ void print_man_usage_common(struct command *cmd)
continue;
if (sep) {
- printf(",");
printf("\n.br\n");
printf(" ");
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=81c0ed9fc6d598ef…
Commit: 81c0ed9fc6d598ef221e2089e1fd125990a7a626
Parent: 6a5c9ba34902193ac9d03fe30976d259391905b3
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Feb 15 15:49:18 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Feb 15 15:49:18 2017 -0600
commands: use dm wrappers for malloc/free
---
tools/command.c | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index aa33d5c..ac72c49 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -45,6 +45,10 @@ do { \
printf(fmt "\n", ##args); \
} while (0)
+#define dm_malloc malloc
+#define dm_free free
+#define dm_strdup strdup
+
/* needed to include args.h */
#define ARG_COUNTABLE 0x00000001
#define ARG_GROUPABLE 0x00000002
@@ -680,7 +684,7 @@ static void set_opt_def(struct command *cmd, char *str, struct arg_def *def)
def->num = (uint64_t)atoi(name);
if (val_enum == conststr_VAL)
- def->str = strdup(name);
+ def->str = dm_strdup(name);
if (val_enum == lv_VAL) {
if (strstr(name, "_"))
@@ -714,7 +718,7 @@ static void add_oo_definition_line(const char *name, const char *line)
char *start;
oo = &oo_lines[oo_line_count++];
- oo->name = strdup(name);
+ oo->name = dm_strdup(name);
if ((colon = strstr(oo->name, ":")))
*colon = '\0';
@@ -724,7 +728,7 @@ static void add_oo_definition_line(const char *name, const char *line)
}
start = strstr(line, ":") + 2;
- oo->line = strdup(start);
+ oo->line = dm_strdup(start);
}
/* Support OO_FOO: continuing on multiple lines. */
@@ -742,7 +746,7 @@ static void append_oo_definition_line(const char *new_line)
/* +2 = 1 space between old and new + 1 terminating \0 */
len = strlen(old_line) + strlen(new_line) + 2;
- line = malloc(len);
+ line = dm_malloc(len);
if (!line) {
log_error("Parsing command defs: no memory");
exit(EXIT_FAILURE);
@@ -753,7 +757,7 @@ static void append_oo_definition_line(const char *new_line)
strcat(line, " ");
strcat(line, new_line);
- free(oo->line);
+ dm_free(oo->line);
oo->line = line;
}
@@ -800,12 +804,12 @@ static void include_optional_opt_args(struct command *cmd, const char *str)
exit(EXIT_FAILURE);
}
- if (!(line = strdup(oo_line)))
+ if (!(line = dm_strdup(oo_line)))
exit(EXIT_FAILURE);
split_line(line, &line_argc, line_argv, ' ');
add_optional_opt_line(cmd, line_argc, line_argv);
- free(line);
+ dm_free(line);
}
/*
@@ -1027,12 +1031,12 @@ static void include_required_opt_args(struct command *cmd, char *str)
exit(EXIT_FAILURE);
}
- if (!(line = strdup(oo_line)))
+ if (!(line = dm_strdup(oo_line)))
exit(EXIT_FAILURE);
split_line(line, &line_argc, line_argv, ' ');
add_required_opt_line(cmd, line_argc, line_argv);
- free(line);
+ dm_free(line);
}
/* Process what follows command_name, which are required opt/pos args. */
@@ -1128,7 +1132,7 @@ static void add_rule(struct command *cmd, char *line)
else if (!strncmp(arg, "--", 2)) {
if (!rule->opts) {
- if (!(rule->opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
+ if (!(rule->opts = dm_malloc(MAX_RULE_OPTS * sizeof(int)))) {
log_error("Parsing command defs: no mem");
exit(EXIT_FAILURE);
}
@@ -1136,7 +1140,7 @@ static void add_rule(struct command *cmd, char *line)
}
if (!rule->check_opts) {
- if (!(rule->check_opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
+ if (!(rule->check_opts = dm_malloc(MAX_RULE_OPTS * sizeof(int)))) {
log_error("Parsing command defs: no mem");
exit(EXIT_FAILURE);
}
@@ -1343,7 +1347,7 @@ int define_commands(char *run_name)
cmd = &commands[cmd_count];
cmd->command_index = cmd_count;
cmd_count++;
- cmd->name = strdup(name);
+ cmd->name = dm_strdup(name);
if (run_name && strcmp(run_name, name)) {
skip = 1;
@@ -1368,15 +1372,15 @@ int define_commands(char *run_name)
*/
if (is_desc_line(line_argv[0]) && !skip) {
- char *desc = strdup(line_orig);
+ char *desc = dm_strdup(line_orig);
if (cmd->desc) {
int newlen = strlen(cmd->desc) + strlen(desc) + 2;
- char *newdesc = malloc(newlen);
+ char *newdesc = dm_malloc(newlen);
if (newdesc) {
memset(newdesc, 0, newlen);
snprintf(newdesc, newlen, "%s %s", cmd->desc, desc);
cmd->desc = newdesc;
- free(desc);
+ dm_free(desc);
}
} else
cmd->desc = desc;
@@ -1394,7 +1398,7 @@ int define_commands(char *run_name)
}
if (is_id_line(line_argv[0])) {
- cmd->command_id = strdup(line_argv[1]);
+ cmd->command_id = dm_strdup(line_argv[1]);
continue;
}
@@ -1757,7 +1761,7 @@ static void print_val_man(const char *str)
if (strstr(str, "|")) {
int len = strlen(str);
- line = strdup(str);
+ line = dm_strdup(str);
split_line(line, &line_argc, line_argv, '|');
for (i = 0; i < line_argc; i++) {
if (i) {
1
0
15 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6a5c9ba34902193a…
Commit: 6a5c9ba34902193ac9d03fe30976d259391905b3
Parent: 2556498ee191cc9eaa505c611c5570937ff32315
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Feb 15 15:06:52 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Feb 15 15:28:54 2017 -0600
commands: use existing vg/lv name parsing functions
inside the new lv arg parsing function.
This includes getting the VG name from the env var,
and some added checks on the format of the vg/lv string.
---
tools/toollib.c | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/tools/toollib.c b/tools/toollib.c
index 6e0a4f1..842f67c 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -3362,10 +3362,10 @@ static int _get_arg_lvnames(struct cmd_context *cmd,
* came up with its own inconsistent approach.
*
* In this case, when the position arg is a single name, it is treated as an LV
- * name (not a VG name). This leaves the VG unknown. So, other option values
- * must be searched for a VG name. If one of those option values contains a
- * vgname/lvname value, then the VG name is extracted and used for the LV
- * position arg.
+ * name (not a VG name). This leaves the VG unknown. So, other option values,
+ * or env var, must be searched for a VG name. If one of the option values
+ * contains a vgname/lvname value, then the VG name is extracted and used for
+ * the LV position arg. Or, if the env var has the VG name, that is used.
*
* Other option values that are searched for a VG name are:
* --thinpool, --cachepool.
@@ -3375,21 +3375,21 @@ static int _get_arg_lvnames(struct cmd_context *cmd,
* . add vg/lv1 to arg_lvnames
*
* command lv1
- * . error: no vg name
+ * . error: no vg name (unless LVM_VG_NAME)
*
- * command --option vg/lv1 vg/lv2
+ * command --option=vg/lv1 vg/lv2
* . verify both vg names match
* . add vg to arg_vgnames
* . add vg/lv2 to arg_lvnames
*
- * command --option lv1 lv2
- * . error: no vg name
+ * command --option=lv1 lv2
+ * . error: no vg name (unless LVM_VG_NAME)
*
- * command --option vg/lv1 lv2
+ * command --option=vg/lv1 lv2
* . add vg to arg_vgnames
* . add vg/lv2 to arg_lvnames
*
- * command --option lv1 vg/lv2
+ * command --option=lv1 vg/lv2
* . add vg to arg_vgnames
* . add vg/lv2 to arg_lvnames
*/
@@ -3405,6 +3405,7 @@ static int _get_arg_lvnames_using_options(struct cmd_context *cmd,
const char *pos_vgname = NULL;
const char *opt_vgname = NULL;
const char *pos_lvname = NULL;
+ const char *env_vgname = NULL;
const char *use_vgname = NULL;
char *tmp_name;
char *split;
@@ -3440,9 +3441,12 @@ static int _get_arg_lvnames_using_options(struct cmd_context *cmd,
}
if ((split = strchr(pos_name, '/'))) {
- pos_vgname = pos_name;
- pos_lvname = split + 1;
- *split = '\0';
+ /*
+ * This splits pos_name 'x/y' into pos_vgname 'x' and pos_lvname 'y'
+ * It skips repeated '/', e.g. x//y
+ * It also checks and fails for extra '/', e.g. x/y/z
+ */
+ pos_vgname = _extract_vgname(cmd, pos_name, &pos_lvname);
} else {
pos_lvname = pos_name;
pos_vgname = NULL;
@@ -3453,7 +3457,9 @@ static int _get_arg_lvnames_using_options(struct cmd_context *cmd,
else if (arg_is_set(cmd, cachepool_ARG))
arg_name = arg_str_value(cmd, cachepool_ARG, NULL);
- if (!pos_vgname && !arg_name) {
+ env_vgname = _default_vgname(cmd);
+
+ if (!pos_vgname && !arg_name && !env_vgname) {
log_error("Cannot find VG name for LV %s.", pos_lvname);
return ECMD_FAILED;
}
@@ -3479,7 +3485,7 @@ static int _get_arg_lvnames_using_options(struct cmd_context *cmd,
opt_vgname = NULL;
}
- if (!pos_vgname && !opt_vgname) {
+ if (!pos_vgname && !opt_vgname && !env_vgname) {
log_error("Cannot find VG name for LV %s.", pos_lvname);
return ECMD_FAILED;
}
@@ -3490,7 +3496,14 @@ static int _get_arg_lvnames_using_options(struct cmd_context *cmd,
return ECMD_FAILED;
}
- use_vgname = pos_vgname ? pos_vgname : opt_vgname;
+ if (pos_vgname)
+ use_vgname = pos_vgname;
+ else if (opt_vgname)
+ use_vgname = opt_vgname;
+ else if (env_vgname)
+ use_vgname = env_vgname;
+ else
+ return_ECMD_FAILED;
if (!str_list_add(cmd->mem, arg_vgnames, dm_pool_strdup(cmd->mem, use_vgname))) {
log_error("strlist allocation failed.");
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2556498ee191cc9e…
Commit: 2556498ee191cc9eaa505c611c5570937ff32315
Parent: 4a30f5f9b0a3677af6f32260ee84ec5c2a6c8393
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Feb 15 14:09:45 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Feb 15 14:10:46 2017 -0600
lvcreate: fix LVM_VG_NAME detection
Commit d3af0e7528dbba30824379fc98cb4db437559ad5 was
not quite right in testing if the env var was set.
---
tools/lvmcmdline.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 41ae8c4..ed32f1c 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1280,7 +1280,6 @@ check_val:
static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp, char **argv)
{
const char *name;
- char *gotenv = NULL;
/*
* rp is the index in required_pos_args[] of the required positional arg.
@@ -1315,9 +1314,9 @@ static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp
(arg_is_set(cmd, name_ARG) ||
arg_is_set(cmd, thinpool_ARG) ||
arg_is_set(cmd, cachepool_ARG) ||
- (gotenv = getenv("LVM_VG_NAME")))) {
+ getenv("LVM_VG_NAME"))) {
- if (gotenv)
+ if (getenv("LVM_VG_NAME"))
return 1;
if ((name = arg_str_value(cmd, name_ARG, NULL))) {
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4a30f5f9b0a3677a…
Commit: 4a30f5f9b0a3677af6f32260ee84ec5c2a6c8393
Parent: 286d39ee3c4334e9ce0609d9136dfd6b5d6bf34a
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Feb 15 13:42:35 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Feb 15 13:42:35 2017 -0600
toollib: skip dev prefix from lv names
_get_arg_lvnames_using_options() was missing skip_dev_dir()
---
tools/toollib.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/tools/toollib.c b/tools/toollib.c
index a539878..6e0a4f1 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -3434,6 +3434,11 @@ static int _get_arg_lvnames_using_options(struct cmd_context *cmd,
return ECMD_PROCESSED;
}
+ if (*pos_name == '/') {
+ if (!(pos_name = skip_dev_dir(cmd, pos_name, NULL)))
+ return ECMD_FAILED;
+ }
+
if ((split = strchr(pos_name, '/'))) {
pos_vgname = pos_name;
pos_lvname = split + 1;
1
0
15 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=286d39ee3c4334e9…
Commit: 286d39ee3c4334e9ce0609d9136dfd6b5d6bf34a
Parent: d3af0e7528dbba30824379fc98cb4db437559ad5
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Feb 15 12:40:35 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Feb 15 12:40:35 2017 -0600
lvconvert: handle old arg quirk when combining snapshot
The old ad hoc arg parsing when combining a split snapshot
allowed the first lv to have a vgname, but not the second.
Since lvconvert now uses the standard arg parsing in
process_each_lv(), the old one-off behavior requires a
work around.
---
tools/lvconvert.c | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 502d614..a2ad115 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -3649,6 +3649,43 @@ static int _lvconvert_combine_split_snapshot_single(struct cmd_context *cmd,
int lvconvert_combine_split_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv)
{
+ const char *vgname = NULL;
+ const char *lvname1;
+ const char *lvname2;
+ char *vglv;
+ int vglv_sz;
+
+ /*
+ * Hack to accomodate an old parsing quirk that allowed the
+ * the VG name to be attached to only the LV in arg pos 1,
+ * i.e. lvconvert -s vgname/lvname lvname
+ *
+ * The LV name in arg pos 2 is the one that is processed
+ * by process_each_lv(). If that LV has no VG name, but
+ * the first LV does, then copy the VG name from arg pos 1
+ * and add it to the LV name in arg pos 2 so that the
+ * standard arg parsing in process_each_lv will find it.
+ *
+ * This is the only instance in all commands.
+ */
+
+ lvname1 = cmd->position_argv[0];
+ lvname2 = cmd->position_argv[1];
+
+ if (strstr("/", lvname1) && !strstr("/", lvname2) && !getenv("LVM_VG_NAME")) {
+ if (!validate_lvname_param(cmd, &vgname, &lvname1))
+ return_ECMD_FAILED;
+
+ vglv_sz = strlen(vgname) + strlen(lvname2) + 2;
+ if (!(vglv = dm_pool_alloc(cmd->mem, vglv_sz)) ||
+ dm_snprintf(vglv, vglv_sz, "%s/%s", vgname, lvname2) < 0) {
+ log_error("vg/lv string alloc failed.");
+ return_ECMD_FAILED;
+ }
+
+ cmd->position_argv[1] = vglv;
+ }
+
return process_each_lv(cmd, 1, cmd->position_argv + 1, NULL, NULL, READ_FOR_UPDATE,
NULL, NULL, &_lvconvert_combine_split_snapshot_single);
}
1
0
15 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d3af0e7528dbba30…
Commit: d3af0e7528dbba30824379fc98cb4db437559ad5
Parent: 7417c8acfa0e9274fbfcf3220630ac3b66e88fb4
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Feb 15 12:07:51 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Wed Feb 15 12:07:51 2017 -0600
lvcreate: LVM_VG_NAME applies even without name arg
There was a small flaw in the logic regarding when LVM_VG_NAME
can replace a VG position arg.
---
tools/lvmcmdline.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 02aaff2..41ae8c4 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1280,6 +1280,7 @@ check_val:
static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp, char **argv)
{
const char *name;
+ char *gotenv = NULL;
/*
* rp is the index in required_pos_args[] of the required positional arg.
@@ -1311,14 +1312,19 @@ static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp
if (!strcmp(cmd->name, "lvcreate") &&
(rp == 0) &&
val_bit_is_set(commands[ci].required_pos_args[rp].def.val_bits, vg_VAL) &&
- (arg_is_set(cmd, name_ARG) || arg_is_set(cmd, thinpool_ARG) || arg_is_set(cmd, cachepool_ARG))) {
+ (arg_is_set(cmd, name_ARG) ||
+ arg_is_set(cmd, thinpool_ARG) ||
+ arg_is_set(cmd, cachepool_ARG) ||
+ (gotenv = getenv("LVM_VG_NAME")))) {
+
+ if (gotenv)
+ return 1;
+
if ((name = arg_str_value(cmd, name_ARG, NULL))) {
- if (strstr(name, "/") || getenv("LVM_VG_NAME"))
+ if (strstr(name, "/"))
return 1;
}
- /* FIXME: does LVM_VG_NAME also work with --thinpool/--cachepool ? */
-
if ((name = arg_str_value(cmd, thinpool_ARG, NULL))) {
if (strstr(name, "/"))
return 1;
1
0
14 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7417c8acfa0e9274…
Commit: 7417c8acfa0e9274fbfcf3220630ac3b66e88fb4
Parent: d2c5bb5c7066142930c88275d2fb6c8552559c9a
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 14 16:02:54 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 14 16:02:54 2017 -0600
Revert "lvconvert: enable previous syntax to swap metadata"
This reverts commit 717363bb9427c02addeb22ef77396132cb30c782.
These alternate forms for swapping metadata cannot be
distinguished from the command for creating a pool.
If we were to add these alternate forms for swapping
metadata, we would need to overload the pool creation
command defs, making those definitions ambiguous.
---
tools/command-lines.in | 14 --------------
tools/lvconvert.c | 2 ++
tools/lvmcmdline.c | 2 --
tools/tools.h | 1 -
4 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index b6aa1d1..377e536 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -508,20 +508,6 @@ OO: --chunksize SizeKB, OO_LVCONVERT
ID: lvconvert_swap_pool_metadata
DESC: Swap metadata LV in a thin pool or cache pool (for repair only).
-lvconvert --poolmetadata LV --thinpool LV_thinpool
-OO: --chunksize SizeKB, OO_LVCONVERT
-ID: lvconvert_swap_thinpool_metadata
-DESC: Swap metadata LV in a thin pool (for repair only).
-DESC: (variant, use --swapmetadata).
-FLAGS: SECONDARY_SYNTAX
-
-lvconvert --poolmetadata LV --cachepool LV_cachepool
-OO: --chunksize SizeKB, OO_LVCONVERT
-ID: lvconvert_swap_cachepool_metadata
-DESC: Swap metadata LV in a cache pool (for repair only).
-DESC: (variant, use --swapmetadata).
-FLAGS: SECONDARY_SYNTAX
-
---
# lvconvert --merge is an extremely ambiguous command.
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 3897602..502d614 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -4040,6 +4040,7 @@ int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **a
NULL, NULL, &_lvconvert_swap_pool_metadata_single);
}
+#if 0
int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, char **argv)
{
struct command *new_command;
@@ -4071,6 +4072,7 @@ int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, ch
return lvconvert_swap_pool_metadata_cmd(cmd, argc, argv);
}
+#endif
static int _lvconvert_merge_thin_single(struct cmd_context *cmd,
struct logical_volume *lv,
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 65f80c8..02aaff2 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -141,8 +141,6 @@ struct command_function command_functions[CMD_COUNT] = {
{ lvconvert_to_thin_with_external_CMD, lvconvert_to_thin_with_external_cmd },
{ lvconvert_to_cache_vol_CMD, lvconvert_to_cache_vol_cmd },
{ lvconvert_swap_pool_metadata_CMD, lvconvert_swap_pool_metadata_cmd },
- { lvconvert_swap_thinpool_metadata_CMD, lvconvert_swap_pool_metadata_noarg_cmd },
- { lvconvert_swap_cachepool_metadata_CMD, lvconvert_swap_pool_metadata_noarg_cmd },
{ lvconvert_merge_thin_CMD, lvconvert_merge_thin_cmd },
{ lvconvert_split_and_keep_cachepool_CMD, lvconvert_split_cachepool_cmd },
{ lvconvert_split_and_remove_cachepool_CMD, lvconvert_split_cachepool_cmd },
diff --git a/tools/tools.h b/tools/tools.h
index 2f2a0fd..b3858a0 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -278,7 +278,6 @@ int lvconvert_to_pool_noarg_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_to_cache_vol_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_to_thin_with_external_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **argv);
-int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_merge_thin_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d2c5bb5c70661429…
Commit: d2c5bb5c7066142930c88275d2fb6c8552559c9a
Parent: 1236e0ed293d13bff1205dbd2ac31877278b7a90
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 14 15:53:29 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 14 15:53:29 2017 -0600
coverity cleanups
---
tools/command.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/command.h b/tools/command.h
index 3d708f0..0c3f9f3 100644
--- a/tools/command.h
+++ b/tools/command.h
@@ -69,7 +69,7 @@ struct command_name {
static inline int val_bit_is_set(uint64_t val_bits, int val_enum)
{
- return (val_bits & (1 << val_enum)) ? 1 : 0;
+ return (val_bits & (1ULL << val_enum)) ? 1 : 0;
}
static inline uint64_t val_enum_to_bit(int val_enum)
@@ -79,7 +79,7 @@ static inline uint64_t val_enum_to_bit(int val_enum)
static inline int lvp_bit_is_set(uint64_t lvp_bits, int lvp_enum)
{
- return (lvp_bits & (1 << lvp_enum)) ? 1 : 0;
+ return (lvp_bits & (1ULL << lvp_enum)) ? 1 : 0;
}
static inline uint64_t lvp_enum_to_bit(int lvp_enum)
@@ -89,7 +89,7 @@ static inline uint64_t lvp_enum_to_bit(int lvp_enum)
static inline int lvt_bit_is_set(uint64_t lvt_bits, int lvt_enum)
{
- return (lvt_bits & (1 << lvt_enum)) ? 1 : 0;
+ return (lvt_bits & (1ULL << lvt_enum)) ? 1 : 0;
}
static inline uint64_t lvt_enum_to_bit(int lvt_enum)
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1236e0ed293d13bf…
Commit: 1236e0ed293d13bff1205dbd2ac31877278b7a90
Parent: 1dddb068c90d553957dd8668b76c3eb9734b2e95
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 14 10:28:52 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 14 10:28:52 2017 -0600
man-generator: fix compiler warnings
---
tools/command.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index b655abe..aa33d5c 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -2181,7 +2181,7 @@ void print_man_usage(char *lvmname, struct command *cmd)
void print_man_usage_common(struct command *cmd)
{
struct command_name *cname;
- int i, sep, ro, rp, oo, op, opt_enum;
+ int i, sep, rp, oo, op, opt_enum;
if (!(cname = find_command_name(cmd->name)))
return;
@@ -2569,7 +2569,7 @@ static void include_description_file(char *name, char *des_file)
if (fd < 0)
return;
- read(fd, buf, sizeof(buf));
+ (void)read(fd, buf, sizeof(buf));
buf[MAX_MAN_DESC-1] = '\0';
@@ -2584,8 +2584,7 @@ void print_man(char *name, char *des_file, int include_primary, int include_seco
struct command_name *cname;
struct command *cmd, *prev_cmd = NULL;
char *lvmname = name;
- const char *desc;
- int i, j, ro, rp, oo, op;
+ int i;
if (!strncmp(name, "lvm-", 4))
name += 4;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1dddb068c90d5539…
Commit: 1dddb068c90d553957dd8668b76c3eb9734b2e95
Parent: c0f2a59993e373781c6dd5568cd559547cfe49a1
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 14 10:20:38 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 14 10:21:39 2017 -0600
man/help: use separator in units list
h|H|b|B|... instead of hHbB...
---
tools/vals.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/vals.h b/tools/vals.h
index 38029aa..d9b0064 100644
--- a/tools/vals.h
+++ b/tools/vals.h
@@ -122,7 +122,7 @@ val(numsigned_VAL, int_arg_with_sign, "SNumber", "[+|-]Number")
val(numsignedper_VAL, int_arg_with_sign_and_percent, "SNumberP", "[+|-]Number[%VG|%PVS|%FREE]")
val(permission_VAL, permission_arg, "Permission", "rw|r")
val(metadatatype_VAL, metadatatype_arg, "MetadataType", "lvm2|lvm1")
-val(units_VAL, string_arg, "Units", "hHbBsSkKmMgGtTpPeE")
+val(units_VAL, string_arg, "Units", "h|H|b|B|s|S|k|K|m|M|g|G|t|T|p|P|e|E")
val(segtype_VAL, segtype_arg, "SegType", "linear|striped|snapshot|mirror|raid*|thin|cache|thin-pool|cache-pool")
val(alloc_VAL, alloc_arg, "Alloc", "contiguous|cling|cling_by_tags|normal|anywhere|inherit")
val(locktype_VAL, locktype_arg, "LockType", "sanlock|dlm|none")
1
0
14 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c0f2a59993e37378…
Commit: c0f2a59993e373781c6dd5568cd559547cfe49a1
Parent: f46b28bdb6f8c0f7bae7a8b4fb4b886332831318
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 14 10:16:13 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 14 10:16:13 2017 -0600
commands: skip parsing command defs for other command names
The base command name can be used to skip parsing
command defs that will not be needed.
---
tools/command.c | 30 ++++++++++++++++++++++--------
tools/command.h | 2 +-
tools/lvm2cmdline.h | 2 +-
tools/lvmcmdlib.c | 2 +-
tools/lvmcmdline.c | 14 +++++++++++---
5 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index a968bed..b655abe 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1292,7 +1292,7 @@ static int copy_line(char *line, int max_line, int *position)
return 1;
}
-int define_commands(void)
+int define_commands(char *run_name)
{
struct command *cmd;
char line[MAX_LINE];
@@ -1306,6 +1306,10 @@ int define_commands(void)
int prev_was_oo = 0;
int prev_was_op = 0;
int copy_pos = 0;
+ int skip = 0;
+
+ if (run_name && !strcmp(run_name, "help"))
+ run_name = NULL;
create_opt_names_alpha();
@@ -1340,6 +1344,16 @@ int define_commands(void)
cmd->command_index = cmd_count;
cmd_count++;
cmd->name = strdup(name);
+
+ if (run_name && strcmp(run_name, name)) {
+ skip = 1;
+ prev_was_oo_def = 0;
+ prev_was_oo = 0;
+ prev_was_op = 0;
+ continue;
+ }
+ skip = 0;
+
cmd->pos_count = 1;
add_required_line(cmd, line_argc, line_argv);
@@ -1353,7 +1367,7 @@ int define_commands(void)
* context of the existing command[].
*/
- if (is_desc_line(line_argv[0])) {
+ if (is_desc_line(line_argv[0]) && !skip) {
char *desc = strdup(line_orig);
if (cmd->desc) {
int newlen = strlen(cmd->desc) + strlen(desc) + 2;
@@ -1369,12 +1383,12 @@ int define_commands(void)
continue;
}
- if (is_flags_line(line_argv[0])) {
+ if (is_flags_line(line_argv[0]) && !skip) {
add_flags(cmd, line_orig);
continue;
}
- if (is_rule_line(line_argv[0])) {
+ if (is_rule_line(line_argv[0]) && !skip) {
add_rule(cmd, line_orig);
continue;
}
@@ -1394,7 +1408,7 @@ int define_commands(void)
}
/* OO: ... */
- if (is_oo_line(line_argv[0])) {
+ if (is_oo_line(line_argv[0]) && !skip) {
add_optional_opt_line(cmd, line_argc, line_argv);
prev_was_oo_def = 0;
prev_was_oo = 1;
@@ -1403,7 +1417,7 @@ int define_commands(void)
}
/* OP: ... */
- if (is_op_line(line_argv[0])) {
+ if (is_op_line(line_argv[0]) && !skip) {
add_optional_pos_line(cmd, line_argc, line_argv);
prev_was_oo_def = 0;
prev_was_oo = 0;
@@ -1412,7 +1426,7 @@ int define_commands(void)
}
/* IO: ... */
- if (is_io_line(line_argv[0])) {
+ if (is_io_line(line_argv[0]) && !skip) {
add_ignore_opt_line(cmd, line_argc, line_argv);
prev_was_oo = 0;
prev_was_op = 0;
@@ -2703,7 +2717,7 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- define_commands();
+ define_commands(NULL);
print_man(argv[1], (argc > 2) ? argv[2] : NULL, 1, 1);
diff --git a/tools/command.h b/tools/command.h
index b3fae03..3d708f0 100644
--- a/tools/command.h
+++ b/tools/command.h
@@ -209,7 +209,7 @@ struct command {
int pos_count; /* temp counter used by create-command */
};
-int define_commands(void);
+int define_commands(char *run_name);
int command_id_to_enum(const char *str);
void print_usage(struct command *cmd);
void print_usage_common(struct command_name *cname, struct command *cmd);
diff --git a/tools/lvm2cmdline.h b/tools/lvm2cmdline.h
index 9b75c36..00162a4 100644
--- a/tools/lvm2cmdline.h
+++ b/tools/lvm2cmdline.h
@@ -32,7 +32,7 @@ void *cmdlib_lvm2_init(unsigned static_compile);
void lvm_fin(struct cmd_context *cmd);
struct cmd_context *init_lvm(unsigned set_connections, unsigned set_filters);
-void lvm_register_commands(void);
+void lvm_register_commands(char *name);
int lvm_split(char *str, int *argc, char **argv, int max);
int lvm_run_command(struct cmd_context *cmd, int argc, char **argv);
int lvm_return_code(int ret);
diff --git a/tools/lvmcmdlib.c b/tools/lvmcmdlib.c
index a1e938b..9e50343 100644
--- a/tools/lvmcmdlib.c
+++ b/tools/lvmcmdlib.c
@@ -34,7 +34,7 @@ void *cmdlib_lvm2_init(unsigned static_compile)
if (!(cmd = init_lvm(1, 1)))
return NULL;
- lvm_register_commands();
+ lvm_register_commands(NULL);
return (void *) cmd;
}
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 494f01f..65f80c8 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1128,7 +1128,7 @@ static struct command_function *_find_command_id_function(int command_enum)
return NULL;
}
-void lvm_register_commands(void)
+void lvm_register_commands(char *name)
{
int i;
@@ -1138,7 +1138,7 @@ void lvm_register_commands(void)
* populate commands[] array with command definitions
* by parsing command-lines.in/command-lines-input.h
*/
- if (!define_commands()) {
+ if (!define_commands(name)) {
log_error("Failed to parse command definitions.");
return;
}
@@ -3158,6 +3158,7 @@ int lvm2_main(int argc, char **argv)
int ret, alias = 0;
struct custom_fds custom_fds;
struct cmd_context *cmd;
+ char *name;
if (!argv)
return -1;
@@ -3199,7 +3200,14 @@ int lvm2_main(int argc, char **argv)
cmd->argv = argv;
- lvm_register_commands();
+ if (!alias && argc == 1)
+ name = NULL;
+ else if (alias)
+ name = argv[0];
+ else
+ name = argv[1];
+
+ lvm_register_commands(name);
if (_lvm1_fallback(cmd)) {
/* Attempt to run equivalent LVM1 tool instead */
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f46b28bdb6f8c0f7…
Commit: f46b28bdb6f8c0f7bae7a8b4fb4b886332831318
Parent: c868562a7968db9b0d00df9b1d0a8967a9aacaa3
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 14 09:49:26 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Tue Feb 14 09:52:09 2017 -0600
commands: improve help/usage output
Replace --help --help with --long-help.
Some blank lines were needed.
Add 'lvm help all' to print help for all commands.
---
tools/args.h | 7 +++-
tools/command-lines.in | 2 +-
tools/command.c | 5 ++-
tools/lvmcmdline.c | 95 ++++++++++++++++++++++++++++--------------------
4 files changed, 64 insertions(+), 45 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index b33df9a..f64b126 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -244,6 +244,9 @@ arg(locktype_ARG, '\0', "locktype", locktype_VAL, 0, 0,
arg(logonly_ARG, '\0', "logonly", 0, 0, 0,
"Suppress command report and display only log report.\n")
+arg(longhelp_ARG, '\0', "longhelp", 0, 0, 0,
+ "Display long help text.\n")
+
arg(maxrecoveryrate_ARG, '\0', "maxrecoveryrate", sizekb_VAL, 0, 0,
"Sets the maximum recovery rate for a RAID LV. The rate value\n"
"is an amount of data per second for each device in the array.\n"
@@ -920,8 +923,8 @@ arg(force_ARG, 'f', "force", 0, ARG_COUNTABLE, 0,
/* Not used. */
arg(full_ARG, 'f', "full", 0, 0, 0, NULL)
-arg(help_ARG, 'h', "help", 0, ARG_COUNTABLE, 0,
- "Display help text. Repeat this option for more information.\n")
+arg(help_ARG, 'h', "help", 0, 0, 0,
+ "Display help text.\n")
arg(cache_ARG, 'H', "cache", 0, 0, 0,
"Specifies the command is handling a cache LV or cache pool.\n"
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 2eddd41..b6aa1d1 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -187,7 +187,7 @@
# OO_ALL is included in every command automatically.
#
OO_ALL: --commandprofile String, --config String, --debug,
---driverloaded Bool, --help, --profile String, --quiet,
+--driverloaded Bool, --help, --longhelp, --profile String, --quiet,
--verbose, --version, --yes, --test
#
diff --git a/tools/command.c b/tools/command.c
index 0ff5cd7..a968bed 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -1640,7 +1640,7 @@ void print_usage(struct command *cmd)
printf(" ]");
done:
- printf("\n");
+ printf("\n\n");
return;
}
@@ -1704,7 +1704,8 @@ void print_usage_common(struct command_name *cname, struct command *cmd)
}
}
- printf(" ]\n");
+ printf(" ]");
+ printf("\n\n");
}
#ifdef MAN_PAGE_GENERATOR
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 43278ff..494f01f 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1384,7 +1384,7 @@ static struct command *_find_command(struct cmd_context *cmd, const char *path,
continue;
/* For help and version just return the first entry with matching name. */
- if (arg_is_set(cmd, help_ARG) || arg_is_set(cmd, help2_ARG) || arg_is_set(cmd, version_ARG))
+ if (arg_is_set(cmd, help_ARG) || arg_is_set(cmd, help2_ARG) || arg_is_set(cmd, longhelp_ARG) || arg_is_set(cmd, version_ARG))
return &commands[i];
match_required = 0; /* required parameters that match */
@@ -1661,7 +1661,40 @@ static void _short_usage(const char *name)
log_error("Run `%s --help' for more information.", name);
}
-static int _usage(const char *name, int help_count)
+static void _usage_notes(void)
+{
+ /*
+ * Excluding commonly understood syntax style like the meanings of:
+ * [ ] for optional, ... for repeatable, | for one of the following,
+ * -- for an option name, lower case strings and digits for literals.
+ */
+ log_print("Usage notes:");
+ log_print(". Variable parameters are: Number, String, PV, VG, LV, Tag.");
+ log_print(". Select indicates that a required positional parameter can");
+ log_print(" be omitted if the --select option is used.");
+ log_print(". --size Number can be replaced with --extents NumberExtents.");
+ log_print(". When --name is omitted from lvcreate, a new LV name is");
+ log_print(" generated with the \"lvol\" prefix and a unique numeric suffix.");
+ log_print(". The required VG parameter in lvcreate may be omitted when");
+ log_print(" the VG name is included in another option, e.g. --name VG/LV.");
+ log_print(". For required options listed in parentheses, e.g. (--A, --B),");
+ log_print(" any one is required, after which the others are optional.");
+ log_print(". The _new suffix indicates the VG or LV must not yet exist.");
+ log_print(". LV followed by _<type> indicates that an LV of the given type");
+ log_print(" is required. (raid represents any raid<N> type.)");
+ log_print(". Input units are always treated as base two values, regardless of");
+ log_print(" unit capitalization, e.g. 'k' and 'K' both refer to 1024.");
+ log_print(". The default input unit is specified by letter, followed by |unit");
+ log_print(" which represents other possible input units: bBsSkKmMgGtTpPeE.");
+ log_print(". Output units can be specified with the --units option, for which");
+ log_print(" lower/upper case letters refer to base 2/10 values.");
+ log_print(" formats that are recognized, e.g. for compatibility.");
+ log_print(". See man pages for short option equivalents of long option names,");
+ log_print(" and for more detailed descriptions of variable parameters.");
+ log_print(" ");
+}
+
+static int _usage(const char *name, int longhelp)
{
struct command_name *cname = find_command_name(name);
struct command *cmd;
@@ -1678,52 +1711,33 @@ static int _usage(const char *name, int help_count)
if (strcmp(_cmdline.commands[i].name, name))
continue;
- if ((_cmdline.commands[i].cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && (help_count < 3))
+ if ((_cmdline.commands[i].cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !longhelp)
continue;
print_usage(&_cmdline.commands[i]);
cmd = &_cmdline.commands[i];
- printf("\n");
}
/* Common options are printed once for all variants of a command name. */
print_usage_common(cname, cmd);
- if (help_count > 1) {
- /*
- * Excluding commonly understood syntax style like the meanings of:
- * [ ] for optional, ... for repeatable, | for one of the following,
- * -- for an option name, lower case strings and digits for literals.
- */
- log_print("Usage notes:");
- log_print(". Variable parameters are: Number, String, PV, VG, LV, Tag.");
- log_print(". Select indicates that a required positional parameter can");
- log_print(" be omitted if the --select option is used.");
- log_print(". --size Number can be replaced with --extents NumberExtents.");
- log_print(". When --name is omitted from lvcreate, a new LV name is");
- log_print(" generated with the \"lvol\" prefix and a unique numeric suffix.");
- log_print(". The required VG parameter in lvcreate may be omitted when");
- log_print(" the VG name is included in another option, e.g. --name VG/LV.");
- log_print(". For required options listed in parentheses, e.g. (--A, --B),");
- log_print(" any one is required, after which the others are optional.");
- log_print(". The _new suffix indicates the VG or LV must not yet exist.");
- log_print(". LV followed by _<type> indicates that an LV of the given type");
- log_print(" is required. (raid represents any raid<N> type.)");
- log_print(". Input units are always treated as base two values, regardless of");
- log_print(" unit capitalization, e.g. 'k' and 'K' both refer to 1024.");
- log_print(". The default input unit is specified by letter, followed by |unit");
- log_print(" which represents other possible input units: bBsSkKmMgGtTpPeE.");
- log_print(". Output units can be specified with the --units option, for which");
- log_print(" lower/upper case letters refer to base 2/10 values.");
- log_print(". Use --help --help --help to print secondary command syntax");
- log_print(" formats that are recognized, e.g. for compatibility.");
- log_print(". See man pages for short option equivalents of long option names,");
- log_print(" and for more detailed descriptions of variable parameters.");
- }
+ if (longhelp)
+ _usage_notes();
return 1;
}
+static void _usage_all(void)
+{
+ int i;
+
+ for (i = 0; i < MAX_COMMAND_NAMES; i++) {
+ if (!command_names[i].name)
+ break;
+ _usage(command_names[i].name, 0);
+ }
+}
+
/*
* Sets up the arguments to pass to getopt_long().
*
@@ -2158,11 +2172,10 @@ static int _get_settings(struct cmd_context *cmd)
static int _process_common_commands(struct cmd_context *cmd)
{
- if (arg_is_set(cmd, help_ARG) || arg_is_set(cmd, help2_ARG)) {
- _usage(cmd->name, arg_count(cmd, help_ARG));
-
- if (arg_count(cmd, help_ARG) < 2)
- log_print("(Use --help --help for usage notes.)");
+ if (arg_is_set(cmd, help_ARG) ||
+ arg_is_set(cmd, longhelp_ARG) ||
+ arg_is_set(cmd, help2_ARG)) {
+ _usage(cmd->name, arg_is_set(cmd, longhelp_ARG));
return ECMD_PROCESSED;
}
@@ -2195,6 +2208,8 @@ int help(struct cmd_context *cmd __attribute__((unused)), int argc, char **argv)
if (!argc)
_display_help();
+ else if (argc == 1 && !strcmp(argv[0], "all"))
+ _usage_all();
else {
int i;
for (i = 0; i < argc; i++)
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c868562a7968db9b…
Commit: c868562a7968db9b0d00df9b1d0a8967a9aacaa3
Parent: 22457ed4d97e0fdb13b15b44facf21521e8a1549
Author: Alasdair G Kergon <agk(a)redhat.com>
AuthorDate: Tue Feb 14 13:24:31 2017 +0000
Committer: Alasdair G Kergon <agk(a)redhat.com>
CommitterDate: Tue Feb 14 13:24:31 2017 +0000
Makefile: all_man also requires man-generator now
---
Makefile.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index e0a30f3..b525278 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,6 +60,7 @@ daemons: lib libdaemon tools
tools: lib libdaemon device-mapper
po: tools daemons
man: tools
+all_man: tools
scripts: liblvm libdm
lib.device-mapper: include.device-mapper
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=22457ed4d97e0fdb…
Commit: 22457ed4d97e0fdb13b15b44facf21521e8a1549
Parent: fc0e49297d6a6818b82169d1059084770c29b9d6
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Feb 14 10:24:25 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 14 10:24:56 2017 +0100
makefiles: missing deps
---
Makefile.in | 1 +
tools/Makefile.in | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 52441f1..e0a30f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,6 +59,7 @@ liblvm: lib
daemons: lib libdaemon tools
tools: lib libdaemon device-mapper
po: tools daemons
+man: tools
scripts: liblvm libdm
lib.device-mapper: include.device-mapper
diff --git a/tools/Makefile.in b/tools/Makefile.in
index ed359ea..9e1ccba 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -175,8 +175,6 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
$(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
$(EGREP) -v '^ *(|#.*|config|devtypes|dumpconfig|formats|fullreport|help|lastlog|lvpoll|pvdata|segtypes|systemid|tags|version) *$$' > .commands
-.DELETE_ON_ERROR:
-
command-count.h: $(srcdir)/command-lines.in Makefile
set -o pipefail && \
( cat $(top_srcdir)/doc/license.txt && \
@@ -204,6 +202,7 @@ command-lines-input.h: $(srcdir)/command-lines.in Makefile
) > $@
$(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d): command-lines-input.h command-count.h cmds.h
+$(SOURCES:%.c=%.o) $(SOURCES2:%.c=%.o): command-lines-input.h command-count.h cmds.h
ifneq ("$(CFLOW_CMD)", "")
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fc0e49297d6a6818…
Commit: fc0e49297d6a6818b82169d1059084770c29b9d6
Parent: 3350eb67cc66dcd2c6ee6456a3524bc723aa4e38
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Feb 14 09:48:24 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 14 10:24:56 2017 +0100
makefiles: use configure vars
Use binaries found in configure.
---
make.tmpl.in | 9 +++++++--
test/Makefile.in | 4 ++--
tools/Makefile.in | 9 ++-------
udev/Makefile.in | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/make.tmpl.in b/make.tmpl.in
index d418cfb..2e7c1ba 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -40,6 +40,11 @@ SED = @SED@
CFLOW_CMD = @CFLOW_CMD@
AWK = @AWK@
CHMOD = @CHMOD@
+EGREP = @EGREP@
+GREP = @GREP@
+SORT = @SORT@
+WC = @WC@
+
PYTHON2 = @PYTHON2@
PYTHON3 = @PYTHON3@
PYCOMPILE = $(top_srcdir)/autoconf/py-compile
@@ -512,9 +517,9 @@ ifeq (,$(firstword $(EXPORTED_SYMBOLS)))
) > $@
else
set -e;\
- R=$$(sort $^ | uniq -u);\
+ R=$$($(SORT) $^ | uniq -u);\
test -z "$$R" || { echo "Mismatch between symbols in shared library and lists in .exported_symbols.* files: $$R"; false; } ;\
- ( for i in $$(echo $(EXPORTED_SYMBOLS) | tr ' ' '\n' | sort -rnt_ -k5 ); do\
+ ( for i in $$(echo $(EXPORTED_SYMBOLS) | tr ' ' '\n' | $(SORT) -rnt_ -k5 ); do\
echo "$${i##*.} {"; echo " global:";\
$(SED) "s/^/ /;s/$$/;/" $$i;\
echo "};";\
diff --git a/test/Makefile.in b/test/Makefile.in
index f152868..3cb0f18 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -39,7 +39,7 @@ S ?= @ # never match anything by default
VERBOSE ?= 0
ALL := $(shell find -L $(srcdir) \( -path \*/shell/\*.sh -or -path \*/api/\*.sh \) | sort)
comma = ,
-RUN := $(shell find -L $(srcdir) -regextype posix-egrep \( -path \*/shell/\*.sh -or -path \*/api/\*.sh \) -and -regex "$(srcdir)/.*($(subst $(comma),|,$(T))).*" -and -not -regex "$(srcdir)/.*($(subst $(comma),|,$(S))).*" | sort)
+RUN := $(shell find -L $(srcdir) -regextype posix-egrep \( -path \*/shell/\*.sh -or -path \*/api/\*.sh \) -and -regex "$(srcdir)/.*($(subst $(comma),|,$(T))).*" -and -not -regex "$(srcdir)/.*($(subst $(comma),|,$(S))).*" | ($SORT))
RUN_BASE = $(subst $(srcdir)/,,$(RUN))
ifeq ("@BUILD_LVMETAD@", "yes")
@@ -267,7 +267,7 @@ lib/%: lib/%.o .lib-dir-stamp
lib/%: $(srcdir)/lib/%.sh .lib-dir-stamp
cp $< $@
- chmod +x $@
+ $(CHMOD) +x $@
lib/flavour-%: $(srcdir)/lib/flavour-%.sh .lib-dir-stamp
cp $< $@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 5aaba2f..ed359ea 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -173,15 +173,10 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
.commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile
$(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
- egrep -v '^ *(|#.*|config|devtypes|dumpconfig|formats|fullreport|help|lastlog|lvpoll|pvdata|segtypes|systemid|tags|version) *$$' > .commands
+ $(EGREP) -v '^ *(|#.*|config|devtypes|dumpconfig|formats|fullreport|help|lastlog|lvpoll|pvdata|segtypes|systemid|tags|version) *$$' > .commands
.DELETE_ON_ERROR:
-# move properly to configure
-WC = /usr/bin/wc
-GREP = /bin/grep
-SORT = /bin/sort
-
command-count.h: $(srcdir)/command-lines.in Makefile
set -o pipefail && \
( cat $(top_srcdir)/doc/license.txt && \
@@ -204,7 +199,7 @@ command-lines-input.h: $(srcdir)/command-lines.in Makefile
( cat $(top_srcdir)/doc/license.txt && \
echo "/* Do not edit. This file is generated by the Makefile. */" && \
echo -en "const char _command_input[] =\n\n\"" && \
- $(GREP) -Ev '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \
+ $(EGREP) -v '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \
echo "\\n\";" \
) > $@
diff --git a/udev/Makefile.in b/udev/Makefile.in
index cb968df..c498aa8 100644
--- a/udev/Makefile.in
+++ b/udev/Makefile.in
@@ -23,7 +23,7 @@ ifeq ("@BUILD_LVMETAD@", "yes")
LVM_RULES+=69-dm-lvm-metad.rules
endif
-DM_DIR=$(shell grep "\#define DM_DIR" $(top_srcdir)/libdm/misc/dm-ioctl.h | awk '{print $$3}')
+DM_DIR=$(shell $(GREP) "\#define DM_DIR" $(top_srcdir)/libdm/misc/dm-ioctl.h | $(AWK) '{print $$3}')
ifeq ("@UDEV_RULE_EXEC_DETECTION@", "yes")
SBIN=\$$env{DM_SBIN_PATH}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3350eb67cc66dcd2…
Commit: 3350eb67cc66dcd2c6ee6456a3524bc723aa4e38
Parent: 6118b0fb93502e1ba06e5a4a696a264c0e4af0ed
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Feb 14 09:53:13 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 14 10:24:56 2017 +0100
libdm: move code for _stats_resize_group
Code is only needed when "fiemap.h" so keep it under single #ifdef.
---
libdm/libdm-stats.c | 62 +++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index 587c748..3f6730e 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -3868,37 +3868,6 @@ static int _extent_start_compare(const void *p1, const void *p2)
return 1;
}
-/*
- * Resize the group bitmap corresponding to group_id so that it can
- * contain at least num_regions members.
- */
-static int _stats_resize_group(struct dm_stats_group *group, int num_regions)
-{
- int last_bit = dm_bit_get_last(group->regions);
- dm_bitset_t new, old;
-
- if (last_bit >= num_regions) {
- log_error("Cannot resize group bitmap to %d with bit %d set.",
- num_regions, last_bit);
- return 0;
- }
-
- log_very_verbose("Resizing group bitmap from %d to %d (last_bit: %d).",
- group->regions[0], num_regions, last_bit);
-
- new = dm_bitset_create(NULL, num_regions);
- if (!new) {
- log_error("Could not allocate memory for new group bitmap.");
- return 0;
- }
-
- old = group->regions;
- dm_bit_copy(new, old);
- group->regions = new;
- dm_bitset_destroy(old);
- return 1;
-}
-
static int _stats_create_group(struct dm_stats *dms, dm_bitset_t regions,
const char *alias, uint64_t *group_id)
{
@@ -4203,6 +4172,37 @@ int dm_stats_get_group_descriptor(const struct dm_stats *dms,
#ifdef HAVE_LINUX_FIEMAP_H
/*
+ * Resize the group bitmap corresponding to group_id so that it can
+ * contain at least num_regions members.
+ */
+static int _stats_resize_group(struct dm_stats_group *group, int num_regions)
+{
+ int last_bit = dm_bit_get_last(group->regions);
+ dm_bitset_t new, old;
+
+ if (last_bit >= num_regions) {
+ log_error("Cannot resize group bitmap to %d with bit %d set.",
+ num_regions, last_bit);
+ return 0;
+ }
+
+ log_very_verbose("Resizing group bitmap from %d to %d (last_bit: %d).",
+ group->regions[0], num_regions, last_bit);
+
+ new = dm_bitset_create(NULL, num_regions);
+ if (!new) {
+ log_error("Could not allocate memory for new group bitmap.");
+ return 0;
+ }
+
+ old = group->regions;
+ dm_bit_copy(new, old);
+ group->regions = new;
+ dm_bitset_destroy(old);
+ return 1;
+}
+
+/*
* Group a table of region_ids corresponding to the extents of a file.
*/
static int _stats_group_file_regions(struct dm_stats *dms, uint64_t *region_ids,
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6118b0fb93502e1b…
Commit: 6118b0fb93502e1ba06e5a4a696a264c0e4af0ed
Parent: 65b82a80720b137e24077c29f9c52d6ad43f93a5
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Feb 13 22:55:30 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 14 00:05:04 2017 +0100
configure: update
---
configure | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 198 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index 1cb4b54..9b69964 100755
--- a/configure
+++ b/configure
@@ -821,6 +821,8 @@ HAVE_PIE
POW_LIB
LIBOBJS
ALLOCA
+SORT
+WC
CHMOD
CSCOPE_CMD
CFLOW_CMD
@@ -5234,6 +5236,202 @@ else
CHMOD="$ac_cv_path_CHMOD"
fi
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}wc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}wc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_WC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $WC in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_WC="$WC" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_WC="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+WC=$ac_cv_path_WC
+if test -n "$WC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WC" >&5
+$as_echo "$WC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_WC"; then
+ ac_pt_WC=$WC
+ # Extract the first word of "wc", so it can be a program name with args.
+set dummy wc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_WC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_WC in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_WC="$ac_pt_WC" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_WC="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_WC=$ac_cv_path_ac_pt_WC
+if test -n "$ac_pt_WC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_WC" >&5
+$as_echo "$ac_pt_WC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_WC" = x; then
+ WC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ WC=$ac_pt_WC
+ fi
+else
+ WC="$ac_cv_path_WC"
+fi
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}sort", so it can be a program name with args.
+set dummy ${ac_tool_prefix}sort; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SORT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $SORT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_SORT="$SORT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_SORT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+SORT=$ac_cv_path_SORT
+if test -n "$SORT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SORT" >&5
+$as_echo "$SORT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_SORT"; then
+ ac_pt_SORT=$SORT
+ # Extract the first word of "sort", so it can be a program name with args.
+set dummy sort; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_SORT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_SORT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_SORT="$ac_pt_SORT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_SORT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_SORT=$ac_cv_path_ac_pt_SORT
+if test -n "$ac_pt_SORT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_SORT" >&5
+$as_echo "$ac_pt_SORT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_SORT" = x; then
+ SORT=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ SORT=$ac_pt_SORT
+ fi
+else
+ SORT="$ac_cv_path_SORT"
+fi
+
################################################################################
ac_header_dirent=no
1
0
13 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=65b82a80720b137e…
Commit: 65b82a80720b137e24077c29f9c52d6ad43f93a5
Parent: 05dd566a52e4311c0626eb1a1250042aba746fae
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Feb 13 22:50:19 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 14 00:04:26 2017 +0100
activation: trust 'pending' status reported by dmeventd
Only usleep when dmeventd reports 'pending' otherwise trust reported
state.
---
lib/activate/activate.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 608611f..ea56735 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -1948,16 +1948,13 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume
/* Check [un]monitor results */
/* Try a couple times if pending, but not forever... */
- for (i = 0; i < 40; i++) {
+ for (i = 0;; i++) {
pending = 0;
monitored = seg->segtype->ops->target_monitored(seg, &pending);
- if (pending ||
- (!monitored && monitor) ||
- (monitored && !monitor))
- log_very_verbose("%s %smonitoring still pending: waiting...",
- display_lvname(lv), monitor ? "" : "un");
- else
+ if (!pending || i >= 40)
break;
+ log_very_verbose("%s %smonitoring still pending: waiting...",
+ display_lvname(lv), monitor ? "" : "un");
usleep(10000 * i);
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=05dd566a52e4311c…
Commit: 05dd566a52e4311c0626eb1a1250042aba746fae
Parent: 5a87d8667d0a8cadfea13f837cf01c91d86dad0c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Feb 13 19:00:59 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Tue Feb 14 00:03:34 2017 +0100
dmeventd: unify error handling
Always make sure the 'status' is release on 'error' path (thin pluging missed)
Make code looking same across all plugins.
---
daemons/dmeventd/plugins/mirror/dmeventd_mirror.c | 11 +++++------
daemons/dmeventd/plugins/raid/dmeventd_raid.c | 7 ++++---
.../dmeventd/plugins/snapshot/dmeventd_snapshot.c | 7 ++++---
daemons/dmeventd/plugins/thin/dmeventd_thin.c | 7 ++++---
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
index 3d3a6de..4ec348f 100644
--- a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
+++ b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c
@@ -184,16 +184,12 @@ int register_device(const char *device,
goto_bad;
if (!dmeventd_lvm2_command(state->mem, state->cmd_lvscan, sizeof(state->cmd_lvscan),
- "lvscan --cache", device)) {
- dmeventd_lvm2_exit_with_pool(state);
+ "lvscan --cache", device))
goto_bad;
- }
if (!dmeventd_lvm2_command(state->mem, state->cmd_lvconvert, sizeof(state->cmd_lvconvert),
- "lvconvert --repair --use-policies", device)) {
- dmeventd_lvm2_exit_with_pool(state);
+ "lvconvert --repair --use-policies", device))
goto_bad;
- }
*user = state;
@@ -203,6 +199,9 @@ int register_device(const char *device,
bad:
log_error("Failed to monitor mirror %s.", device);
+ if (state)
+ dmeventd_lvm2_exit_with_pool(state);
+
return 0;
}
diff --git a/daemons/dmeventd/plugins/raid/dmeventd_raid.c b/daemons/dmeventd/plugins/raid/dmeventd_raid.c
index 911ae7a..ae3fc86 100644
--- a/daemons/dmeventd/plugins/raid/dmeventd_raid.c
+++ b/daemons/dmeventd/plugins/raid/dmeventd_raid.c
@@ -140,10 +140,8 @@ int register_device(const char *device,
"lvscan --cache", device) ||
!dmeventd_lvm2_command(state->mem, state->cmd_lvconvert, sizeof(state->cmd_lvconvert),
"lvconvert --config devices{ignore_suspended_devices=1} "
- "--repair --use-policies", device)) {
- dmeventd_lvm2_exit_with_pool(state);
+ "--repair --use-policies", device))
goto_bad;
- }
*user = state;
@@ -153,6 +151,9 @@ int register_device(const char *device,
bad:
log_error("Failed to monitor RAID %s.", device);
+ if (state)
+ dmeventd_lvm2_exit_with_pool(state);
+
return 0;
}
diff --git a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
index a70d07c..bab7f0e 100644
--- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
+++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c
@@ -254,10 +254,8 @@ int register_device(const char *device,
if (!dmeventd_lvm2_command(state->mem, state->cmd_lvextend,
sizeof(state->cmd_lvextend),
- "lvextend --use-policies", device)) {
- dmeventd_lvm2_exit_with_pool(state);
+ "lvextend --use-policies", device))
goto_bad;
- }
state->percent_check = CHECK_MINIMUM;
*user = state;
@@ -268,6 +266,9 @@ int register_device(const char *device,
bad:
log_error("Failed to monitor snapshot %s.", device);
+ if (state)
+ dmeventd_lvm2_exit_with_pool(state);
+
return 0;
}
diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
index e447ba2..e7d24c5 100644
--- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c
+++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
@@ -359,10 +359,8 @@ int register_device(const char *device,
goto_bad;
if (!dmeventd_lvm2_command(state->mem, cmd_str, sizeof(cmd_str),
- "_dmeventd_thin_command", device)) {
- dmeventd_lvm2_exit_with_pool(state);
+ "_dmeventd_thin_command", device))
goto_bad;
- }
if (strncmp(cmd_str, "lvm ", 4) == 0) {
if (!(state->cmd_str = dm_pool_strdup(state->mem, cmd_str + 4))) {
@@ -401,6 +399,9 @@ inval:
bad:
log_error("Failed to monitor thin pool %s.", device);
+ if (state)
+ dmeventd_lvm2_exit_with_pool(state);
+
return 0;
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5a87d8667d0a8cad…
Commit: 5a87d8667d0a8cadfea13f837cf01c91d86dad0c
Parent: 5ab051df7a6f53ababb1c283af2ec4f8e1c7cac3
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 13 16:11:04 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 16:11:04 2017 -0600
coverity cleanups for recent command defs commits
---
tools/command.c | 59 +++++++++++++++++++++++++++++++++------------------
tools/lvmcmdline.c | 5 ++-
2 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/tools/command.c b/tools/command.c
index 68566fa..0ff5cd7 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -348,9 +348,11 @@ static int val_str_to_num(char *str)
/* convert "--option" to foo_ARG enum */
+#define MAX_LONG_OPT_NAME_LEN 32
+
static int opt_str_to_num(char *str)
{
- char long_name[32];
+ char long_name[MAX_LONG_OPT_NAME_LEN];
char *p;
int i;
@@ -361,9 +363,10 @@ static int opt_str_to_num(char *str)
* short option.
*/
if (strstr(str, "_long")) {
- strcpy(long_name, str);
- p = strstr(long_name, "_long");
- *p = '\0';
+ memset(long_name, 0, sizeof(long_name));
+ strncpy(long_name, str, MAX_LONG_OPT_NAME_LEN-1);
+ if ((p = strstr(long_name, "_long")))
+ *p = '\0';
for (i = 0; i < ARG_COUNT; i++) {
if (!opt_names[i].long_opt)
@@ -451,16 +454,19 @@ static int lv_to_enum(char *name)
* lvt_bits |= lvt_enum_to_bit(lvt_enum)
*/
+#define LVTYPE_LEN 64
+
static uint64_t lv_to_bits(char *name)
{
- char buf[64];
+ char buf[LVTYPE_LEN];
char *argv[MAX_LINE_ARGC];
uint64_t lvt_bits = 0;
int lvt_enum;
int argc;
int i;
- strcpy(buf, name);
+ memset(buf, 0, sizeof(buf));
+ strncpy(buf, name, LVTYPE_LEN-1);
split_line(buf, &argc, argv, '_');
@@ -737,6 +743,10 @@ static void append_oo_definition_line(const char *new_line)
/* +2 = 1 space between old and new + 1 terminating \0 */
len = strlen(old_line) + strlen(new_line) + 2;
line = malloc(len);
+ if (!line) {
+ log_error("Parsing command defs: no memory");
+ exit(EXIT_FAILURE);
+ }
memset(line, 0, len);
strcat(line, old_line);
@@ -749,14 +759,17 @@ static void append_oo_definition_line(const char *new_line)
/* Find a saved OO_FOO definition. */
+#define OO_NAME_LEN 64
+
static char *get_oo_line(const char *str)
{
char *name;
char *end;
- char str2[64];
+ char str2[OO_NAME_LEN];
int i;
- strcpy(str2, str);
+ memset(str2, 0, sizeof(str2));
+ strncpy(str2, str, OO_NAME_LEN-1);
if ((end = strstr(str2, ":")))
*end = '\0';
if ((end = strstr(str2, ",")))
@@ -917,7 +930,7 @@ static void update_prev_pos_arg(struct command *cmd, char *str, int required)
static void add_optional_opt_line(struct command *cmd, int argc, char *argv[])
{
- int takes_arg;
+ int takes_arg = 0;
int i;
for (i = 0; i < argc; i++) {
@@ -941,7 +954,7 @@ static void add_optional_opt_line(struct command *cmd, int argc, char *argv[])
static void add_ignore_opt_line(struct command *cmd, int argc, char *argv[])
{
- int takes_arg;
+ int takes_arg = 0;
int i;
for (i = 0; i < argc; i++) {
@@ -977,7 +990,7 @@ static void add_optional_pos_line(struct command *cmd, int argc, char *argv[])
static void add_required_opt_line(struct command *cmd, int argc, char *argv[])
{
- int takes_arg;
+ int takes_arg = 0;
int i;
for (i = 0; i < argc; i++) {
@@ -1345,10 +1358,12 @@ int define_commands(void)
if (cmd->desc) {
int newlen = strlen(cmd->desc) + strlen(desc) + 2;
char *newdesc = malloc(newlen);
- memset(newdesc, 0, newlen);
- snprintf(newdesc, newlen, "%s %s", cmd->desc, desc);
- cmd->desc = newdesc;
- free(desc);
+ if (newdesc) {
+ memset(newdesc, 0, newlen);
+ snprintf(newdesc, newlen, "%s %s", cmd->desc, desc);
+ cmd->desc = newdesc;
+ free(desc);
+ }
} else
cmd->desc = desc;
continue;
@@ -1632,7 +1647,7 @@ void print_usage(struct command *cmd)
void print_usage_common(struct command_name *cname, struct command *cmd)
{
- int oo, opt_enum, first;
+ int oo, opt_enum, first = 1;
printf(" Common options:");
@@ -1644,8 +1659,6 @@ void print_usage_common(struct command_name *cname, struct command *cmd)
if (cname->variants < 2)
goto all;
- first = 1;
-
for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
if (!cname->common_options[opt_enum])
continue;
@@ -2527,9 +2540,11 @@ static char *upper_command_name(char *str)
return str_upper;
}
+#define MAX_MAN_DESC (1024 * 1024)
+
static void include_description_file(char *name, char *des_file)
{
- char buf[1024 * 1024];
+ char buf[MAX_MAN_DESC];
int fd;
memset(buf, 0, sizeof(buf));
@@ -2539,7 +2554,9 @@ static void include_description_file(char *name, char *des_file)
if (fd < 0)
return;
- read(fd, buf, sizeof(buf) - 1);
+ read(fd, buf, sizeof(buf));
+
+ buf[MAX_MAN_DESC-1] = '\0';
printf(".SH DESCRIPTION\n");
printf("%s\n", buf);
@@ -2586,7 +2603,7 @@ void print_man(char *name, char *des_file, int include_primary, int include_seco
if (!(cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_primary)
continue;
- if (name && strcmp(name, cmd->name))
+ if (strcmp(name, cmd->name))
continue;
if (!prev_cmd || strcmp(prev_cmd->name, cmd->name)) {
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 40e1cf4..43278ff 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1155,7 +1155,8 @@ void lvm_register_commands(void)
/* old style */
if (!commands[i].functions) {
struct command_name *cname = find_command_name(commands[i].name);
- commands[i].fn = cname->fn;
+ if (cname)
+ commands[i].fn = cname->fn;
}
}
@@ -1365,7 +1366,7 @@ static struct command *_find_command(struct cmd_context *cmd, const char *path,
char buf[64];
int match_required, match_ro, match_rp, match_type, match_unused, mismatch_required;
int best_i = 0, best_required = 0, best_type = 0, best_unused = 0;
- int close_i = 0, close_ro = 0, close_type;
+ int close_i = 0, close_ro = 0, close_type = 0;
int temp_unused_options[MAX_UNUSED_COUNT];
int temp_unused_count;
int best_unused_options[MAX_UNUSED_COUNT] = { 0 };
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5ab051df7a6f53ab…
Commit: 5ab051df7a6f53ababb1c283af2ec4f8e1c7cac3
Parent: c816e8b6365f777a2e555824ae2425f85869c5c5
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 13 15:36:17 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 15:36:17 2017 -0600
WHATS_NEW: changes for recent command defs
---
WHATS_NEW | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 3fbef6f..c8b7fdc 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,14 +1,16 @@
Version 2.02.169 -
=====================================
- Add lvconvert --swapmetadata for previous non-specific command.
- Add lvconvert --startpoll for previous non-specific command.
- Add lvconvert --mergethin for specific --merge case.
- Add lvconvert --mergemirrors for specific --merge case.
- Add lvconvert --mergesnapshot for specific --merge case.
+ Add lvconvert --swapmetadata, new specific way to swap pool metadata LVs.
+ Add lvconvert --startpoll, new specific way to start polling conversions.
+ Add lvconvert --mergethin, new specific way to merge thin snapshots.
+ Add lvconvert --mergemirrors, new specific way to merge split mirrors.
+ Add lvconvert --mergesnapshot, new specific way to combine cow LVs.
Split up lvconvert code based on command definitions.
Split up lvchange code based on command definitions.
Generate help output and man pages from command definitions.
- Add command definitions and match every command to one.
+ Verify all command line items against command definition.
+ Match every command run to one command definition.
+ Specify every allowed command definition/syntax in command-lines.in.
Add extra memory page when limiting pthread stack size in clvmd.
Support striped/raid0* <-> raid10_near conversions
Support shrinking of RaidLvs
1
0
13 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c816e8b6365f777a…
Commit: c816e8b6365f777a2e555824ae2425f85869c5c5
Parent: 717363bb9427c02addeb22ef77396132cb30c782
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 13 15:22:26 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 15:22:26 2017 -0600
WHATS_NEW: items from command definitions patch set
---
WHATS_NEW | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index b497c7e..3fbef6f 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,14 @@
Version 2.02.169 -
=====================================
+ Add lvconvert --swapmetadata for previous non-specific command.
+ Add lvconvert --startpoll for previous non-specific command.
+ Add lvconvert --mergethin for specific --merge case.
+ Add lvconvert --mergemirrors for specific --merge case.
+ Add lvconvert --mergesnapshot for specific --merge case.
+ Split up lvconvert code based on command definitions.
+ Split up lvchange code based on command definitions.
+ Generate help output and man pages from command definitions.
+ Add command definitions and match every command to one.
Add extra memory page when limiting pthread stack size in clvmd.
Support striped/raid0* <-> raid10_near conversions
Support shrinking of RaidLvs
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=717363bb9427c02a…
Commit: 717363bb9427c02addeb22ef77396132cb30c782
Parent: b2fd5b31d3cbe1267ab01c4d6af4785f800938f4
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 13 14:40:53 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 14:41:54 2017 -0600
lvconvert: enable previous syntax to swap metadata
---
tools/command-lines.in | 14 ++++++++++++++
tools/lvconvert.c | 2 --
tools/lvmcmdline.c | 2 ++
tools/tools.h | 1 +
4 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 1a9a796..2eddd41 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -508,6 +508,20 @@ OO: --chunksize SizeKB, OO_LVCONVERT
ID: lvconvert_swap_pool_metadata
DESC: Swap metadata LV in a thin pool or cache pool (for repair only).
+lvconvert --poolmetadata LV --thinpool LV_thinpool
+OO: --chunksize SizeKB, OO_LVCONVERT
+ID: lvconvert_swap_thinpool_metadata
+DESC: Swap metadata LV in a thin pool (for repair only).
+DESC: (variant, use --swapmetadata).
+FLAGS: SECONDARY_SYNTAX
+
+lvconvert --poolmetadata LV --cachepool LV_cachepool
+OO: --chunksize SizeKB, OO_LVCONVERT
+ID: lvconvert_swap_cachepool_metadata
+DESC: Swap metadata LV in a cache pool (for repair only).
+DESC: (variant, use --swapmetadata).
+FLAGS: SECONDARY_SYNTAX
+
---
# lvconvert --merge is an extremely ambiguous command.
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 502d614..3897602 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -4040,7 +4040,6 @@ int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **a
NULL, NULL, &_lvconvert_swap_pool_metadata_single);
}
-#if 0
int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, char **argv)
{
struct command *new_command;
@@ -4072,7 +4071,6 @@ int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, ch
return lvconvert_swap_pool_metadata_cmd(cmd, argc, argv);
}
-#endif
static int _lvconvert_merge_thin_single(struct cmd_context *cmd,
struct logical_volume *lv,
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 44efc85..40e1cf4 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -141,6 +141,8 @@ struct command_function command_functions[CMD_COUNT] = {
{ lvconvert_to_thin_with_external_CMD, lvconvert_to_thin_with_external_cmd },
{ lvconvert_to_cache_vol_CMD, lvconvert_to_cache_vol_cmd },
{ lvconvert_swap_pool_metadata_CMD, lvconvert_swap_pool_metadata_cmd },
+ { lvconvert_swap_thinpool_metadata_CMD, lvconvert_swap_pool_metadata_noarg_cmd },
+ { lvconvert_swap_cachepool_metadata_CMD, lvconvert_swap_pool_metadata_noarg_cmd },
{ lvconvert_merge_thin_CMD, lvconvert_merge_thin_cmd },
{ lvconvert_split_and_keep_cachepool_CMD, lvconvert_split_cachepool_cmd },
{ lvconvert_split_and_remove_cachepool_CMD, lvconvert_split_cachepool_cmd },
diff --git a/tools/tools.h b/tools/tools.h
index b3858a0..2f2a0fd 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -278,6 +278,7 @@ int lvconvert_to_pool_noarg_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_to_cache_vol_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_to_thin_with_external_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_merge_thin_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b2fd5b31d3cbe126…
Commit: b2fd5b31d3cbe1267ab01c4d6af4785f800938f4
Parent: 698abdde165a3e747b81f18cf3405f2d4abb5bae
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 13 13:46:17 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 13:46:17 2017 -0600
commands: suggest --help if command doesn't match
---
tools/lvmcmdline.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 58d1a44..44efc85 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1542,6 +1542,7 @@ static struct command *_find_command(struct cmd_context *cmd, const char *path,
if (!best_required) {
/* cmd did not have all the required opt/pos args of any command */
log_error("Failed to find a matching command definition.");
+ log_error("Run '%s --help' for more information.", name);
if (close_ro) {
log_warn("Closest command usage is:");
print_usage(&_cmdline.commands[close_i]);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=698abdde165a3e74…
Commit: 698abdde165a3e747b81f18cf3405f2d4abb5bae
Parent: 13a6368522894e9d32544d8fb3d6360bbe9018d1
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 10 16:20:19 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 10:31:23 2017 -0600
generate man pages
---
configure.in | 2 +
doc/license.txt | 14 +
man/Makefile.in | 39 +-
man/clvmd.8.in | 26 +
man/lvchange.8.des | 2 +
man/lvchange.8.end | 6 +
man/lvchange.8.in | 491 -------------------
man/lvconvert.8.des | 32 ++
man/lvconvert.8.end | 95 ++++
man/lvconvert.8.in | 1199 ----------------------------------------------
man/lvcreate.8.des | 28 ++
man/lvcreate.8.end | 98 ++++
man/lvcreate.8.in | 914 -----------------------------------
man/lvdisplay.8.des | 5 +
man/lvdisplay.8.in | 134 -----
man/lvextend.8.des | 5 +
man/lvextend.8.end | 16 +
man/lvextend.8.in | 134 -----
man/lvm-config.8.des | 5 +
man/lvm-config.8.in | 1 -
man/lvm-dumpconfig.8.des | 5 +
man/lvm-dumpconfig.8.in | 1 -
man/lvm-fullreport.8.des | 6 +
man/lvm-fullreport.8.in | 145 ------
man/lvm-lvpoll.8.des | 4 +
man/lvm-lvpoll.8.end | 33 ++
man/lvm-lvpoll.8.in | 89 ----
man/lvmchange.8.in | 10 -
man/lvmconfig.8.des | 3 +
man/lvmconfig.8.in | 225 ---------
man/lvmdiskscan.8.des | 7 +
man/lvmdiskscan.8.in | 27 -
man/lvmlockd.8.in | 42 +-
man/lvmsadc.8.des | 3 +
man/lvmsadc.8.in | 16 -
man/lvmsar.8.des | 3 +
man/lvmsar.8.in | 16 -
man/lvreduce.8.des | 14 +
man/lvreduce.8.end | 5 +
man/lvreduce.8.in | 110 -----
man/lvremove.8.des | 22 +
man/lvremove.8.end | 11 +
man/lvremove.8.in | 80 ---
man/lvrename.8.des | 2 +
man/lvrename.8.end | 10 +
man/lvrename.8.in | 51 --
man/lvresize.8.des | 2 +
man/lvresize.8.end | 6 +
man/lvresize.8.in | 124 -----
man/lvs.8.des | 1 +
man/lvs.8.end | 75 +++
man/lvs.8.in | 290 -----------
man/lvscan.8.des | 5 +
man/lvscan.8.in | 52 --
man/pvchange.8.des | 1 +
man/pvchange.8.end | 6 +
man/pvchange.8.in | 59 ---
man/pvck.8.des | 1 +
man/pvck.8.end | 8 +
man/pvck.8.in | 37 --
man/pvcreate.8.des | 18 +
man/pvcreate.8.end | 13 +
man/pvcreate.8.in | 210 --------
man/pvdisplay.8.des | 5 +
man/pvdisplay.8.in | 109 -----
man/pvmove.8.des | 61 +++
man/pvmove.8.end | 46 ++
man/pvmove.8.in | 187 -------
man/pvremove.8.des | 2 +
man/pvremove.8.in | 37 --
man/pvresize.8.des | 2 +
man/pvresize.8.end | 16 +
man/pvresize.8.in | 56 ---
man/pvs.8.des | 1 +
man/pvs.8.end | 11 +
man/pvs.8.in | 153 ------
man/pvscan.8.des | 105 ++++
man/pvscan.8.in | 178 -------
man/see_also.end | 67 +++
man/vgcfgbackup.8.des | 16 +
man/vgcfgbackup.8.in | 36 --
man/vgcfgrestore.8.des | 8 +
man/vgcfgrestore.8.end | 9 +
man/vgcfgrestore.8.in | 58 ---
man/vgchange.8.des | 2 +
man/vgchange.8.end | 16 +
man/vgchange.8.in | 346 -------------
man/vgck.8.des | 1 +
man/vgck.8.in | 22 -
man/vgconvert.8.des | 7 +
man/vgconvert.8.in | 48 --
man/vgcreate.8.des | 4 +
man/vgcreate.8.end | 6 +
man/vgcreate.8.in | 187 -------
man/vgdisplay.8.des | 4 +
man/vgdisplay.8.in | 123 -----
man/vgexport.8.des | 8 +
man/vgexport.8.in | 37 --
man/vgextend.8.des | 11 +
man/vgextend.8.end | 6 +
man/vgextend.8.in | 71 ---
man/vgimport.8.des | 5 +
man/vgimport.8.in | 38 --
man/vgimportclone.8.des | 6 +
man/vgimportclone.8.end | 9 +
man/vgimportclone.8.in | 46 --
man/vgmerge.8.des | 3 +
man/vgmerge.8.end | 7 +
man/vgmerge.8.in | 41 --
man/vgmknodes.8.des | 5 +
man/vgmknodes.8.in | 30 --
man/vgreduce.8.des | 1 +
man/vgreduce.8.in | 49 --
man/vgremove.8.des | 6 +
man/vgremove.8.in | 46 --
man/vgrename.8.des | 9 +
man/vgrename.8.end | 10 +
man/vgrename.8.in | 58 ---
man/vgs.8.des | 1 +
man/vgs.8.end | 17 +
man/vgs.8.in | 161 -------
man/vgscan.8.des | 1 +
man/vgscan.8.in | 43 --
man/vgsplit.8.des | 13 +
man/vgsplit.8.in | 80 ---
tools/Makefile.in | 1 -
126 files changed, 1159 insertions(+), 6683 deletions(-)
diff --git a/configure.in b/configure.in
index 8ec65c8..55bc0be 100644
--- a/configure.in
+++ b/configure.in
@@ -86,6 +86,8 @@ AC_PROG_RANLIB
AC_PATH_TOOL(CFLOW_CMD, cflow)
AC_PATH_TOOL(CSCOPE_CMD, cscope)
AC_PATH_TOOL(CHMOD, chmod)
+AC_PATH_TOOL(WC, wc)
+AC_PATH_TOOL(SORT, sort)
################################################################################
dnl -- Check for header files.
diff --git a/doc/license.txt b/doc/license.txt
new file mode 100644
index 0000000..5ba3e66
--- /dev/null
+++ b/doc/license.txt
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of LVM2.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License v.2.1.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
diff --git a/man/Makefile.in b/man/Makefile.in
index 471cac3..ca2249c 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -31,18 +31,20 @@ LVMRAIDMAN = lvmraid.7
MAN5=lvm.conf.5
MAN7=lvmsystemid.7 lvmreport.7
-MAN8=lvm-config.8 lvm-dumpconfig.8 lvm-fullreport.8 lvm-lvpoll.8 \
- lvchange.8 lvmconfig.8 lvconvert.8 lvcreate.8 lvdisplay.8 lvextend.8 \
- lvm.8 lvmchange.8 lvmconf.8 lvmdiskscan.8 lvmdump.8 lvmsadc.8 lvmsar.8 \
+MAN8=lvm.8 lvmconf.8 lvmdump.8
+MAN8DM=dmsetup.8 dmstats.8
+MAN8CLUSTER=
+MAN8SYSTEMD_GENERATORS=lvm2-activation-generator.8
+
+MAN8GEN=lvm-config.8 lvm-dumpconfig.8 lvm-fullreport.8 lvm-lvpoll.8 \
+ lvcreate.8 lvchange.8 lvmconfig.8 lvconvert.8 lvdisplay.8 lvextend.8 \
lvreduce.8 lvremove.8 lvrename.8 lvresize.8 lvs.8 \
lvscan.8 pvchange.8 pvck.8 pvcreate.8 pvdisplay.8 pvmove.8 pvremove.8 \
pvresize.8 pvs.8 pvscan.8 vgcfgbackup.8 vgcfgrestore.8 vgchange.8 \
vgck.8 vgcreate.8 vgconvert.8 vgdisplay.8 vgexport.8 vgextend.8 \
vgimport.8 vgimportclone.8 vgmerge.8 vgmknodes.8 vgreduce.8 vgremove.8 \
- vgrename.8 vgs.8 vgscan.8 vgsplit.8
-MAN8DM=dmsetup.8 dmstats.8
-MAN8CLUSTER=
-MAN8SYSTEMD_GENERATORS=lvm2-activation-generator.8
+ vgrename.8 vgs.8 vgscan.8 vgsplit.8 \
+ lvmsar.8 lvmsadc.8 lvmdiskscan.8 lvmchange.8
ifeq ($(MAKECMDGOALS),all_man)
MAN_ALL="yes"
@@ -113,8 +115,8 @@ MAN8DIR=$(mandir)/man8
include $(top_builddir)/make.tmpl
-CLEAN_TARGETS+=$(MAN5) $(MAN7) $(MAN8) $(MAN8CLUSTER) \
- $(MAN8SYSTEMD_GENERATORS) $(MAN8DM)
+CLEAN_TARGETS+=$(MAN5) $(MAN7) $(MAN8) $(MAN8GEN) $(MAN8CLUSTER) \
+ $(MAN8SYSTEMD_GENERATORS) $(MAN8DM) *.gen man-generator
DISTCLEAN_TARGETS+=$(FSADMMAN) $(BLKDEACTIVATEMAN) $(DMEVENTDMAN) \
$(LVMETADMAN) $(LVMPOLLDMAN) $(LVMLOCKDMAN) $(CLVMDMAN) $(CMIRRORDMAN) \
$(LVMCACHEMAN) $(LVMTHINMAN) $(LVMDBUSDMAN) $(LVMRAIDMAN)
@@ -125,11 +127,11 @@ all: man device-mapper
device-mapper: $(MAN8DM)
-man: $(MAN5) $(MAN7) $(MAN8) $(MAN8CLUSTER) $(MAN8SYSTEMD_GENERATORS)
+man: $(MAN5) $(MAN7) $(MAN8) $(MAN8GEN) $(MAN8CLUSTER) $(MAN8SYSTEMD_GENERATORS)
all_man: man
-$(MAN5) $(MAN7) $(MAN8) $(MAN8DM) $(MAN8CLUSTER): Makefile
+$(MAN5) $(MAN7) $(MAN8) $(MAN8GEN) $(MAN8DM) $(MAN8CLUSTER): Makefile
Makefile: Makefile.in
@:
@@ -140,6 +142,18 @@ Makefile: Makefile.in
*) echo "Creating $@" ; $(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+;s+#CLVMD_PATH#+@CLVMD_PATH@+;s+#LVM_PATH#+@LVM_PATH@+;s+#DEFAULT_RUN_DIR#+@DEFAULT_RUN_DIR@+;s+#DEFAULT_PID_DIR#+@DEFAULT_PID_DIR@+;s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+;s+#DEFAULT_MANGLING#+$(DEFAULT_MANGLING)+;" $< > $@ ;; \
esac
+man-generator:
+ $(CC) -DMAN_PAGE_GENERATOR -I$(top_builddir)/tools $(CFLAGS) $(top_srcdir)/tools/command.c -o $@
+ - ./man-generator lvmconfig > test.gen
+ if [ ! -s test.gen ] ; then cp genfiles/*.gen $(top_builddir)/man; fi;
+
+$(MAN8GEN): man-generator
+ echo "Generating $@" ;
+ if [ ! -e $@.gen ]; then ./man-generator $(basename $@) $(top_srcdir)/man/$@.des > $@.gen; fi
+ if [ -f $(top_srcdir)/man/$@.end ]; then cat $(top_srcdir)/man/$@.end >> $@.gen; fi;
+ cat $(top_srcdir)/man/see_also.end >> $@.gen
+ $(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+;s+#CLVMD_PATH#+@CLVMD_PATH@+;s+#LVM_PATH#+@LVM_PATH@+;s+#DEFAULT_RUN_DIR#+@DEFAULT_RUN_DIR@+;s+#DEFAULT_PID_DIR#+@DEFAULT_PID_DIR@+;s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+;s+#DEFAULT_MANGLING#+$(DEFAULT_MANGLING)+;" $@.gen > $@
+
install_man5: $(MAN5)
$(INSTALL) -d $(MAN5DIR)
$(INSTALL_DATA) $(MAN5) $(MAN5DIR)/
@@ -148,9 +162,10 @@ install_man7: $(MAN7)
$(INSTALL) -d $(MAN7DIR)
$(INSTALL_DATA) $(MAN7) $(MAN7DIR)/
-install_man8: $(MAN8)
+install_man8: $(MAN8) $(MAN8GEN)
$(INSTALL) -d $(MAN8DIR)
$(INSTALL_DATA) $(MAN8) $(MAN8DIR)/
+ $(INSTALL_DATA) $(MAN8GEN) $(MAN8DIR)/
install_lvm2: install_man5 install_man7 install_man8
diff --git a/man/clvmd.8.in b/man/clvmd.8.in
index 9b9310d..21f8c7d 100644
--- a/man/clvmd.8.in
+++ b/man/clvmd.8.in
@@ -154,6 +154,32 @@ This timeout will be ignored if you start \fBclvmd\fP with the \fB\-d\fP.
.br
Display the version of the cluster LVM daemon.
.
+.SH NOTES
+.
+.SS Activation
+.
+In a clustered VG, clvmd is used for activation, and the following values are
+possible with \fBlvchange/vgchange -a\fP:
+.IP \fBy\fP|\fBsy\fP
+clvmd activates the LV in shared mode (with a shared lock),
+allowing multiple nodes to activate the LV concurrently.
+If the LV type prohibits shared access, such as an LV with a snapshot,
+an exclusive lock is automatically used instead.
+clvmd attempts to activate the LV concurrently on all nodes.
+.IP \fBey\fP
+clvmd activates the LV in exclusive mode (with an exclusive lock),
+allowing a single node to activate the LV.
+clvmd attempts to activate the LV concurrently on all nodes, but only
+one will succeed.
+.IP \fBly\fP
+clvmd attempts to activate the LV only on the local node.
+If the LV type allows concurrent access, then shared mode is used,
+otherwise exclusive.
+.IP \fBn\fP
+clvmd deactivates the LV on all nodes.
+.IP \fBln\fP
+clvmd deactivates the LV on the local node.
+.
.SH ENVIRONMENT VARIABLES
.TP
.B LVM_CLVMD_BINARY
diff --git a/man/lvchange.8.des b/man/lvchange.8.des
new file mode 100644
index 0000000..7aa8ce7
--- /dev/null
+++ b/man/lvchange.8.des
@@ -0,0 +1,2 @@
+lvchange changes LV attributes in the VG, changes LV activation in the
+kernel, and includes other utilities for LV maintenance.
diff --git a/man/lvchange.8.end b/man/lvchange.8.end
new file mode 100644
index 0000000..7134e46
--- /dev/null
+++ b/man/lvchange.8.end
@@ -0,0 +1,6 @@
+.SH EXAMPLES
+
+Change LV permission to read-only:
+.sp
+.B lvchange \-pr vg00/lvol1
+
diff --git a/man/lvchange.8.in b/man/lvchange.8.in
deleted file mode 100644
index 8da9f2d..0000000
--- a/man/lvchange.8.in
+++ /dev/null
@@ -1,491 +0,0 @@
-.TH LVCHANGE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-
-.de UNITS
-..
-
-.
-.SH NAME
-.
-lvchange \(em change attributes of a logical volume
-.
-.SH SYNOPSIS
-.
-.ad l
-.B lvchange
-.RB [ \-a | \-\-activate
-.RB [ a ][ e | s | l ]{ y | n }]
-.RB [ \-\-activationmode
-.RB { complete | degraded | partial }]
-.RB [ \-\-addtag
-.IR Tag ]
-.RB [ \-K | \-\-ignoreactivationskip ]
-.RB [ \-k | \-\-setactivationskip
-.RB { y | n }]
-.RB [ \-\-alloc
-.IR AllocationPolicy ]
-.RB [ \-A | \-\-autobackup
-.RB { y | n }]
-.RB [ \-\-rebuild
-.IR PhysicalVolume ]
-.RB [ \-\-cachemode
-.RB { passthrough | writeback | writethrough }]
-.RB [ \-\-cachepolicy
-.IR Policy ]
-.RB [ \-\-cachesettings
-.IR Key \fB= Value ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-C | \-\-contiguous
-.RB { y | n }]
-.RB [ \-d | \-\-debug ]
-.RB [ \-\-deltag
-.IR Tag ]
-.RB [ \-\-detachprofile ]
-.RB [ \-\-discards
-.RB { ignore | nopassdown | passdown }]
-.RB [ \-\-errorwhenfull
-.RB { y | n }]
-.RB [ \-h | \-? | \-\-help ]
-.RB \%[ \-\-ignorelockingfailure ]
-.RB \%[ \-\-ignoremonitoring ]
-.RB \%[ \-\-ignoreskippedcluster ]
-.RB \%[ \-\-metadataprofile
-.IR ProfileName ]
-.RB [ \-\-monitor
-.RB { y | n }]
-.RB [ \-\-noudevsync ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-p | \-\-permission
-.RB { r | rw }]
-.RB [ \-M | \-\-persistent
-.RB { y | n }
-.RB [ \-\-major
-.IR Major ]
-.RB [ \-\-minor
-.IR Minor ]]
-.RB [ \-\-poll
-.RB { y | n }]
-.RB [ \-\- [ raid ] maxrecoveryrate
-.IR Rate ]
-.RB [ \-\- [ raid ] minrecoveryrate
-.IR Rate ]
-.RB [ \-\- [ raid ] syncaction
-.RB { check | repair }]
-.RB [ \-\- [ raid ] writebehind
-.IR IOCount ]
-.RB [ \-\- [ raid ] writemostly
-.BR \fIPhysicalVolume [ : { y | n | t }]]
-.RB [ \-r | \-\-readahead
-.RB { \fIReadAheadSectors | auto | none }]
-.RB [ \-\-refresh ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-resync ]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB [ \-\-sysinit ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-Z | \-\-zero
-.RB { y | n }]
-.RI [ LogicalVolumePath ...]
-.ad b
-.
-.SH DESCRIPTION
-.
-lvchange allows you to change the attributes of a logical volume
-including making them known to the kernel ready for use.
-.
-.SH OPTIONS
-.
-See \fBlvm\fP(8) for common options.
-.
-.HP
-.BR \-a | \-\-activate
-.RB [ a ][ e | s | l ]{ y | n }
-.br
-Controls the availability of the logical volumes for use.
-Communicates with the kernel device-mapper driver via
-libdevmapper to activate (\fB\-ay\fP) or deactivate (\fB\-an\fP) the
-logical volumes.
-.br
-Activation of a logical volume creates a symbolic link
-\fI/dev/VolumeGroupName/LogicalVolumeName\fP pointing to the device node.
-This link is removed on deactivation.
-All software and scripts should access the device through
-this symbolic link and present this as the name of the device.
-The location and name of the underlying device node may depend on
-the distribution and configuration (e.g. udev) and might change
-from release to release.
-.br
-If autoactivation option is used (\fB\-aay\fP),
-the logical volume is activated only if it matches an item in
-the \fBactivation/auto_activation_volume_list\fP
-set in \fBlvm.conf\fP(5).
-If this list is not set, then all volumes are considered for
-activation. The \fB\-aay\fP option should be also used during system
-boot so it's possible to select which volumes to activate using
-the \fBactivation/auto_activation_volume_list\fP setting.
-.br
-In a clustered VG, clvmd is used for activation, and the
-following options are possible:
-
-With \fB\-aey\fP, clvmd activates the LV in exclusive mode
-(with an exclusive lock), allowing a single node to activate the LV.
-
-With \fB\-asy\fP, clvmd activates the LV in shared mode
-(with a shared lock), allowing multiple nodes to activate the LV concurrently.
-If the LV type prohibits shared access, such as an LV with a snapshot,
-the '\fBs\fP' option is ignored and an exclusive lock is used.
-
-With \fB\-ay\fP (no mode specified), clvmd activates the LV in shared mode
-if the LV type allows concurrent access, such as a linear LV.
-Otherwise, clvmd activates the LV in exclusive mode.
-
-With \fB\-aey\fP, \fB\-asy\fP, and \fB\-ay\fP, clvmd attempts to activate the LV
-on all nodes. If exclusive mode is used, then only one of the
-nodes will be successful.
-
-With \fB\-an\fP, clvmd attempts to deactivate the LV on all nodes.
-
-With \fB\-aly\fP, clvmd activates the LV only on the local node, and \fB\-aln\fP
-deactivates only on the local node. If the LV type allows concurrent
-access, then shared mode is used, otherwise exclusive.
-
-LVs with snapshots are always activated exclusively because they can only
-be used on one node at once.
-
-For local VGs \fB\-ay\fP, \fB\-aey\fP, and \fB\-asy\fP are all equivalent.
-.
-.HP
-.BR \-\-activationmode
-.RB { complete | degraded | partial }
-.br
-The activation mode determines whether logical volumes are allowed to
-activate when there are physical volumes missing (e.g. due to a device
-failure). \fBcomplete\fP is the most restrictive; allowing only those
-logical volumes to be activated that are not affected by the missing
-PVs. \fBdegraded\fP allows RAID logical volumes to be activated even if
-they have PVs missing. (Note that the "\fImirror\fP" segment type is not
-considered a RAID logical volume. The "\fIraid1\fP" segment type should
-be used instead.) Finally, \fBpartial\fP allows any logical volume to
-be activated even if portions are missing due to a missing or failed
-PV. This last option should only be used when performing recovery or
-repair operations. \fBdegraded\fP is the default mode. To change it,
-modify \fBactivation_mode\fP in \fBlvm.conf\fP(5).
-.
-.HP
-.BR \-K | \-\-ignoreactivationskip
-.br
-Ignore the flag to skip Logical Volumes during activation.
-.
-.HP
-.BR \-k | \-\-setactivationskip
-.RB { y | n }
-.br
-Controls whether Logical Volumes are persistently flagged to be
-skipped during activation. By default, thin snapshot volumes are
-flagged for activation skip. To activate such volumes,
-an extra \fB\-\-ignoreactivationskip\fP option must be used.
-The flag is not applied during deactivation. To see whether
-the flag is attached, use \fBlvs\fP(8) command where the state
-of the flag is reported within \fBlv_attr\fP bits.
-.
-.HP
-.BR \-\-cachemode
-.RB { passthrough | writeback | writethrough }
-.br
-Specifying a cache mode determines when the writes to a cache LV
-are considered complete. When \fBwriteback\fP is specified, a write is
-considered complete as soon as it is stored in the cache pool LV.
-If \fBwritethough\fP is specified, a write is considered complete only
-when it has been stored in the cache pool LV and on the origin LV.
-While \fBwritethrough\fP may be slower for writes, it is more
-resilient if something should happen to a device associated with the
-cache pool LV. With \fBpassthrough\fP mode, all reads are served
-from origin LV (all reads miss the cache) and all writes are
-forwarded to the origin LV; additionally, write hits cause cache
-block invalidates. See \fBlvmcache(7)\fP for more details.
-.
-.HP
-.BR \-\-cachepolicy
-.IR Policy ,
-.BR \-\-cachesettings
-.IR Key \fB= Value
-.br
-Only applicable to cached LVs; see also \fBlvmcache(7)\fP. Sets
-the cache policy and its associated tunable settings. In most use-cases,
-default values should be adequate.
-.
-.HP
-.BR \-C | \-\-contiguous
-.RB { y | n }
-.br
-Tries to set or reset the contiguous allocation policy for
-logical volumes. It's only possible to change a non-contiguous
-logical volume's allocation policy to contiguous, if all of the
-allocated physical extents are already contiguous.
-.
-.HP
-.BR \-\-detachprofile
-.br
-Detach any metadata configuration profiles attached to given
-Logical Volumes. See \fBlvm.conf\fP(5) for more information
-about metadata profiles.
-.
-.HP
-.BR \-\-discards
-.RB { ignore | nopassdown | passdown }
-.br
-Set this to \fBignore\fP to ignore any discards received by a
-thin pool Logical Volume. Set to \fBnopassdown\fP to process such
-discards within the thin pool itself and allow the no-longer-needed
-extents to be overwritten by new data. Set to \fBpassdown\fP (the
-default) to process them both within the thin pool itself and to
-pass them down the underlying device.
-.
-.HP
-.BR \-\-errorwhenfull
-.RB { y | n }
-.br
-Sets thin pool behavior when data space is exhaused. See
-.BR lvcreate (8)
-for information.
-.
-.HP
-.BR \-\-ignoremonitoring
-.br
-Make no attempt to interact with dmeventd unless \fB\-\-monitor\fP
-is specified.
-Do not use this if dmeventd is already monitoring a device.
-.
-.HP
-.BR \-\-major
-.IR Major
-.br
-Sets the major number. This option is supported only on older systems
-(kernel version 2.4) and is ignored on modern Linux systems where major
-numbers are dynamically assigned.
-.
-.HP
-.BR \-\-minor
-.IR Minor
-.br
-Set the minor number.
-.
-.HP
-.BR \-\-metadataprofile
-.IR ProfileName
-.br
-Uses and attaches \fIProfileName\fP configuration profile to the logical
-volume metadata. Whenever the logical volume is processed next time,
-the profile is automatically applied. If the volume group has another
-profile attached, the logical volume profile is preferred.
-See \fBlvm.conf\fP(5) for more information about metadata profiles.
-.
-.HP
-.BR \-\-monitor
-.RB { y | n }
-.br
-Start or stop monitoring a mirrored or snapshot logical volume with
-dmeventd, if it is installed.
-If a device used by a monitored mirror reports an I/O error,
-the failure is handled according to
-\%\fBmirror_image_fault_policy\fP and \fBmirror_log_fault_policy\fP
-set in \fBlvm.conf\fP(5).
-.
-.HP
-.BR \-\-noudevsync
-.br
-Disable udev synchronisation. The
-process will not wait for notification from udev.
-It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running
-or has rules that ignore the devices LVM2 creates.
-.
-.HP
-.BR \-p | \-\-permission
-.RB { r | rw }
-.br
-Change access permission to read-only or read/write.
-.
-.HP
-.BR \-M | \-\-persistent
-.RB { y | n }
-.br
-Set to \fBy\fP to make the minor number specified persistent.
-Change of persistent numbers is not supported for pool volumes.
-.
-.HP
-.BR \-\-poll
-.RB { y | n }
-.br
-Without polling a logical volume's backgrounded transformation process
-will never complete. If there is an incomplete pvmove or lvconvert (for
-example, on rebooting after a crash), use \fB\-\-poll y\fP to restart the
-process from its last checkpoint. However, it may not be appropriate to
-immediately poll a logical volume when it is activated, use
-\fB\-\-poll n\fP to defer and then \fB\-\-poll y\fP to restart the process.
-.
-.HP
-.BR \-\- [ raid ] rebuild
-.BR \fIPhysicalVolume
-.br
-Option can be repeated multiple times.
-Selects PhysicalVolume(s) to be rebuild in a RaidLV.
-Use this option instead of
-.BR \-\-resync
-or
-.BR \-\- [ raid ] syncaction
-\fBrepair\fP in case the PVs with corrupted data are known and their data
-should be reconstructed rather than reconstructing default (rotating) data.
-.br
-E.g. in a raid1 mirror, the master leg on /dev/sda may hold corrupt data due
-to a known transient disk error, thus
-.br
-\fBlvchange --rebuild /dev/sda LV\fP
-.br
-will request the master leg to be rebuild rather than rebuilding
-all other legs from the master.
-On a raid5 with rotating data and parity
-.br
-\fBlvchange --rebuild /dev/sda LV\fP
-.br
-will rebuild all data and parity blocks in the stripe on /dev/sda.
-.HP
-.BR \-\- [ raid ] maxrecoveryrate
-.BR \fIRate [ b | B | s | S | k | K | m | M | g | G ]
-.br
-Sets the maximum recovery rate for a RAID logical volume. \fIRate\fP
-is specified as an amount per second for each device in the array.
-If no suffix is given, then KiB/sec/device is assumed. Setting the
-recovery rate to \fB0\fP means it will be unbounded.
-.
-.HP
-.BR \-\- [ raid ] minrecoveryrate
-.BR \fIRate [ b | B | s | S | k | K | m | M | g | G ]
-.br
-Sets the minimum recovery rate for a RAID logical volume. \fIRate\fP
-is specified as an amount per second for each device in the array.
-If no suffix is given, then KiB/sec/device is assumed. Setting the
-recovery rate to \fB0\fP means it will be unbounded.
-.
-.HP
-.BR \-\- [ raid ] syncaction
-.RB { check | repair }
-.br
-This argument is used to initiate various RAID synchronization operations.
-The \fBcheck\fP and \fBrepair\fP options provide a way to check the
-integrity of a RAID logical volume (often referred to as "scrubbing").
-These options cause the RAID logical volume to
-read all of the data and parity blocks in the array and check for any
-discrepancies (e.g. mismatches between mirrors or incorrect parity values).
-If \fBcheck\fP is used, the discrepancies will be counted but not repaired.
-If \fBrepair\fP is used, the discrepancies will be corrected as they are
-encountered. The \fBlvs\fP(8) command can be used to show the number of
-discrepancies found or repaired.
-.
-.HP
-.BR \-\- [ raid ] writebehind
-.IR IOCount
-.br
-Specify the maximum number of outstanding writes that are allowed to
-devices in a RAID1 logical volume that are marked as write-mostly.
-Once this value is exceeded, writes become synchronous (i.e. all writes
-to the constituent devices must complete before the array signals the
-write has completed). Setting the value to zero clears the preference
-and allows the system to choose the value arbitrarily.
-.
-.HP
-.BR \-\- [ raid ] writemostly
-.BR \fIPhysicalVolume [ : { y | n | t }]
-.br
-Mark a device in a RAID1 logical volume as write-mostly. All reads
-to these drives will be avoided unless absolutely necessary. This keeps
-the number of I/Os to the drive to a minimum. The default behavior is to
-set the write-mostly attribute for the specified physical volume in the
-logical volume. It is possible to also remove the write-mostly flag by
-appending a "\fB:n\fP" to the physical volume or to toggle the value by specifying
-"\fB:t\fP". The \fB\-\-writemostly\fP argument can be specified more than one time
-in a single command; making it possible to toggle the write-mostly attributes
-for all the physical volumes in a logical volume at once.
-.
-.HP
-.BR \-r | \-\-readahead
-.RB { \fIReadAheadSectors | auto | none }
-.br
-Set read ahead sector count of this logical volume.
-For volume groups with metadata in lvm1 format, this must
-be a value between 2 and 120 sectors.
-The default value is "\fBauto\fP" which allows the kernel to choose
-a suitable value automatically.
-"\fBnone\fP" is equivalent to specifying zero.
-.
-.HP
-.BR \-\-refresh
-.br
-If the logical volume is active, reload its metadata.
-This is not necessary in normal operation, but may be useful
-if something has gone wrong or if you're doing clustering
-manually without a clustered lock manager.
-.
-.HP
-.BR \-\-resync
-.br
-Forces the complete resynchronization of a mirror. In normal
-circumstances you should not need this option because synchronization
-happens automatically. Data is read from the primary mirror device
-and copied to the others, so this can take a considerable amount of
-time - and during this time you are without a complete redundant copy
-of your data.
-.
-.HP
-.BR \-\-sysinit
-.br
-Indicates that \fBlvchange\fP(8) is being invoked from early system
-initialisation scripts (e.g. rc.sysinit or an initrd),
-before writeable filesystems are available. As such,
-some functionality needs to be disabled and this option
-acts as a shortcut which selects an appropriate set of options. Currently
-this is equivalent to using \fB\-\-ignorelockingfailure\fP,
-\fB\-\-ignoremonitoring\fP, \fB\-\-poll n\fP and setting
-\fBLVM_SUPPRESS_LOCKING_FAILURE_MESSAGES\fP
-environment variable.
-
-If \fB\-\-sysinit\fP is used in conjunction with
-\fBlvmetad\fP(8) enabled and running,
-autoactivation is preferred over manual activation via direct lvchange call.
-Logical volumes are autoactivated according to
-\fBauto_activation_volume_list\fP set in \fBlvm.conf\fP(5).
-.
-.HP
-.BR \-Z | \-\-zero
-.RB { y | n }
-.br
-Set zeroing mode for thin pool. Note: already provisioned blocks from pool
-in non-zero mode are not cleared in unwritten parts when setting zero to
-\fBy\fP.
-.
-.SH ENVIRONMENT VARIABLES
-.
-.TP
-.B LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES
-Suppress locking failure messages.
-.
-.SH Examples
-.
-Changes the permission on volume lvol1 in volume group vg00 to be read-only:
-.sp
-.B lvchange \-pr vg00/lvol1
-.
-.SH SEE ALSO
-.
-.nh
-.BR lvm (8),
-.BR lvmetad (8),
-.BR lvs (8),
-.BR lvcreate (8),
-.BR vgchange (8),
-.BR lvmcache (7),
-.BR lvmthin (7),
-.BR lvm.conf (5)
diff --git a/man/lvconvert.8.des b/man/lvconvert.8.des
new file mode 100644
index 0000000..2aa95a1
--- /dev/null
+++ b/man/lvconvert.8.des
@@ -0,0 +1,32 @@
+lvconvert changes the LV type and includes utilities for LV data
+maintenance. The LV type controls data layout and redundancy.
+The LV type is also called the segment type or segtype.
+
+To display the current LV type, run the command:
+
+.B lvs \-o name,segtype
+.I LV
+
+The
+.B linear
+type is equivalent to the
+.B striped
+type when one stripe exists.
+In that case, the types can sometimes be used interchangably.
+
+In most cases, the
+.B mirror
+type is deprecated and the
+.B raid1
+type should be used. They are both implementations of mirroring.
+
+In some cases, an LV is a single device mapper (dm) layer above physical
+devices. In other cases, hidden LVs (dm devices) are layered between the
+visible LV and physical devices. LVs in the middle layers are called sub LVs.
+A command run on a visible LV sometimes operates on a sub LV rather than
+the specified LV. In other cases, a sub LV must be specified directly on
+the command line.
+
+Sub LVs can be displayed with the command
+.B lvs -a
+
diff --git a/man/lvconvert.8.end b/man/lvconvert.8.end
new file mode 100644
index 0000000..fa8cc1d
--- /dev/null
+++ b/man/lvconvert.8.end
@@ -0,0 +1,95 @@
+.SH EXAMPLES
+
+Convert a linear LV to a two-way mirror LV.
+.br
+.B lvconvert \-\-type mirror \-\-mirrors 1 vg/lvol1
+
+Convert a linear LV to a two-way RAID1 LV.
+.br
+.B lvconvert \-\-type raid1 \-\-mirrors 1 vg/lvol1
+
+Convert a mirror LV to use an in\-memory log.
+.br
+.B lvconvert \-\-mirrorlog core vg/lvol1
+
+Convert a mirror LV to use a disk log.
+.br
+.B lvconvert \-\-mirrorlog disk vg/lvol1
+
+Convert a mirror or raid1 LV to a linear LV.
+.br
+.B lvconvert --type linear vg/lvol1
+
+Convert a mirror LV to a raid1 LV with the same number of images.
+.br
+.B lvconvert \-\-type raid1 vg/lvol1
+
+Convert a linear LV to a two-way mirror LV, allocating new extents from specific
+PV ranges.
+.br
+.B lvconvert \-\-mirrors 1 vg/lvol1 /dev/sda:0\-15 /dev/sdb:0\-15
+
+Convert a mirror LV to a linear LV, freeing physical extents from a specific PV.
+.br
+.B lvconvert \-\-type linear vg/lvol1 /dev/sda
+
+Split one image from a mirror or raid1 LV, making it a new LV.
+.br
+.B lvconvert \-\-splitmirrors 1 \-\-name lv_split vg/lvol1
+
+Split one image from a raid1 LV, and track changes made to the raid1 LV
+while the split image remains detached.
+.br
+.B lvconvert \-\-splitmirrors 1 \-\-trackchanges vg/lvol1
+
+Merge an image (that was previously created with \-\-splitmirrors and
+\-\-trackchanges) back into the original raid1 LV.
+.br
+.B lvconvert \-\-mergemirrors vg/lvol1_rimage_1
+
+Replace PV /dev/sdb1 with PV /dev/sdf1 in a raid1/4/5/6/10 LV.
+.br
+.B lvconvert \-\-replace /dev/sdb1 vg/lvol1 /dev/sdf1
+
+Replace 3 PVs /dev/sd[b-d]1 with PVs /dev/sd[f-h]1 in a raid1 LV.
+.br
+.B lvconvert \-\-replace /dev/sdb1 \-\-replace /dev/sdc1 \-\-replace /dev/sdd1
+.RS
+.B vg/lvol1 /dev/sd[fgh]1
+.RE
+
+Replace the maximum of 2 PVs /dev/sd[bc]1 with PVs /dev/sd[gh]1 in a raid6 LV.
+.br
+.B lvconvert \-\-replace /dev/sdb1 \-\-replace /dev/sdc1 vg/lvol1 /dev/sd[gh]1
+
+Convert an LV into a thin LV in the specified thin pool. The existing LV
+is used as an external read\-only origin for the new thin LV.
+.br
+.B lvconvert \-\-type thin \-\-thinpool vg/tpool1 vg/lvol1
+
+Convert an LV into a thin LV in the specified thin pool. The existing LV
+is used as an external read\-only origin for the new thin LV, and is
+renamed "external".
+.br
+.B lvconvert \-\-type thin \-\-thinpool vg/tpool1
+.RS
+.B \-\-originname external vg/lvol1
+.RE
+
+Convert an LV to a cache pool LV using another specified LV for cache pool
+metadata.
+.br
+.B lvconvert \-\-type cache-pool \-\-poolmetadata vg/poolmeta1 vg/lvol1
+
+Convert an LV to a cache LV using the specified cache pool and chunk size.
+.br
+.B lvconvert \-\-type cache \-\-cachepool vg/cpool1 \-c 128 vg/lvol1
+
+Detach and keep the cache pool from a cache LV.
+.br
+.B lvconvert \-\-splitcache vg/lvol1
+
+Detach and remove the cache pool from a cache LV.
+.br
+.B lvconvert \-\-uncache vg/lvol1
+
diff --git a/man/lvconvert.8.in b/man/lvconvert.8.in
deleted file mode 100644
index 0becc8a..0000000
--- a/man/lvconvert.8.in
+++ /dev/null
@@ -1,1199 +0,0 @@
-.TH LVCONVERT 8 "LVM TOOLS #VERSION#" "Red Hat, Inc" \" -*- nroff -*-
-.SH NAME
-lvconvert \(em change LV type and other utilities
-.
-.SH SYNOPSIS
-
-.B lvconvert
-.RI [ OPTION ]...
-.IR VolumeGroup / LogicalVolume
-
-OPTIONS:
-.br
-.BR \-b ,
-.BR \-\-background
-.br
-.BR \-\-cachepolicy
-.IR Policy
-.br
-.BR \-\-cachepool
-.IR CachePoolLogicalVolume { Name | Path }
-.br
-.BR \-\-cachesettings
-.IB Key = Value
-.br
-.BR \-c ,
-.BR \-\-chunksize
-.BR \fIChunkSize [ b | B | s | S | k | K | m | M | g | G ]
-.br
-.BR \-\-corelog
-.br
-.BR \-\-discards
-.RB { ignore | nopassdown | passdown }
-.br
-.BR \-i ,
-.BR \-\-interval
-.IR Seconds
-.br
-.BR \-\-merge
-.br
-.BR \-\-mirrorlog
-.RB { disk | core | mirrored }
-.br
-.BR \-m ,
-.BR \-\-mirrors
-.IR Number
-.br
-.BR \-n ,
-.BR \-\-name
-.IR Name
-.br
-.BR \-\-noudevsync
-.br
-.BR \-\-originname
-.IR NewExternalOriginVolumeName
-.br
-.BR \-\-poolmetadata
-.IR PoolMetadataLogicalVolume { Name | Path }
-.br
-.BR \-\-poolmetadatasize
-.BR \fIPoolMetadataSize [ b | B | s | S | k | K | m | M | g | G ]
-.br
-.BR \-\-poolmetadataspare
-.RB { y | n }
-.br
-.BR \-r ,
-.BR \-\-readahead
-.RB { \fIReadAheadSectors | auto | none }
-.br
-.BR \-R ,
-.BR \-\-regionsize
-.IR MirrorLogRegionSize
-.br
-.BR \-\-repair
-.br
-.BR \-\-replace
-.IR PhysicalVolume
-.br
-.BR \-\-splitcache
-.br
-.BR \-\-splitmirrors
-.IR Number
-.br
-.BR \-\-splitsnapshot
-.br
-.BR \-\-stripes
-.IR Number
-.br
-.BR \-I ,
-.BR \-\-stripesize
-.IR StripeSize
-.br
-.B \-\-type striped
-.br
-.B \-\-type snapshot
-|
-.B \-\-snapshot
-|
-.B \-s
-.br
-.B \-\-type mirror
-.br
-.B \-\-type raid*
-.br
-.B \-\-type thin
-|
-.B \-\-thin
-|
-.B \-T
-.br
-.B \-\-type cache
-|
-.B \-\-cache
-|
-.B \-H
-.br
-.B \-\-type thin\-pool
-.br
-.B \-\-type cache\-pool
-.br
-.BR \-\-thinpool
-.IR ThinPoolLogicalVolume { Name | Path }
-.br
-.BR \-\-trackchanges
-.br
-.BR \-\-uncache
-.br
-.BR \-Z ,
-.BR \-\-zero
-.RB { y | n }
-.br
-
-Common options:
-.br
-.BR \-A ,
-.BR \-\-alloc
-.IR AllocationPolicy
-.br
-.BR \-f ,
-.BR \-\-force
-.br
-.BR \-\-commandprofile
-.IR ProfileName
-.br
-.BR \-h ,
-.BR \-? ,
-.BR \-\-help
-.br
-.BR \-v ,
-.BR \-\-verbose
-.br
-.BR \-y ,
-.BR \-\-yes
-.br
-.BR \-\-version
-
-
-
-
-.SH DESCRIPTION
-
-lvconvert changes the LV type and includes various LV utilities.
-
-To display the current LV type, run the command:
-
-.B lvs \-o name,segtype
-.IR VG / LV
-
-To change the LV type, run the command:
-
-.B lvconvert \-\-type
-.I NewType
-.IR VG / LV
-
-.SS LV types
-
-The LV type is also called the "segment type" or "segtype".
-
-LVs with the following types can be modified by lvconvert:
-.B striped,
-.B snapshot,
-.B mirror,
-.B raid*,
-.B thin,
-.B cache,
-.B thin\-pool,
-.B cache\-pool.
-
-The specific operations available on each LV type are listed below.
-
-The
-.B linear
-type is equivalent to the
-.B striped
-type when one stripe exists.
-In that case, the types can sometimes be used interchangably.
-
-In most cases, the
-.B mirror
-type is deprecated and the
-.B raid1
-type should be used. They are both implementations of mirroring.
-
-The
-.B raid*
-type refers to one of many raid levels, e.g.
-.B raid1,
-.B raid5.
-
-.SS LV layers
-
-In some cases, an LV is a single device mapper (dm) layer above physical
-devices. In other cases, hidden LVs (dm devices) are layered between the
-visible LV and physical devices. LVs in the middle layers are sometimes
-called sub LVs.
-
-Changing the LV type will often change the composition of sub LVs.
-
-Sub LVs can be displayed with the command
-.B lvs -a.
-
-A command run on a visible LV sometimes operates on a sub LV rather than
-the specified LV. These cases are noted below.
-
-Sometimes a sub LV must be specified directly on the command line, but
-this is a non-standard form. These cases may change in the future to
-avoid the direct use of hidden LVs.
-
-.SH COMMANDS
-
-.SS Operations on a StripedLV with type striped or linear:
-
-\&
-
-.B lvconvert \-\-merge
-VG/StripedLV
-./" FIXME: use --merge-mirror
-.br
-\[bu]
-Merge StripedLV into an LV when it is a previously split mirror.
-.br
-\[bu]
-Options \-\-background, \-\-interval.
-.br
-\[bu]
-See corresponding operation --splitmirrors.
-
-.B lvconvert \-\-type snapshot
-VG/StripedLV VG/SnapshotLV
-.br
-\[bu]
-Recombine StripedLV with SnapshotLV which was previously split.
-.br
-\[bu]
-Options \-\-chunksize, \-\-zero.
-.br
-\[bu]
-See corresponding operation --splitsnapshot.
-
-.B lvconvert \-\-type thin
-VG/StripedLV
-.br
-\[bu]
-Convert StripedLV to type thin with an external origin.
-.br
-\[bu]
-StripedLV becomes a read\-only external origin LV with a new name.
-.br
-\[bu]
-Requires \-\-thinpool to specify the thin pool to use.
-.br
-\[bu]
-Options \-\-originname.
-
-.B lvconvert \-\-type cache
-VG/StripedLV
-.br
-\[bu]
-Convert StripedLV to type cache.
-.br
-\[bu]
-Requires \-\-cachepool to specify the cache pool to use.
-.br
-\[bu]
-Options \-\-cachepolicy, \-\-cachesettings.
-
-.B lvconvert \-\-type thin\-pool
-VG/StripedLV
-.br
-\[bu]
-Convert StripedLV to type thin\-pool.
-.br
-\[bu]
-The StripedLV is used for thin pool data.
-.br
-\[bu]
-Options \-\-chunksize, \-\-discards, \-\-poolmetadata{size,spare},
-.br
- \-\-readahead, \-\-zero.
-
-.B lvconvert \-\-type cache\-pool
-VG/StripedLV
-.br
-\[bu]
-Convert StripedLV to type cache\-pool.
-.br
-\[bu]
-Options \-\-chunksize, \-\-poolmetadata{size,spare}.
-
-.B lvconvert \-\-type mirror
-VG/StripedLV
-.br
-\[bu]
-Convert StripedLV to type mirror.
-.br
-\[bu]
-Requires \-\-mirrors to specify the number of mirrors to use.
-.br
-\[bu]
-Options \-\-mirrorlog, \-\-regionsize.
-
-.B lvconvert \-\-type raid*
-VG/StripedLV
-.br
-\[bu]
-Convert StripedLV to type raid*.
-.br
-\[bu]
-Required options depend on the raid level.
-
-.SS Operations on RaidLV with type raid*:
-
-\&
-
-.B lvconvert \-\-mirrors
-Number
-VG/RaidLV
-.br
-\[bu]
-Change the number of images in raid1 RaidLV.
-
-.B lvconvert \-\-splitmirrors
-Number
-VG/RaidLV
-.br
-\[bu]
-Split images from raid1 RaidLV and use them to create a new LV.
-.br
-\[bu]
-Requires \-\-name for the new LV, or the use of \-\-trackchanges.
-
-.B lvconvert \-\-merge
-VG/RaidLV
-./" FIXME: use --merge-mirror
-.br
-\[bu]
-Merge RaidLV into an LV when it is a previously split mirror.
-.br
-\[bu]
-Options \-\-background, \-\-interval.
-.br
-\[bu]
-See corresponding operation --splitmirrors.
-
-.B lvconvert \-\-repair
-VG/RaidLV
-.br
-\[bu]
-Options \-\-background, \-\-interval.
-.br
-\[bu]
-Replace failed PVs in RaidLV.
-
-.B lvconvert \-\-replace
-PV
-VG/RaidLV
-.br
-\[bu]
-Replace specific PV(s) in a raid* LV with another PV.
-.br
-\[bu]
-The new PV(s) to use can be optionally specified after the LV.
-.br
-\[bu]
-Repeat to replace multiple: \-\-replace PV1 \-\-replace PV2 ...
-
-.B lvconvert \-\-type snapshot
-VG/RaidLV
-VG/SnapshotLV
-.br
-\[bu]
-Combine RaidLV with SnapshotLV that was previously split.
-.br
-\[bu]
-Options \-\-chunksize, \-\-zero.
-.br
-\[bu]
-See corresponding operation \-\-splitsnapshot.
-
-.B lvconvert \-\-type thin
-VG/RaidLV
-.br
-\[bu]
-Convert RaidLV to type thin with an external origin.
-.br
-\[bu]
-RaidLV becomes a read\-only external origin LV with a new name.
-.br
-\[bu]
-Requires \-\-thinpool to specify the thin pool to use.
-.br
-\[bu]
-Options \-\-originname.
-
-.B lvconvert \-\-type cache
-VG/RaidLV
-.br
-\[bu]
-Convert RaidLV to type cache.
-.br
-\[bu]
-Requires \-\-cachepool to specify the cache pool to use.
-.br
-\[bu]
-Options \-\-cachepolicy, \-\-cachesettings.
-
-.B lvconvert \-\-type thin\-pool
-VG/RaidLV
-.br
-\[bu]
-Convert RaidLV to type thin\-pool.
-.br
-\[bu]
-The RaidLV is used for thin pool data.
-.br
-\[bu]
-Options \-\-chunksize, \-\-discards, \-\-poolmetadata{size,spare},
-.br
- \-\-readahead, \-\-zero.
-
-.B lvconvert \-\-type cache\-pool
-VG/RaidLV
-.br
-\[bu]
-Convert RaidLV to type cache\-pool.
-.br
-\[bu]
-Options \-\-chunksize, \-\-poolmetadata{size,spare}.
-
-.B lvconvert \-\-type raid*
-VG/RaidLV
-.br
-\[bu]
-Convert RaidLV to use a different raid level.
-.br
-\[bu]
-Required options depend on the raid level.
-
-.B lvconvert \-\-type mirror
-VG/RaidLV
-.br
-\[bu]
-Convert RaidLV to type mirror.
-
-.B lvconvert \-\-type striped
-VG/RaidLV
-.br
-\[bu]
-Convert RaidLV to type striped.
-
-.B lvconvert \-\-type linear
-VG/RaidLV
-.br
-\[bu]
-Convert RaidLV to type linear.
-
-.SS Operations on MirrorLV with type mirror:
-
-\&
-
-.B lvconvert \-\-mirrors
-Number
-VG/MirrorLV
-.br
-\[bu]
-Change the number of images in MirrorLV.
-
-.B lvconvert \-\-splitmirrors
-Number
-VG/MirrorLV
-.br
-\[bu]
-Split images from MirrorLV and use them to create a new LV.
-.br
-\[bu]
-Requires \-\-name for the new LV.
-
-.B lvconvert \-\-mirrorlog
-LogType
-VG/MirrorLV
-.br
-\[bu]
-Change the type of log used by MirrorLV.
-
-.B lvconvert \-\-repair
-VG/MirrorLV
-.br
-\[bu]
-Options \-\-background, \-\-interval.
-.br
-\[bu]
-Replace failed PVs in MirrorLV.
-
-.B lvconvert \-\-type linear
-VG/MirrorLV
-.br
-\[bu]
-Convert MirrorLV to type linear.
-
-.B lvconvert \-\-type raid*
-VG/MirrorLV
-.br
-\[bu]
-Convert MirrorLV to type raid*.
-.br
-\[bu]
-Required options depend on the raid level.
-
-.SS Operations on CachePoolLV with type cache\-pool:
-
-\&
-
-.B lvconvert \-\-splitcache
-VG/CachePoolLV
-.br
-\[bu]
-Split the cache LV from CachePoolLV.
-.br
-\[bu]
-Equivalent to --splitcache on CacheLV.
-
-.SS Operations on CacheLV with type cache:
-
-\&
-
-.B lvconvert \-\-splitcache
-VG/CacheLV
-.br
-\[bu]
-Split and keep the cache pool from CacheLV.
-
-.B lvconvert \-\-uncache
-VG/CacheLV
-.br
-\[bu]
-Split and remove the cache pool from CacheLV.
-
-.B lvconvert \-\-splitmirrors
-Number
-VG/CacheLV
-.br
-\[bu]
-Split images from the mirrored origin of CacheLV to create a new LV.
-.br
-\[bu]
-Operates on mirror or raid1 sub LV.
-.br
-\[bu]
-Requires \-\-name for the new LV, or the use of \-\-trackchanges.
-
-.B lvconvert \-\-type thin\-pool
-VG/CacheLV
-.br
-\[bu]
-Convert CacheLV to type thin-pool.
-.br
-\[bu]
-The CacheLV is used for thin pool data.
-.br
-\[bu]
-Options \-\-chunksize, \-\-discards, \-\-poolmetadata{size,spare},
-.br
- \-\-readahead, \-\-zero.
-
-
-.SS Operations on ThinPoolLV with type thin\-pool:
-
-\&
-
-.B lvconvert \-\-splitcache
-VG/ThinPoolLV
-.br
-\[bu]
-Split and keep the cache pool from the data portion of ThinPoolLV.
-.br
-\[bu]
-Operates on the data sub LV of the thin pool LV.
-.br
-\[bu]
-The data sub LV of the thin pool must be a cache LV.
-
-.B lvconvert \-\-uncache
-VG/ThinPoolLV
-.br
-\[bu]
-Split and remove the cache pool from the data portion of ThinPoolLV.
-.br
-\[bu]
-Operates on the data sub LV of the thin pool LV.
-.br
-\[bu]
-The data sub LV of the thin pool must be a cache LV.
-
-.B lvconvert \-\-type cache
-VG/ThinPoolLV
-.br
-\[bu]
-Convert the data portion of ThinPoolLV to type cache.
-.br
-\[bu]
-Requires \-\-cachepool to specify the cache pool to use.
-.br
-\[bu]
-Operates on the data sub LV of the thin pool LV.
-.br
-\[bu]
-Options \-\-cachepolicy, \-\-cachesettings.
-
-.B lvconvert \-\-repair
-VG/ThinPoolLV
-.br
-\[bu]
-Repair ThinPoolLV.
-
-.SS Operations on ThinLV with type thin:
-
-\&
-
-.B lvconvert \-\-merge
-VG/ThinLV
-./" FIXME: use --merge-snapshot
-.br
-\[bu]
-Merge ThinLV into its origin LV.
-.br
-\[bu]
-ThinLV must have been created as a snapshot of another thin LV.
-.br
-\[bu]
-Options \-\-background, \-\-interval.
-
-.SS Operations on SnapshotLV with type snapshot:
-
-\&
-
-.B lvconvert \-\-splitsnapshot
-VG/SnapshotLV
-.br
-\[bu]
-Separate COW snapshot SnapshotLV from its origin LV.
-
-.B lvconvert \-\-merge
-VG/SnapshotLV
-./" FIXME: use --merge-snapshot
-.br
-\[bu]
-Merge COW snapshot SnapshotLV into its origin.
-.br
-\[bu]
-Options \-\-background, \-\-interval.
-
-.SH OPTIONS
-.
-See \fBlvm\fP(8) for common options.
-.br
-.
-.HP
-.BR \-b ,
-.BR \-\-background
-.br
-If the operation requires polling, this option causes the command to
-return before the operation is complete, and polling is done in the
-background.
-.
-.HP
-.BR \-\-cachepolicy
-.IR Policy
-.br
-Specifies the cache policy for a cache LV. Also see
-.BR lvmcache (7).
-.
-.HP
-.BR \-\-cachepool
-.IR CachePoolLogicalVolume { Name | Path }
-.br
-Specifies the cache pool to use when converting an LV to a cache LV. If
-CachePoolLogicalVolume is not yet a cache pool, the command will attempt
-to convert it into a cache pool prior to the cache LV conversion.
-Also see
-.BR lvmcache (7).
-.
-.HP
-.BR \-\-cachesettings
-.IB Key = Value
-.br
-Specifies tunable values for a cache LV. (The default values should
-usually be adequate.) The special string value \fBdefault\fP switches
-settings back to their default kernel values and removes them from the
-list of settings stored in LVM metadata.
-Also see
-.BR lvmcache (7).
-.
-.HP
-.BR \-c ,
-.BR \-\-chunksize
-.BR \fIChunkSize [ b | B | s | S | k | K | m | M | g | G ]
-.br
-Sets the chunk size for a snapshot, cache pool or thin pool.
-The default unit is in kilobytes.
-.sp
-For snapshots, the value must be a power of 2 between 4KiB and 512KiB
-and the default value is 4.
-.sp
-For a cache pool the value must be between 32KiB and 1GiB and
-the default value is 64.
-.sp
-For a thin pool the value must be between 64KiB and
-1GiB and the default value starts with 64 and scales
-up to fit the pool metadata size within 128MiB,
-if the pool metadata size is not specified.
-The value must be a multiple of 64KiB.
-(Early kernel support until thin target version 1.4 required the value
-to be a power of 2. Discards were not supported for non-power of 2 values
-until thin target version 1.5.)
-.
-.HP
-.BR \-\-corelog
-.br
-Specifies or changes the log type for a mirror LV.
-It is an alias for \fB\-\-mirrorlog core\fP.
-(This option does not apply to the \fBraid1\fP LV type.)
-.
-.HP
-.BR \-\-discards
-.RB { ignore | nopassdown | passdown }
-.br
-Specifies if discards will be processed by the thin layer in the
-kernel and passed down to the Physical Volume. This applies only
-to thin pools. The default is \fBpassdown\fP.
-Also see
-.BR lvmthin (7).
-.
-.HP
-.BR \-H ,
-.BR \-\-cache
-.br
-Alias for
-.B \-\-type cache.
-See COMMANDS description for
-.br
-.B lvconvert \-\-type cache.
-.
-.HP
-.BR \-i ,
-.BR \-\-interval
-.IR Seconds
-.br
-Report progress as a percentage at regular intervals.
-.
-.HP
-.BR \-\-merge
-.br
-Merges a snapshot that was split from an origin LV using
-\fB\-\-splitsnapshot\fP, back into the origin LV.
-
-Merges a raid1 image that was split from a raid1 LV using
-\fB\-\-splitsnapshot\fP and \fB\-\-trackchanges\fP, back into
-the original raid1 LV.
-
-To check if the kernel supports the snapshot merge feature, look for
-"snapshot\-merge" in the output of \fBdmsetup targets\fP.
-
-When merging a snapshot, if both the origin and snapshot LVs are not open,
-the merge will start immediately. Otherwise, the merge will start the
-first time either the origin or snapshot LV are activated and both are
-closed. Merging a snapshot into an origin that cannot be closed, for
-example a root filesystem, is deferred until the next time the origin
-volume is activated. When merging starts, the resulting LV will have the
-origin's name, minor number and UUID. While the merge is in progress,
-reads or writes to the origin appear as being directed to the snapshot
-being merged. When the merge finishes, the merged snapshot is removed.
-Multiple snapshots may be specified on the command line or a @tag may be
-used to specify multiple snapshots be merged to their respective origin.
-.
-.HP
-.BR \-\-mirrorlog
-.RB { disk | core | mirrored }
-.br
-Specifies or changes the log type for a mirror LV.
-The default is \fBdisk\fP, which is persistent and requires
-a small amount of storage space, usually on a separate device
-from the data being mirrored.
-\fBCore\fP may be useful for short-lived mirrors. It means the mirror is
-regenerated by copying the data from the first device again every
-time the device is activated - e.g. possibly after every reboot.
-Using \fBmirrored\fP will create a persistent log that is itself mirrored.
-(This option does not apply to the \fBraid1\fP LV type.)
-.
-.HP
-.BR \-m ,
-.BR \-\-mirrors
-.IR Number
-.br
-Specifies the number mirror images in addition to the original LV image,
-e.g. \fB\-\-mirrors 1\fP means two copies of the data, the original and
-one mirror image.
-
-The current maximum is 9 providing 10 raid1 images.
-
-This option is required when converting an LV to a \fBraid1\fP or
-\fBmirror\fP LV.
-
-This option can be used alone to change the number of mirror images in an
-existing \fBraid1\fP or \fBmirror\fP LV.
-
-The special case \fB\-\-mirrors 0\fP has been used historically to
-indicate a linear LV with no mirror images.
-.
-.HP
-.BR \-n ,
-.BR \-\-name
-.IR Name
-.br
-Specifies the name to use when the command is creating a new LV, e.g.
-.B \-\-splitmirrors.
-.
-.HP
-.BR \-\-noudevsync
-.br
-Disables udev synchronisation. The process will not wait for notification
-from udev. It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running or has
-rules that ignore the devices LVM creates.
-.
-.HP
-.BR \-\-originname
-.IR NewExternalOriginVolumeName
-.br
-Specifies the name to use for the external origin LV when converting an LV
-to a thin LV. The LV being converted becomes a read\-only external origin
-with this name.
-.br
-Without this option, the default name of "lvol<n>" will be generated where
-<n> is the LVM internal number of the LV.
-.br
-.
-.\" .HP
-.\" .BR \-\-pooldatasize
-.\" .IR PoolDataVolumeSize [ \fBbBsSkKmMgGtTpPeE ]
-.\" .br
-.\" Sets the size of pool's data logical volume.
-.\" The option \fB\-\-size\fP could be still used with thin pools.
-.
-.HP
-.BR \-\-poolmetadata
-.IR PoolMetadataLogicalVolume { Name | Path }
-.br
-Specifies the LV to use for thin pool metadata when converting an LV to a
-thin pool LV.
-.br
-Specifies the LV to use for cache pool metadata when converting an LV to a
-cache pool LV.
-.br
-The size should be between 2MiB and 16GiB.
-.br
-(This option can also be used when a thin pool or cache pool are created
-as an auxiliary operation within a different command.)
-Also see
-.BR lvmthin (7),
-and
-.BR lvmcache (7).
-.
-.HP
-.BR \-\-poolmetadatasize
-.BR \fIPoolMetadataSize [ b | B | s | S | k | K | m | M | g | G ]
-.br
-Specifies the size of a cache pool metadata LV or a thin pool metadata LV.
-This is used if a command creates a pool metadata LV automatically as part
-of the operation. This option is not used when an existing LV is
-specified as the pool metadata LV, i.e. \fB\-\-poolmetadata\fP.
-The default unit is megabytes.
-Also see
-.BR lvmthin (7),
-and
-.BR lvmcache (7).
-.
-.HP
-.BR \-\-poolmetadataspare
-.RB { y | n }
-.br
-Specifies if a spare pool metadata LV should be created.
-A spare pool metadata LV will be used for pool repair.
-Only one spare pool metadata LV is maintained within a VG, with the size
-of the largest existing pool metadata LV.
-The default is \fBy\fPes.
-.
-.HP
-.BR \-r ,
-.BR \-\-readahead
-.RB { \fIReadAheadSectors | auto | none }
-.br
-Specifies the read ahead sector count of a thin pool metadata LV.
-The default value is \fBauto\fP which allows the kernel to choose
-a suitable value automatically.
-\fBNone\fP is equivalent to specifying zero.
-.
-.HP
-.BR \-R ,
-.BR \-\-regionsize
-.IR MirrorLogRegionSize
-.br
-A mirror LV is divided into regions of this size (in MB), and the mirror
-log uses this granularity to track which regions are in sync.
-(This option does not apply to the \fBraid1\fP LV type.)
-.
-.HP
-.BR \-\-repair
-.br
-Replaces failed PVs in a raid1 or mirror LV with other PVs available in
-the VG. By default, the original number of mirror images will be restored
-if possible. Specify \fB\-y\fP on the command line to skip the prompts.
-Use \fB\-f\fP if you do not want any replacement. You may use
-\fB\-\-use\-policies\fP to use the device replacement policy specified in
-\fBlvm.conf\fP(5), see \fBactivation/mirror_log_fault_policy\fP or
-\fBactivation/mirror_device_fault_policy\fP.
-
-When used with a thin pool LV, this option automates the use of the
-\fBthin_repair\fP(8) tool on the thin pool. This repairs a very limitted
-number of problems. Only inactive thin pools can be repaired. There is
-no validation of metadata between kernel and LVM. This requires further
-manual work. After successfull repair the old unmodified metadata are
-still available in "<pool>_meta<n>" LV.
-Also see
-.BR lvmthin (7).
-.
-.HP
-.BR \-\-replace
-.IR PhysicalVolume
-.br
-Remove the specified device \fIPhysicalVolume\fP and replace it with one
-that is available in the VG, or from a specific list of PVs specified on
-the command line following the LV name. This option may be repeated multiple
-times depending on the RaidLV type.
-.
-.HP
-.BR \-s ,
-.BR \-\-snapshot
-.br
-Alias for
-.B \-\-type snapshot.
-See COMMANDS description for
-.br
-.B lvconvert \-\-type snapshot.
-.HP
-.BR \-\-split
-.br
-Separates \fISplitableLogicalVolume\fP.
-This option tries to detect the necessary split operation from its arguments.
-Avoid using this option and use one of the following instead:
-.B \-\-splitcache, \-\-splitmirrors, \-\-splitsnapshot.
-.
-.HP
-.BR \-\-splitcache
-.br
-Separates a cache pool from a cache LV, and keeps the unused cache pool
-LV. Before the separation, the cache is flushed. See similar option
-.B \-\-uncache.
-Also see
-.BR lvmcache (7).
-.
-.HP
-.BR \-\-splitmirrors
-.IR Number
-.br
-Splits the specified number of images from a \fBraid1\fP or \fBmirror\fP
-LV and uses them to create a new LV.
-
-If \fB\-\-trackchanges\fP is also specified, changes to the raid1 LV are
-tracked while the split LV remains detached.
-.B lvconvert \-\-merge
-can be used to recombine the split images with the original raid1 LV.
-
-A name can be specified for the new LV with \fB\-\-name\fP (a name is
-required without \fB\-\-trackchanges\fP).
-.
-.HP
-.BR \-\-splitsnapshot
-.br
-Separates a COW snapshot from its origin LV. The LV that is split off
-contains the chunks that differ from the origin LV along with metadata
-describing them. This LV can be wiped and then destroyed with lvremove.
-See corresponding operation
-.B lvconvert \-\-type snapshot.
-.
-.HP
-.BR \-\-stripes
-.IR Number
-.br
-Specifies the number of stripes in a striped LV. This is the number of
-physical volumes (devices) that a striped LV is spread across. Data that
-appears sequential in the LV is spread across multiple devices in units of
-the stripe size (see \fB\-\-stripesize\fP). This does not apply to
-existing allocated space, only newly allocated space can be striped.
-.
-.HP
-.BR \-I ,
-.BR \-\-stripesize
-.IR StripeSize
-.br
-Specifies the stripe size in kilobytes for a striped LV. The stripe size
-is the number of kilobytes written to each stripe, i.e. to one device,
-before writing to the next stripe/device. StripeSize must be a power of 2
-and cannot exceed the VG physical extent (PE) size.
-.
-.HP
-.BR \-\-type
-.IR SegmentType
-.br
-Converts an LV from one segment type to another.
-See COMMANDS section for a description of converting between each type.
-.
-.HP
-.BR \-\-thinpool
-.IR ThinPoolLogicalVolume { Name | Path }
-.br
-Specifies the thin pool to use when converting an LV to a thin LV. If
-ThinPoolLogicalVolume is not yet a thin pool, the command will attempt to
-convert it to a thin pool prior to the thin LV conversion.
-Also see
-.BR lvmthin (7).
-.
-.HP
-.BR \-\-trackchanges
-.br
-Can be used with \fB\-\-splitmirrors\fP on a raid1 LV. This causes
-changes to the original raid1 LV to be tracked while the split images
-remain detached. This allows the read\-only detached image(s) to be
-merged efficiently back into the raid1 LV later. Only the regions with
-changed data are resynchronized during merge. (This option only applies
-to the \fBraid1\fP LV type.)
-.
-.HP
-.BR \-T ,
-.BR \-\-thin
-.br
-Alias for
-.B \-\-type thin.
-See COMMANDS description for
-.br
-.B lvconvert \-\-type thin.
-.
-.HP
-.BR \-\-uncache
-.br
-Separates a cache pool from a cache LV, and removes the unused cache pool
-LV. Before the separation, the cache is flushed. See similar option
-.B \-\-splitcache.
-Also see
-.BR lvmcache (7).
-.
-.HP
-.BR \-Z ,
-.BR \-\-zero
-.RB { y | n }
-.br
-For snapshots, this controls zeroing of the first 4KiB of data in the
-snapshot. If the LV is read\-only, the snapshot will not be zeroed.
-
-For thin pools, this controls zeroing of provisioned blocks.
-Provisioning of large zeroed chunks negatively impacts performance.
-Also see
-.BR lvmthin (7).
-.
-
-.SH Examples
-.
-Convert a linear LV to a two-way mirror LV:
-.br
-.B lvconvert \-\-type mirror \-\-mirrors 1 vg/lvol1
-
-Convert a linear LV to a two-way RAID1 LV:
-.br
-.B lvconvert \-\-type raid1 \-\-mirrors 1 vg/lvol1
-
-Convert a mirror LV to use an in\-memory log:
-.br
-.B lvconvert \-\-mirrorlog core vg/lvol1
-
-Convert a mirror LV to use a disk log:
-.br
-.B lvconvert \-\-mirrorlog disk vg/lvol1
-
-Convert a mirror or raid1 LV to a linear LV:
-.br
-.B lvconvert --type linear vg/lvol1
-
-Convert a mirror LV to a raid1 LV with the same number of images:
-.br
-.B lvconvert \-\-type raid1 vg/lvol1
-
-./" Split and merge a COW snapshot:
-./" TODO
-Convert a linear LV to a two-way mirror LV, allocating new extents from specific
-PV ranges:
-.br
-.B lvconvert \-\-mirrors 1 vg/lvol1 /dev/sda:0\-15 /dev/sdb:0\-15
-
-Convert a mirror LV to a linear LV, freeing physical extents from a specific PV:
-.br
-.B lvconvert \-\-type linear vg/lvol1 /dev/sda
-
-Split one image from a mirror or raid1 LV, making it a new LV:
-.br
-.B lvconvert \-\-splitmirrors 1 \-\-name lv_split vg/lvol1
-
-Split one image from a raid1 LV, and track changes made to the raid1 LV
-while the split image remains detached:
-.br
-.B lvconvert \-\-splitmirrors 1 \-\-trackchanges vg/lvol1
-
-Merge an image (that was previously created with \-\-splitmirrors and
-\-\-trackchanges) back into the original raid1 LV:
-.br
-.B lvconvert \-\-merge vg/lvol1_rimage_1
-./" FIXME: use merge-mirror
-
-Replace PV /dev/sdb1 with PV /dev/sdf1 in a raid1/4/5/6/10 LV:
-.br
-.B lvconvert \-\-replace /dev/sdb1 vg/lvol1 /dev/sdf1
-
-Replace 3 PVs /dev/sd[b-d]1 with PVs /dev/sd[f-h]1 in a raid1 LV:
-.br
-.B lvconvert \-\-replace /dev/sdb1 \-\-replace /dev/sdc1 \-\-replace /dev/sdd1
-.RS
-.B vg/lvol1 /dev/sd[fgh]1
-.RE
-
-Replace the maximum of 2 PVs /dev/sd[bc]1 with PVs /dev/sd[gh]1 in a raid6 LV:
-.br
-.B lvconvert \-\-replace /dev/sdb1 \-\-replace /dev/sdc1 vg/lvol1 /dev/sd[gh]1
-
-Convert an LV into a thin LV in the specified thin pool. The existing LV
-is used as an external read\-only origin for the new thin LV.
-.br
-.B lvconvert \-\-type thin \-\-thinpool vg/tpool1 vg/lvol1
-
-Convert an LV into a thin LV in the specified thin pool. The existing LV
-is used as an external read\-only origin for the new thin LV, and is
-renamed "external":
-.br
-.B lvconvert \-\-type thin \-\-thinpool vg/tpool1
-.RS
-.B \-\-originname external vg/lvol1
-.RE
-
-Convert an LV to a cache pool LV using another specified LV for cache pool
-metadata:
-.br
-.B lvconvert \-\-type cache-pool \-\-poolmetadata vg/poolmeta1 vg/lvol1
-
-Convert an LV to a cache LV using the specified cache pool and chunk size:
-.br
-.B lvconvert \-\-type cache \-\-cachepool vg/cpool1 \-c 128 vg/lvol1
-
-Detach and keep the cache pool from a cache LV:
-.br
-.B lvconvert \-\-splitcache vg/lvol1
-
-Detach and remove the cache pool from a cache LV:
-.br
-.B lvconvert \-\-uncache vg/lvol1
-
-.SH SEE ALSO
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmcache (7),
-.BR lvmthin (7),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8),
-.BR lvscan (8),
-.BR vgcreate (8),
-.BR cache_dump (8),
-.BR cache_repair (8),
-.BR cache_restore (8),
-.BR thin_dump (8),
-.BR thin_repair (8),
-.BR thin_restore (8)
diff --git a/man/lvcreate.8.des b/man/lvcreate.8.des
new file mode 100644
index 0000000..e18affe
--- /dev/null
+++ b/man/lvcreate.8.des
@@ -0,0 +1,28 @@
+lvcreate creates a new LV in a VG. For standard LVs, this requires
+allocating logical extents from the VG's free physical extents. If there
+is not enough free space, then the VG can be extended (see
+\fBvgextend\fP(8)) with other PVs, or existing LVs can be reduced or
+removed (see \fBlvremove\fP, \fBlvreduce\fP.)
+
+To control which PVs a new LV will use, specify one or more PVs as
+position args at the end of the command line. lvcreate will allocate
+physical extents only from the specified PVs.
+
+lvcreate can also create snapshots of existing LVs, e.g. for backup
+purposes. The data in a new snapshot LV represents the content of the
+original LV from the time the snapshot was created.
+
+RAID LVs can be created by specifying an LV type when creating the LV (see
+\fBlvmraid\fP(7)). Different RAID levels require different numbers of
+unique PVs be available in the VG for allocation.
+
+Thin pools (for thin provisioning) and cache pools (for caching) are
+represented by special LVs with types thin-pool and cache-pool (see
+\fBlvmthin\fP(7) and \fBlvmcache\fP(7)). The pool LVs are not usable as
+standard block devices, but the LV names act references to the pools.
+
+Thin LVs are thinly provisioned from a thin pool, and are created with a
+virtual size rather than a physical size. A cache LV is the combination of
+a standard LV with a cache pool, used to cache active portions of the LV
+to improve performance.
+
diff --git a/man/lvcreate.8.end b/man/lvcreate.8.end
new file mode 100644
index 0000000..74ae599
--- /dev/null
+++ b/man/lvcreate.8.end
@@ -0,0 +1,98 @@
+.SH EXAMPLES
+
+Create a striped LV with 3 stripes, a stripe size of 8KiB and a size of 100MiB.
+The LV name is chosen by lvcreate.
+.br
+.B lvcreate \-i 3 \-I 8 \-L 100m vg00
+
+Create a raid1 LV with two images, and a useable size of 500 MiB. This
+operation requires two devices, one for each mirror image. RAID metadata
+(superblock and bitmap) is also included on the two devices.
+.br
+.B lvcreate \-\-type raid1 \-m1 \-L 500m \-n mylv vg00
+
+Create a mirror LV with two images, and a useable size of 500 MiB.
+This operation requires three devices: two for mirror images and
+one for a disk log.
+.br
+.B lvcreate \-\-type mirror \-m1 \-L 500m \-n mylv vg00
+
+Create a mirror LV with 2 images, and a useable size of 500 MiB.
+This operation requires 2 devices because the log is in memory.
+.br
+.B lvcreate \-\-type mirror \-m1 \-\-mirrorlog core \-L 500m \-n mylv vg00
+
+Create a copy\-on\-write snapshot of an LV:
+.br
+.B lvcreate \-\-snapshot \-\-size 100m \-\-name mysnap vg00/mylv
+
+Create a copy\-on\-write snapshot with a size sufficient
+for overwriting 20% of the size of the original LV.
+.br
+.B lvcreate \-s \-l 20%ORIGIN \-n mysnap vg00/mylv
+
+Create a sparse LV with 1TiB of virtual space, and actual space just under
+100MiB.
+.br
+.B lvcreate \-\-snapshot \-\-virtualsize 1t \-\-size 100m \-\-name mylv vg00
+
+Create a linear LV with a usable size of 64MiB on specific physical extents.
+.br
+.B lvcreate \-L 64m \-n mylv vg00 /dev/sda:0\-7 /dev/sdb:0\-7
+
+Create a RAID5 LV with a usable size of 5GiB, 3 stripes, a stripe size of
+64KiB, using a total of 4 devices (including one for parity).
+.br
+.B lvcreate \-\-type raid5 \-L 5G \-i 3 \-I 64 \-n mylv vg00
+
+Create a RAID5 LV using all of the free space in the VG and spanning all the
+PVs in the VG (note that the command will fail if there are more than 8 PVs in
+the VG, in which case \fB\-i 7\fP must be used to get to the current maximum of
+8 devices including parity for RaidLVs).
+.br
+.B lvcreate \-\-config allocation/raid_stripe_all_devices=1
+.RS
+.B \-\-type raid5 \-l 100%FREE \-n mylv vg00
+.RE
+
+Create RAID10 LV with a usable size of 5GiB, using 2 stripes, each on
+a two-image mirror. (Note that the \fB-i\fP and \fB-m\fP arguments behave
+differently:
+\fB-i\fP specifies the total number of stripes,
+but \fB-m\fP specifies the number of images in addition
+to the first image).
+.br
+.B lvcreate \-\-type raid10 \-L 5G \-i 2 \-m 1 \-n mylv vg00
+
+Create a 1TiB thin LV, first creating a new thin pool for it, where
+the thin pool has 100MiB of space, uses 2 stripes, has a 64KiB stripe
+size, and 256KiB chunk size.
+.br
+.B lvcreate \-\-type thin \-\-name mylv \-\-thinpool mypool
+.RS
+.B \-V 1t \-L 100m \-i 2 \-I 64 \-c 256 vg00
+.RE
+
+Create a thin snapshot of a thin LV (the size option must not be
+used, otherwise a copy-on-write snapshot would be created).
+.br
+.B lvcreate \-\-snapshot \-\-name mysnap vg00/thinvol
+
+Create a thin snapshot of the read-only inactive LV named "origin"
+which becomes an external origin for the thin snapshot LV.
+.br
+.B lvcreate \-\-snapshot \-\-name mysnap \-\-thinpool mypool vg00/origin
+
+Create a cache pool from a fast physical device. The cache pool can
+then be used to cache an LV.
+.br
+.B lvcreate \-\-type cache-pool \-L 1G \-n my_cpool vg00 /dev/fast1
+
+Create a cache LV, first creating a new origin LV on a slow physical device,
+then combining the new origin LV with an existing cache pool.
+.br
+.B lvcreate \-\-type cache \-\-cachepool my_cpool
+.RS
+.B \-L 100G \-n mylv vg00 /dev/slow1
+.RE
+
diff --git a/man/lvcreate.8.in b/man/lvcreate.8.in
deleted file mode 100644
index 84afbda..0000000
--- a/man/lvcreate.8.in
+++ /dev/null
@@ -1,914 +0,0 @@
-.TH LVCREATE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.
-.\" Use 1st. parameter with \% to fix 'man2html' rendeing on same line!
-.de SIZE_G
-. IR \\$1 \c
-. RB [ b | B | s | S | k | K | m | M | g | G ]
-..
-.de SIZE_E
-. IR \\$1 \c
-. RB [ b | B | s | S | k | K | m | M | \c
-. BR g | G | t | T | p | P | e | E ]
-..
-.
-.SH NAME
-.
-lvcreate \- create a logical volume in an existing volume group
-.
-.SH SYNOPSIS
-.
-.ad l
-.B lvcreate
-.RB [ \-a | \-\-activate
-.RB [ a ][ e | l | s ]{ y | n }]
-.RB [ \-\-addtag
-.IR Tag ]
-.RB [ \-\-alloc
-.IR Allocation\%Policy ]
-.RB [ \-A | \-\-autobackup
-.RB { y | n }]
-.RB [ \-H | \-\-cache ]
-.RB [ \-\-cachemode
-.RB { passthrough | writeback | writethrough }]
-.RB [ \-\-cachepolicy
-.IR Policy ]
-.RB \%[ \-\-cachepool
-.IR CachePoolLogicalVolume ]
-.RB [ \-\-cachesettings
-.IR Key \fB= Value ]
-.RB [ \-c | \-\-chunksize
-.IR ChunkSize ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB \%[ \-C | \-\-contiguous
-.RB { y | n }]
-.RB [ \-d | \-\-debug ]
-.RB [ \-\-discards
-.RB \%{ ignore | nopassdown | passdown }]
-.RB [ \-\-errorwhenfull
-.RB { y | n }]
-.RB [{ \-l | \-\-extents
-.BR \fILogicalExtents\%Number [ % { FREE | PVS | VG }]
-.RB |
-.BR \-L | \-\-size
-.BR \fILogicalVolumeSize }
-.RB [ \-i | \-\-stripes
-.IR Stripes
-.RB [ \-I | \-\-stripesize
-.IR StripeSize ]]]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-K | \-\-ignoreactivationskip ]
-.RB [ \-\-ignoremonitoring ]
-.RB [ \-\-minor
-.IR Minor
-.RB [ \-j | \-\-major
-.IR Major ]]
-.RB [ \-\-metadataprofile
-.IR Profile\%Name ]
-.RB [ \-m | \-\-mirrors
-.IR Mirrors
-.RB [ \-\-corelog | \-\-mirrorlog
-.RB { disk | core | mirrored }]
-.RB [ \-\-nosync ]
-.RB [ \-R | \-\-regionsize
-.BR \fIMirrorLogRegionSize ]]
-.RB [ \-\-monitor
-.RB { y | n }]
-.RB [ \-n | \-\-name
-.IR Logical\%Volume ]
-.RB [ \-\-noudevsync ]
-.RB [ \-p | \-\-permission
-.RB { r | rw }]
-.RB [ \-M | \-\-persistent
-.RB { y | n }]
-.\" .RB [ \-\-pooldatasize
-.\" .I DataVolumeSize
-.RB \%[ \-\-poolmetadatasize
-.IR MetadataVolumeSize ]
-.RB [ \-\-poolmetadataspare
-.RB { y | n }]
-.RB [ \-\- [ raid ] maxrecoveryrate
-.IR Rate ]
-.RB [ \-\- [ raid ] minrecoveryrate
-.IR Rate ]
-.RB [ \-r | \-\-readahead
-.RB { \fIReadAheadSectors | auto | none }]
-.RB [ \-\-reportformat
-.RB {basic | json}]
-.RB \%[ \-k | \-\-setactivationskip
-.RB { y | n }]
-.RB [ \-s | \-\-snapshot ]
-.RB [ \-V | \-\-virtualsize
-.IR VirtualSize ]
-.RB [ \-t | \-\-test ]
-.RB [ \-T | \-\-thin ]
-.RB [ \-\-thinpool
-.IR ThinPoolLogicalVolume ]
-.RB [ \-\-type
-.IR SegmentType ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-W | \-\-wipesignatures
-.RB { y | n }]
-.RB [ \-Z | \-\-zero
-.RB { y | n }]
-.RI [ VolumeGroup
-.RI |
-.RI \%{ ExternalOrigin | Origin | Pool } LogicalVolume
-.RI \%[ PhysicalVolumePath [ \fB: \fIPE \fR[ \fB\- PE ]]...]]
-.LP
-.B lvcreate
-.RB [ \-l | \-\-extents
-.BR \fILogicalExtentsNumber [ % { FREE | ORIGIN | PVS | VG }]
-|
-.BR \-L | \-\-size
-.\" | \-\-pooldatasize
-.IR LogicalVolumeSize ]
-.RB [ \-c | \-\-chunksize
-.IR ChunkSize ]
-.RB \%[ \-\-commandprofile
-.IR Profile\%Name ]
-.RB [ \-\-noudevsync ]
-.RB [ \-\-ignoremonitoring ]
-.RB [ \-\-metadataprofile
-.IR Profile\%Name ]
-.RB \%[ \-\-monitor
-.RB { y | n }]
-.RB [ \-n | \-\-name
-.IR SnapshotLogicalVolumeName ]
-.RB [ \-\-reportformat
-.RB {basic | json}]
-.BR \-s | \-\-snapshot | \-H | \-\-cache
-.RI \%{[ VolumeGroup \fB/\fP] OriginalLogicalVolume
-.RB \%[ \-V | \-\-virtualsize
-.IR VirtualSize ]}
-.ad b
-.
-.SH DESCRIPTION
-.
-lvcreate creates a new logical volume in a volume group (see
-.BR vgcreate "(8), " vgchange (8))
-by allocating logical extents from the free physical extent pool
-of that volume group. If there are not enough free physical extents then
-the volume group can be extended (see
-.BR vgextend (8))
-with other physical volumes or by reducing existing logical volumes
-of this volume group in size (see
-.BR lvreduce (8)).
-If you specify one or more PhysicalVolumes, allocation of physical
-extents will be restricted to these volumes.
-.br
-.br
-The second form supports the creation of snapshot logical volumes which
-keep the contents of the original logical volume for backup purposes.
-.
-.SH OPTIONS
-.
-See
-.BR lvm (8)
-for common options.
-.
-.HP
-.BR \-a | \-\-activate
-.RB [ a ][ l | e | s ]{ y | n }
-.br
-Controls the availability of the Logical Volumes for immediate use after
-the command finishes running.
-By default, new Logical Volumes are activated (\fB\-ay\fP).
-If it is possible technically, \fB\-an\fP will leave the new Logical
-Volume inactive. But for example, snapshots of active origin can only be
-created in the active state so \fB\-an\fP cannot be used with
-\fB-\-type snapshot\fP. This does not apply to thin volume snapshots,
-which are by default created with flag to skip their activation
-(\fB-ky\fP).
-Normally the \fB\-\-zero n\fP argument has to be supplied too because
-zeroing (the default behaviour) also requires activation.
-If autoactivation option is used (\fB\-aay\fP), the logical volume is
-activated only if it matches an item in the
-\fBactivation/auto_activation_volume_list\fP
-set in \fBlvm.conf\fP(5).
-For autoactivated logical volumes, \fB\-\-zero n\fP and
-\fB\-\-wipesignatures n\fP is always assumed and it can't
-be overridden. If the clustered locking is enabled,
-\fB\-aey\fP will activate exclusively on one node and
-.BR \-a { a | l } y
-will activate only on the local node.
-.
-.HP
-.BR \-H | \-\-cache
-.br
-Creates cache or cache pool logical volume.
-.\" or both.
-Specifying the optional argument \fB\-\-extents\fP or \fB\-\-size\fP
-will cause the creation of the cache logical volume.
-.\" Specifying the optional argument \fB\-\-pooldatasize\fP will cause
-.\" the creation of the cache pool logical volume.
-.\" Specifying both arguments will cause the creation of cache with its
-.\" cache pool volume.
-When the Volume group name is specified together with existing logical volume
-name which is NOT a cache pool name, such volume is treated
-as cache origin volume and cache pool is created. In this case the
-\fB\-\-extents\fP or \fB\-\-size\fP is used to specify size of cache pool volume.
-See \fBlvmcache\fP(7) for more info about caching support.
-Note that the cache segment type requires a dm-cache kernel module version
-1.3.0 or greater.
-.
-.HP
-.BR \-\-cachemode
-.RB { passthrough | writeback | writethrough }
-.br
-Specifying a cache mode determines when the writes to a cache LV
-are considered complete. When \fBwriteback\fP is specified, a write is
-considered complete as soon as it is stored in the cache pool LV.
-If \fBwritethough\fP is specified, a write is considered complete only
-when it has been stored in the cache pool LV and on the origin LV.
-While \fBwritethrough\fP may be slower for writes, it is more
-resilient if something should happen to a device associated with the
-cache pool LV. With \fBpassthrough\fP mode, all reads are served
-from origin LV (all reads miss the cache) and all writes are
-forwarded to the origin LV; additionally, write hits cause cache
-block invalidates. See \fBlvmcache(7)\fP for more details.
-.
-.HP
-.BR \-\-cachepolicy
-.IR Policy
-.br
-Only applicable to cached LVs; see also \fBlvmcache(7)\fP. Sets
-the cache policy. \fBmq\fP is the basic policy name. \fBsmq\fP is more advanced
-version available in newer kernels.
-.
-.HP
-.BR \-\-cachepool
-.IR CachePoolLogicalVolume { Name | Path }
-.br
-Specifies the name of cache pool volume name. The other way to specify pool name
-is to append name to Volume group name argument.
-.
-.HP
-.BR \-\-cachesettings
-.IB Key = Value
-.br
-Only applicable to cached LVs; see also \fBlvmcache(7)\fP. Sets
-the cache tunable settings. In most use-cases, default values should be adequate.
-Special string value \fBdefault\fP switches setting back to its default kernel value
-and removes it from the list of settings stored in lvm2 metadata.
-.
-.HP
-.BR \-c | \-\-chunksize
-.SIZE_G \%ChunkSize
-.br
-Gives the size of chunk for snapshot, cache pool and thin pool logical volumes.
-Default unit is in kilobytes.
-.br
-For snapshots the value must be power of 2 between 4KiB and 512KiB
-and the default value is 4KiB.
-.br
-For cache pools the value must a multiple of 32KiB
-between 32KiB and 1GiB. The default is 64KiB.
-When the size is specified with volume caching, it may not be smaller
-than cache pool creation chunk size was.
-.br
-For thin pools the value must be a multiple of 64KiB
-between 64KiB and 1GiB.
-Default value starts with 64KiB and grows up to
-fit the pool metadata size within 128MiB,
-if the pool metadata size is not specified.
-See
-.BR lvm.conf (5)
-setting \fBallocation/thin_pool_chunk_size_policy\fP
-to select different calculation policy.
-Thin pool target version <1.4 requires this value to be a power of 2.
-For target version <1.5 discard is not supported for non power of 2 values.
-.
-.HP
-.BR \-C | \-\-contiguous
-.RB { y | n }
-.br
-Sets or resets the contiguous allocation policy for
-logical volumes. Default is no contiguous allocation based
-on a next free principle.
-.
-.HP
-.BR \-\-corelog
-.br
-This is shortcut for option \fB\-\-mirrorlog core\fP.
-.
-.HP
-.BR \-\-discards
-.RB { ignore | nopassdown | passdown }
-.br
-Sets discards behavior for thin pool.
-Default is \fBpassdown\fP.
-.
-.HP
-.BR \-\-errorwhenfull
-.RB { y | n }
-.br
-Configures thin pool behaviour when data space is exhausted.
-Default is \fBn\fPo.
-Device will queue I/O operations until target timeout
-(see dm-thin-pool kernel module option \fPno_space_timeout\fP)
-expires. Thus configured system has a time to i.e. extend
-the size of thin pool data device.
-When set to \fBy\fPes, the I/O operation is immeditelly errored.
-.
-.HP
-.BR \-K | \-\-ignoreactivationskip
-.br
-Ignore the flag to skip Logical Volumes during activation.
-Use \fB\-\-setactivationskip\fP option to set or reset
-activation skipping flag persistently for logical volume.
-.
-.HP
-.BR \-\-ignoremonitoring
-.br
-Make no attempt to interact with dmeventd unless \fB\-\-monitor\fP
-is specified.
-.
-.HP
-.BR -l | \-\-extents
-.IR LogicalExtentsNumber \c
-.RB [ % { VG | PVS | FREE | ORIGIN }]
-.br
-Specifies the size of the new LV in logical extents. The number of
-physical extents allocated may be different, and depends on the LV type.
-Certain LV types require more physical extents for data redundancy or
-metadata. An alternate syntax allows the size to be determined indirectly
-as a percentage of the size of a related VG, LV, or set of PVs. The
-suffix \fB%VG\fP denotes the total size of the VG, the suffix \fB%FREE\fP
-the remaining free space in the VG, and the suffix \fB%PVS\fP the free
-space in the specified Physical Volumes. For a snapshot, the size
-can be expressed as a percentage of the total size of the Origin Logical
-Volume with the suffix \fB%ORIGIN\fP (\fB100%ORIGIN\fP provides space for
-the whole origin).
-When expressed as a percentage, the size defines an upper limit for the
-number of logical extents in the new LV. The precise number of logical
-extents in the new LV is not determined until the command has completed.
-.
-.HP
-.BR \-j | \-\-major
-.IR Major
-.br
-Sets the major number.
-Major numbers are not supported with pool volumes.
-This option is supported only on older systems
-(kernel version 2.4) and is ignored on modern Linux systems where major
-numbers are dynamically assigned.
-.
-.HP
-.BR \-\-metadataprofile
-.IR ProfileName
-.br
-Uses and attaches the \fIProfileName\fP configuration profile to the logical
-volume metadata. Whenever the logical volume is processed next time,
-the profile is automatically applied. If the volume group has another
-profile attached, the logical volume profile is preferred.
-See \fBlvm.conf\fP(5) for more information about \fBmetadata profiles\fP.
-.
-.HP
-.BR \-\-minor
-.IR Minor
-.br
-Sets the minor number.
-Minor numbers are not supported with pool volumes.
-.
-.HP
-.BR \-m | \-\-mirrors
-.IR mirrors
-.br
-Creates a mirrored logical volume with \fImirrors\fP copies.
-For example, specifying \fB\-m 1\fP
-would result in a mirror with two-sides; that is,
-a linear volume plus one copy.
-
-Specifying the optional argument \fB\-\-nosync\fP will cause the creation
-of the mirror LV to skip the initial resynchronization. Any data written
-afterwards will be mirrored, but the original contents will not be copied.
-
-This is useful for skipping a potentially long and resource intensive initial
-sync of an empty mirrored RaidLV.
-
-There are two implementations of mirroring which can be used and correspond
-to the "\fIraid1\fP" and "\fImirror\fP" segment types.
-The default is "\fIraid1\fP". See the
-\fB\-\-type\fP option for more information if you would like to use the
-legacy "\fImirror\fP" segment type. See
-.BR lvm.conf (5)
-settings \fB global/mirror_segtype_default\fP
-and \fBglobal/raid10_segtype_default\fP
-to configure default mirror segment type.
-The options
-\fB\-\-mirrorlog\fP and \fB\-\-corelog\fP apply
-to the legacy "\fImirror\fP" segment type only.
-
-Note the current maxima for mirrors are 7 for "mirror" providing
-8 mirror legs and 9 for "raid1" providing 10 legs.
-.
-.HP
-.BR \-\-mirrorlog
-.RB { disk | core | mirrored }
-.br
-Specifies the type of log to be used for logical volumes utilizing
-the legacy "\fImirror\fP" segment type.
-.br
-The default is \fBdisk\fP, which is persistent and requires
-a small amount of storage space, usually on a separate device from the
-data being mirrored.
-.br
-Using \fBcore\fP means the mirror is regenerated by copying the data
-from the first device each time the logical volume is activated,
-like after every reboot.
-.br
-Using \fBmirrored\fP will create a persistent log that is itself mirrored.
-.
-.HP
-.BR \-\-monitor
-.RB { y | n }
-.br
-Starts or avoids monitoring a mirrored, snapshot or thin pool logical volume with
-dmeventd, if it is installed.
-If a device used by a monitored mirror reports an I/O error,
-the failure is handled according to
-\fBactivation/mirror_image_fault_policy\fP
-and \fBactivation/mirror_log_fault_policy\fP
-set in \fBlvm.conf\fP(5).
-.
-.HP
-.BR \-n | \-\-name
-.IR LogicalVolume { Name | Path }
-.br
-Sets the name for the new logical volume.
-.br
-Without this option a default name of "lvol#" will be generated where
-# is the LVM internal number of the logical volume.
-.
-.HP
-.BR \-\-nosync
-.br
-Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the
-initial resynchronization. In case of mirror, raid1 and raid10, any data
-written afterwards will be mirrored, but the original contents will not be
-copied. In case of raid4 and raid5, no parity blocks will be written,
-though any data written afterwards will cause parity blocks to be stored.
-.br
-This is useful for skipping a potentially long and resource intensive initial
-sync of an empty mirror/raid1/raid4/raid5 and raid10 LV.
-.br
-This option is not valid for raid6, because raid6 relies on proper parity
-(P and Q Syndromes) being created during initial synchronization in order
-to reconstruct proper user date in case of device failures.
-
-raid0 and raid0_meta don't provide any data copies or parity support
-and thus don't support initial resynchronization.
-.
-.HP
-.BR \-\-noudevsync
-.br
-Disables udev synchronisation. The
-process will not wait for notification from udev.
-It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running
-or has rules that ignore the devices LVM2 creates.
-.
-.HP
-.BR \-p | \-\-permission
-.RB { r | rw }
-.br
-Sets access permissions to read only (\fBr\fP) or read and write (\fBrw\fP).
-.br
-Default is read and write.
-.
-.HP
-.BR \-M | \-\-persistent
-.RB { y | n }
-.br
-Set to \fBy\fP to make the minor number specified persistent.
-Pool volumes cannot have persistent major and minor numbers.
-Defaults to \fBy\fPes only when major or minor number is specified.
-Otherwise it is \fBn\fPo.
-.\" .HP
-.\" .IR \fB\-\-pooldatasize " " PoolDataVolumeSize [ bBsSkKmMgGtTpPeE ]
-.\" Sets the size of pool's data logical volume.
-.\" For thin pools you may also specify the size
-.\" with the option \fB\-\-size\fP.
-.\"
-.
-.HP
-.BR \-\-poolmetadatasize
-.SIZE_G \%MetadataVolumeSize
-.br
-Sets the size of pool's metadata logical volume.
-Supported values are in range between 2MiB and 16GiB for thin pool,
-and upto 16GiB for cache pool. The minimum value is computed from pool's
-data size.
-Default value for thin pool is (Pool_LV_size / Pool_LV_chunk_size * 64b).
-To work with a thin pool, there should be at least 25% of free space
-when the size of metadata is smaller then 16MiB,
-or at least 4MiB of free space otherwise.
-Default unit is megabytes.
-.
-.HP
-.BR \-\-poolmetadataspare
-.RB { y | n }
-.br
-Controls creation and maintanence of pool metadata spare logical volume
-that will be used for automated pool recovery.
-Only one such volume is maintained within a volume group
-with the size of the biggest pool metadata volume.
-Default is \fBy\fPes.
-.
-.HP
-.BR \-\- [ raid ] maxrecoveryrate
-.SIZE_G \%Rate
-.br
-Sets the maximum recovery rate for a RAID logical volume. \fIRate\fP
-is specified as an amount per second for each device in the array.
-If no suffix is given, then KiB/sec/device is assumed. Setting the
-recovery rate to 0 means it will be unbounded.
-.
-.HP
-.BR \-\- [ raid ] minrecoveryrate
-.SIZE_G \%Rate
-.br
-Sets the minimum recovery rate for a RAID logical volume. \fIRate\fP
-is specified as an amount per second for each device in the array.
-If no suffix is given, then KiB/sec/device is assumed. Setting the
-recovery rate to 0 means it will be unbounded.
-.
-.HP
-.BR \-r | \-\-readahead
-.RB { \fIReadAheadSectors | auto | none }
-.br
-Sets read ahead sector count of this logical volume.
-For volume groups with metadata in lvm1 format, this must
-be a value between 2 and 120.
-The default value is \fBauto\fP which allows the kernel to choose
-a suitable value automatically.
-\fBnone\fP is equivalent to specifying zero.
-.
-.HP
-.BR \-R | \-\-regionsize
-.SIZE_G \%MirrorLogRegionSize
-.br
-A mirror is divided into regions of this size (in MiB), and the mirror log
-uses this granularity to track which regions are in sync.
-.
-.HP
-.BR \-k | \-\-setactivationskip
-.RB { y | n }
-.br
-Controls whether Logical Volumes are persistently flagged to be skipped during
-activation. By default, thin snapshot volumes are flagged for activation skip.
-See
-.BR lvm.conf (5)
-\fBactivation/auto_set_activation_skip\fP
-how to change its default behaviour.
-To activate such volumes, an extra \fB\-\-ignoreactivationskip\fP
-option must be used. The flag is not applied during deactivation. Use
-\fBlvchange \-\-setactivationskip\fP
-command to change the skip flag for existing volumes.
-To see whether the flag is attached, use \fBlvs\fP command
-where the state of the flag is reported within \fBlv_attr\fP bits.
-.
-.HP
-.BR \-L | \-\-size
-.SIZE_E \%LogicalVolumeSize
-.br
-Gives the size to allocate for the new logical volume.
-A size suffix of \fBB\fP for bytes, \fBS\fP for sectors as 512 bytes,
-\fBK\fP for kilobytes, \fBM\fP for megabytes,
-\fBG\fP for gigabytes, \fBT\fP for terabytes, \fBP\fP for petabytes
-or \fBE\fP for exabytes is optional.
-.br
-Default unit is megabytes.
-.
-.HP
-.BR \-s | \fB\-\-snapshot
-.IR OriginalLogicalVolume { Name | Path }
-.br
-Creates a snapshot logical volume (or snapshot) for an existing, so called
-original logical volume (or origin).
-Snapshots provide a 'frozen image' of the contents of the origin
-while the origin can still be updated. They enable consistent
-backups and online recovery of removed/overwritten data/files.
-.br
-Thin snapshot is created when the origin is a thin volume and
-the size IS NOT specified. Thin snapshot shares same blocks within
-the thin pool volume.
-The non thin volume snapshot with the specified size does not need
-the same amount of storage the origin has. In a typical scenario,
-15-20% might be enough. In case the snapshot runs out of storage, use
-.BR lvextend (8)
-to grow it. Shrinking a snapshot is supported by
-.BR lvreduce (8)
-as well. Run
-.BR lvs (8)
-on the snapshot in order to check how much data is allocated to it.
-Note: 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
-(\fB\-\-monitor\fP) the rate at which the snapshot data is growing
-so you can \fBavoid\fP running out of space.
-If \fB\-\-thinpool\fP is specified, thin volume is created that will
-use given original logical volume as an external origin that
-serves unprovisioned blocks.
-Only read-only volumes can be used as external origins.
-To make the volume external origin, lvm expects the volume to be inactive.
-External origin volume can be used/shared for many thin volumes
-even from different thin pools. See
-.BR lvconvert (8)
-for online conversion to thin volumes with external origin.
-.
-.HP
-.BR \-i | \-\-stripes
-.IR Stripes
-.br
-Gives the number of stripes.
-This is equal to the number of physical volumes to scatter
-the logical volume data. When creating a RAID 4/5/6 logical volume,
-the extra devices which are necessary for parity are
-internally accounted for. Specifying \fB\-i 3\fP
-would cause 3 devices for striped and RAID 0 logical volumes,
-4 devices for RAID 4/5, 5 devices for RAID 6 and 6 devices for RAID 10.
-Alternatively, RAID 0 will stripe across 2 devices,
-RAID 4/5 across 3 PVs, RAID 6 across 5 PVs and RAID 10 across
-4 PVs in the volume group if the \fB\-i\fP argument is omitted.
-In order to stripe across all PVs of the VG if the \fB\-i\fP argument is
-omitted, set raid_stripe_all_devices=1 in the allocation
-section of \fBlvm.conf (5)\fP or add
-.br
-\fB\-\-config allocation/raid_stripe_all_devices=1\fP
-.br
-to the command.
-
-Note the current maxima for stripes depend on the created RAID type.
-For raid10, the maximum of stripes is 32,
-for raid0, it is 64,
-for raid4/5, it is 63
-and for raid6 it is 62.
-
-See the \fB\-\-nosync\fP option to optionally avoid initial syncrhonization of RaidLVs.
-
-Two implementations of basic striping are available in the kernel.
-The original device-mapper implementation is the default and should
-normally be used. The alternative implementation using MD, available
-since version 1.7 of the RAID device-mapper kernel target (kernel
-version 4.2) is provided to facilitate the development of new RAID
-features. It may be accessed with \fB--type raid0[_meta]\fP, but is best
-avoided at present because of assorted restrictions on resizing and converting
-such devices.
-.HP
-.BR \-I | \-\-stripesize
-.IR StripeSize
-.br
-Gives the number of kilobytes for the granularity of the stripes.
-.br
-StripeSize must be 2^n (n = 2 to 9) for metadata in LVM1 format.
-For metadata in LVM2 format, the stripe size may be a larger
-power of 2 but must not exceed the physical extent size.
-.
-.HP
-.BR \-T | \-\-thin
-.br
-Creates thin pool or thin logical volume or both.
-Specifying the optional argument \fB\-\-size\fP or \fB\-\-extents\fP
-will cause the creation of the thin pool logical volume.
-Specifying the optional argument \fB\-\-virtualsize\fP will cause
-the creation of the thin logical volume from given thin pool volume.
-Specifying both arguments will cause the creation of both
-thin pool and thin volume using this pool.
-See \fBlvmthin\fP(7) for more info about thin provisioning support.
-Thin provisioning requires device mapper kernel driver
-from kernel 3.2 or greater.
-.
-.HP
-.BR \-\-thinpool
-.IR ThinPoolLogicalVolume { Name | Path }
-.br
-Specifies the name of thin pool volume name. The other way to specify pool name
-is to append name to Volume group name argument.
-.
-.HP
-.BR \-\-type
-.IR SegmentType
-.br
-Creates a logical volume with the specified segment type.
-Supported types are:
-.BR cache ,
-.BR cache-pool ,
-.BR error ,
-.BR linear ,
-.BR mirror,
-.BR raid0 ,
-.BR raid1 ,
-.BR raid4 ,
-.BR raid5_la ,
-.BR raid5_ls
-.RB (=
-.BR raid5 ),
-.BR raid5_ra ,
-.BR raid5_rs ,
-.BR raid6_nc ,
-.BR raid6_nr ,
-.BR raid6_zr
-.RB (=
-.BR raid6 ),
-.BR raid10 ,
-.BR snapshot ,
-.BR striped,
-.BR thin ,
-.BR thin-pool
-or
-.BR zero .
-Segment type may have a commandline switch alias that will
-enable its use.
-When the type is not explicitly specified an implicit type
-is selected from combination of options:
-.BR \-H | \-\-cache | \-\-cachepool
-(cache or cachepool),
-.BR \-T | \-\-thin | \-\-thinpool
-(thin or thinpool),
-.BR \-m | \-\-mirrors
-(raid1 or mirror),
-.BR \-s | \-\-snapshot | \-V | \-\-virtualsize
-(snapshot or thin),
-.BR \-i | \-\-stripes
-(striped).
-The default segment type is \fBlinear\fP.
-.
-.HP
-.BR \-V | \-\-virtualsize
-.SIZE_E \%VirtualSize
-.br
-Creates a thinly provisioned device or a sparse device of the given size (in MiB by default).
-See
-.BR lvm.conf (5)
-settings \fBglobal/sparse_segtype_default\fP
-to configure default sparse segment type.
-See \fBlvmthin\fP(7) for more info about thin provisioning support.
-Anything written to a sparse snapshot will be returned when reading from it.
-Reading from other areas of the device will return blocks of zeros.
-Virtual snapshot (sparse snapshot) 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.
-Note: using sparse snapshots is not efficient for larger
-device sizes (GiB), thin provisioning should be used for this case.
-.
-.HP
-.BR \-W | \-\-wipesignatures
-.RB { y | n }
-.br
-Controls detection and subsequent wiping of signatures on newly created
-Logical Volume. There's a prompt for each signature detected to confirm
-its wiping (unless \fB--yes\fP is used where LVM assumes 'yes' answer
-for each prompt automatically). If this option is not specified, then by
-default \fB-W\fP | \fB--wipesignatures y\fP is assumed each time the
-zeroing is done (\fB\-Z\fP | \fB\-\-zero y\fP). This default behaviour
-can be controlled by \fB\%allocation/wipe_signatures_when_zeroing_new_lvs\fP
-setting found in
-.BR lvm.conf (5).
-.br
-If blkid wiping is used (\fBallocation/use_blkid_wiping\fP setting in
-.BR lvm.conf (5))
-and LVM2 is compiled with blkid wiping support, then \fBblkid\fP(8) library is used
-to detect the signatures (use \fBblkid \-k\fP command to list the signatures that are recognized).
-Otherwise, native LVM2 code is used to detect signatures (MD RAID, swap and LUKS
-signatures are detected only in this case).
-.br
-Logical volume is not wiped if the read only flag is set.
-.
-.HP
-.BR \-Z | \-\-zero
-.RB { y | n }
-.br
-Controls zeroing of the first 4KiB of data in the new logical volume.
-Default is \fBy\fPes.
-Snapshot COW volumes are always zeroed.
-Logical volume is not zeroed if the read only flag is set.
-.br
-Warning: trying to mount an unzeroed logical volume can cause the system to
-hang.
-.
-.SH Examples
-.
-Creates a striped logical volume with 3 stripes, a stripe size of 8KiB
-and a size of 100MiB in the volume group named vg00.
-The logical volume name will be chosen by lvcreate:
-.sp
-.B lvcreate \-i 3 \-I 8 \-L 100M vg00
-
-Creates a mirror logical volume with 2 sides with a useable size of 500 MiB.
-This operation would require 3 devices (or option
-\fB\-\-alloc \%anywhere\fP) - two for the mirror
-devices and one for the disk log:
-.sp
-.B lvcreate \-m1 \-L 500M vg00
-
-Creates a mirror logical volume with 2 sides with a useable size of 500 MiB.
-This operation would require 2 devices - the log is "in-memory":
-.sp
-.B lvcreate \-m1 \-\-mirrorlog core \-L 500M vg00
-
-Creates a snapshot logical volume named "vg00/snap" which has access to the
-contents of the original logical volume named "vg00/lvol1"
-at snapshot logical volume creation time. If the original logical volume
-contains a file system, you can mount the snapshot logical volume on an
-arbitrary directory in order to access the contents of the filesystem to run
-a backup while the original filesystem continues to get updated:
-.sp
-.B lvcreate \-\-size 100m \-\-snapshot \-\-name snap /dev/vg00/lvol1
-
-Creates a snapshot logical volume named "vg00/snap" with size
-for overwriting 20% of the original logical volume named "vg00/lvol1".:
-.sp
-.B lvcreate \-s \-l 20%ORIGIN \-\-name snap vg00/lvol1
-
-Creates a sparse device named /dev/vg1/sparse of size 1TiB with space for just
-under 100MiB of actual data on it:
-.sp
-.B lvcreate \-\-virtualsize 1T \-\-size 100M \-\-snapshot \-\-name sparse vg1
-
-Creates a linear logical volume "vg00/lvol1" using physical extents
-/dev/sda:0\-7 and /dev/sdb:0\-7 for allocation of extents:
-.sp
-.B lvcreate \-L 64M \-n lvol1 vg00 /dev/sda:0\-7 /dev/sdb:0\-7
-
-Creates a 5GiB RAID5 logical volume "vg00/my_lv", with 3 stripes (plus
-a parity drive for a total of 4 devices) and a stripesize of 64KiB:
-.sp
-.B lvcreate \-\-type raid5 \-L 5G \-i 3 \-I 64 \-n my_lv vg00
-
-Creates a RAID5 logical volume "vg00/my_lv", using all of the free
-space in the VG and spanning all the PVs in the VG (note that the command
-will fail if there's more than 8 PVs in the VG in which case \fB\-i 7\fP
-has to be used to get to the currently possible maximum of
-8 devices including parity for RaidLVs):
-.sp
-.B lvcreate \-\-config allocation/raid_stripe_all_devices=1 \-\-type raid5 \-l 100%FREE \-n my_lv vg00
-
-Creates a 5GiB RAID10 logical volume "vg00/my_lv", with 2 stripes on
-2 2-way mirrors. Note that the \fB-i\fP and \fB-m\fP arguments behave
-differently.
-The \fB-i\fP specifies the number of stripes.
-The \fB-m\fP specifies the number of
-.B additional
-copies:
-.sp
-.B lvcreate \-\-type raid10 \-L 5G \-i 2 \-m 1 \-n my_lv vg00
-
-Creates 100MiB pool logical volume for thin provisioning
-build with 2 stripes 64KiB and chunk size 256KiB together with
-1TiB thin provisioned logical volume "vg00/thin_lv":
-.sp
-.B lvcreate \-i 2 \-I 64 \-c 256 \-L100M \-T vg00/pool \-V 1T \-\-name thin_lv
-
-Creates a thin snapshot volume "thinsnap" of thin volume "thinvol" that
-will share the same blocks within the thin pool.
-Note: the size MUST NOT be specified, otherwise the non-thin snapshot
-is created instead:
-.sp
-.B lvcreate \-s vg00/thinvol \-\-name thinsnap
-
-Creates a thin snapshot volume of read-only inactive volume "origin"
-which then becomes the thin external origin for the thin snapshot volume
-in vg00 that will use an existing thin pool "vg00/pool":
-.sp
-.B lvcreate \-s \-\-thinpool vg00/pool origin
-
-Create a cache pool LV that can later be used to cache one
-logical volume.
-.sp
-.B lvcreate \-\-type cache-pool \-L 1G \-n my_lv_cachepool vg /dev/fast1
-
-If there is an existing cache pool LV, create the large slow
-device (i.e. the origin LV) and link it to the supplied cache pool LV,
-creating a cache LV.
-.sp
-.B lvcreate \-\-cache \-L 100G \-n my_lv vg/my_lv_cachepool /dev/slow1
-
-If there is an existing logical volume, create the small and fast
-cache pool LV and link it to the supplied existing logical
-volume (i.e. the origin LV), creating a cache LV.
-.sp
-.B lvcreate \-\-type cache \-L 1G \-n my_lv_cachepool vg/my_lv /dev/fast1
-
-.\" Create a 1G cached LV "lvol1" with 10M cache pool "vg00/pool".
-.\" .sp
-.\" .B lvcreate \-\-cache \-L 1G \-n lv \-\-pooldatasize 10M vg00/pool
-.
-.SH SEE ALSO
-.
-.nh
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvmcache (7),
-.BR lvmthin (7),
-.BR lvconvert (8),
-.BR lvchange (8),
-.BR lvextend (8),
-.BR lvreduce (8),
-.BR lvremove (8),
-.BR lvrename (8)
-.BR lvs (8),
-.BR lvscan (8),
-.BR vgcreate (8),
-.BR blkid (8)
diff --git a/man/lvdisplay.8.des b/man/lvdisplay.8.des
new file mode 100644
index 0000000..48552cc
--- /dev/null
+++ b/man/lvdisplay.8.des
@@ -0,0 +1,5 @@
+lvdisplay shows the attributes of LVs, like size, read/write status,
+snapshot information, etc.
+
+\fBlvs\fP(8) is a preferred alternative that shows the same information
+and more, using a more compact and configurable output format.
diff --git a/man/lvdisplay.8.in b/man/lvdisplay.8.in
deleted file mode 100644
index e8e7809..0000000
--- a/man/lvdisplay.8.in
+++ /dev/null
@@ -1,134 +0,0 @@
-.TH LVDISPLAY 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-lvdisplay \(em display attributes of a logical volume
-.SH SYNOPSIS
-.B lvdisplay
-.RB [ \-a | \-\-all ]
-.RB [ \-c | \-\-colon ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-ignoreskippedcluster ]
-.RB [ \-\-maps ]
-.RB [ \-\-nosuffix ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB [ \-\-units
-.IR hHbBsSkKmMgGtTpPeE ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RI [ VolumeGroupName | LogicalVolume { Name | Path }\ ...]
-.br
-
-.B lvdisplay
-.BR \-C | \-\-columns
-.RB [ \-\-aligned ]
-.RB [ \-\-binary ]
-.RB [ \-a | \-\-all ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [[ \-\-configreport
-.IR ReportName ]
-.RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field1 [, Field2 ...]
-.RB [ \-O | \-\-sort
-.RI [ + | \- ] Key1 [, Key2 ...]]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB ...]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-ignoreskippedcluster ]
-.RB [ \-\-logonly ]
-.RB [ \-\-noheadings ]
-.RB [ \-\-nosuffix ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-segments ]
-.RB [ \-\-separator
-.IR Separator ]
-.RB [ \-\-unbuffered ]
-.RB [ \-\-units
-.IR hHbBsSkKmMgGtTpPeE ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RI [ VolumeGroupName | LogicalVolume { Name | Path }\ ...]
-.SH DESCRIPTION
-lvdisplay allows you to see the attributes of a logical volume
-like size, read/write status, snapshot information etc.
-.P
-\fBlvs\fP(8) is an alternative that provides the same information
-in the style of \fBps\fP(1).
-\fBlvs\fP(8) is recommended over \fBlvdisplay\fP.
-
-.SH OPTIONS
-See \fBlvm\fP(8) for common options and \fBlvs\fP for options given with
-\fB\-\-columns\fP.
-.TP
-.B \-\-all
-Include information in the output about internal Logical Volumes that
-are components of normally-accessible Logical Volumes, such as mirrors,
-but which are not independently accessible (e.g. not mountable).
-For example, after creating a mirror using
-\fBlvcreate \-m1 \-\-mirrorlog disk\fP,
-this option will reveal three internal Logical Volumes, with suffixes
-mimage_0, mimage_1, and mlog.
-.TP
-.BR \-C ", " \-\-columns
-Display output in columns, the equivalent of \fBlvs\fP(8).
-Options listed are the same as options given in \fBlvs\fP(8).
-.TP
-.BR \-c ", " \-\-colon
-Generate colon separated output for easier parsing in scripts or programs.
-N.B. \fBlvs\fP(8) provides considerably more control over the output.
-.nf
-
-The values are:
-
-\(bu logical volume name
-\(bu volume group name
-\(bu logical volume access
-\(bu logical volume status
-\(bu internal logical volume number
-\(bu open count of logical volume
-\(bu logical volume size in sectors
-\(bu current logical extents associated to logical volume
-\(bu allocated logical extents of logical volume
-\(bu allocation policy of logical volume
-\(bu read ahead sectors of logical volume
-\(bu major device number of logical volume
-\(bu minor device number of logical volume
-
-.fi
-.TP
-.BR \-m ", " \-\-maps
-Display the mapping of logical extents to physical volumes and
-physical extents. To map physical extents
-to logical extents use:
-.B pvs \-\-segments \-o+lv_name,seg_start_pe,segtype
-.SH Examples
-Shows attributes of that logical volume. If snapshot
-logical volumes have been created for this original logical volume,
-this command shows a list of all snapshot logical volumes and their
-status (active or inactive) as well:
-.sp
-.B lvdisplay \-v vg00/lvol2
-
-Shows the attributes of this snapshot logical volume and also which
-original logical volume it is associated with:
-.sp
-.B lvdisplay vg00/snapshot
-
-.SH SEE ALSO
-.BR lvm (8),
-.BR lvcreate (8),
-.BR lvs (8),
-.BR lvscan (8),
-.BR pvs (8)
diff --git a/man/lvextend.8.des b/man/lvextend.8.des
new file mode 100644
index 0000000..2a3781d
--- /dev/null
+++ b/man/lvextend.8.des
@@ -0,0 +1,5 @@
+lvextend extends the size of an LV. This requires allocating logical
+extents from the VG's free physical extents. A copy\-on\-write snapshot LV
+can also be extended to provide more space to hold COW blocks. Use
+\fBlvconvert\fP(8) to change the number of data images in a RAID or
+mirrored LV.
diff --git a/man/lvextend.8.end b/man/lvextend.8.end
new file mode 100644
index 0000000..6d197de
--- /dev/null
+++ b/man/lvextend.8.end
@@ -0,0 +1,16 @@
+.SH EXAMPLES
+
+Extend the size of an LV by 54MiB, using a specific PV.
+.br
+.B lvextend \-L +54 vg01/lvol10 /dev/sdk3
+
+Extend the size of an LV by the amount of free
+space on PV /dev/sdk3. This is equivalent to specifying
+"\-l +100%PVS" on the command line.
+.br
+.B lvextend vg01/lvol01 /dev/sdk3
+
+Extend an LV by 16MiB using specific physical extents.
+.br
+.B lvextend \-L+16m vg01/lvol01 /dev/sda:8\-9 /dev/sdb:8\-9
+
diff --git a/man/lvextend.8.in b/man/lvextend.8.in
deleted file mode 100644
index eefbf79..0000000
--- a/man/lvextend.8.in
+++ /dev/null
@@ -1,134 +0,0 @@
-.TH LVEXTEND 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-lvextend \(em extend the size of a logical volume
-.SH SYNOPSIS
-.B lvextend
-.RB [ \-\-alloc
-.IR AllocationPolicy ]
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-f | \-\-force ]
-.RB [ \-i | \-\-stripes
-.I Stripes
-.RB [ \-I | \-\-stripesize
-.IR StripeSize ]]
-.RB { \-l | \-\-extents
-.RI [ + ] LogicalExtentsNumber [ % { VG | LV | PVS | FREE | ORIGIN }]
-|
-.BR \-L | \-\-size
-.RI [ + ] LogicalVolumeSize [ bBsSkKmMgGtTpPeE ]}
-.RB [ \-n | \-\-nofsck ]
-.RB [ \-\-noudevsync]
-.RB [ \-r | \-\-resizefs ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-use\-policies ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.I LogicalVolumePath
-.RI [ PhysicalVolumePath [ :PE [ \-PE ]]...]
-.SH DESCRIPTION
-lvextend allows you to extend the size of a logical volume.
-Extension of snapshot logical volumes (see
-.BR lvcreate (8)
-for information to create snapshots) is supported as well.
-But to change the number of copies in a mirrored logical
-volume use
-.BR lvconvert (8).
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-f ", " \-\-force
-Proceed with size extension without prompting.
-.TP
-.IR \fB\-l ", " \fB\-\-extents " [" + ] LogicalExtentsNumber [ % { VG | LV | PVS | FREE | ORIGIN }]
-Extend or set the logical volume size in units of logical extents.
-With the '\fI+\fP' 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 total number of physical extents allocated will be
-greater than this, for example, if the volume is mirrored.
-The number can also be expressed as a percentage of the total space
-in the Volume Group with the suffix \fI%VG\fP, relative to the existing
-size of the Logical Volume with the suffix \fI%LV\fP, of the remaining
-free space for the specified PhysicalVolume(s) with the suffix \fI%PVS\fP,
-as a percentage of the remaining free space in the Volume Group
-with the suffix \fI%FREE\fP, or (for a snapshot) as a percentage of the total
-space in the Origin Logical Volume with the suffix \fI%ORIGIN\fP.
-The resulting value is rounded upward.
-N.B. In a future release, when expressed as a percentage with PVS, VG or FREE,
-the number will be treated as an approximate upper limit for the total number
-of physical extents to be allocated (including extents used by any mirrors, for
-example). The code may currently allocate more space than you might otherwise
-expect.
-.TP
-.IR \fB\-L ", " \fB\-\-size " [" + ] LogicalVolumeSize [ bBsSkKmMgGtTpPeE ]
-Extend or set the logical volume size in units of megabytes.
-A size suffix of M for megabytes,
-G for gigabytes, T for terabytes, P for petabytes
-or E for exabytes is optional.
-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.
-.TP
-.BR \-i ", " \-\-stripes " " \fIStripes
-Gives the number of stripes for the extension.
-Not applicable to LVs using the original metadata LVM format, which must
-use a single value throughout.
-.TP
-.BR \-I ", " \-\-stripesize " " \fIStripeSize
-Gives the number of kilobytes for the granularity of the stripes.
-Not applicable to LVs using the original metadata LVM format, which must
-use a single value throughout.
-.br
-StripeSize must be 2^n (n = 2 to 9)
-.TP
-.BR \-n ", " \-\-nofsck
-Do not perform fsck before extending filesystem when filesystem
-requires it. You may need to use \fB\-\-force\fR to proceed with
-this option.
-.TP
-.B \-\-noudevsync
-Disable udev synchronisation. The
-process will not wait for notification from udev.
-It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running
-or has rules that ignore the devices LVM2 creates.
-.TP
-.BR \-r ", " \-\-resizefs
-Resize underlying filesystem together with the logical volume using
-\fBfsadm\fR(8).
-.TP
-.B \-\-use\-policies
-Resizes the logical volume according to configured policy. See
-\fBlvm.conf\fR(5) for some details.
-
-.SH Examples
-Extends the size of the logical volume "vg01/lvol10" by 54MiB on physical
-volume /dev/sdk3. This is only possible if /dev/sdk3 is a member of
-volume group vg01 and there are enough free physical extents in it:
-.sp
-.B lvextend \-L +54 /dev/vg01/lvol10 /dev/sdk3
-
-Extends the size of logical volume "vg01/lvol01" by the amount of free
-space on physical volume /dev/sdk3. This is equivalent to specifying
-"\-l +100%PVS" on the command line:
-.sp
-.B lvextend /dev/vg01/lvol01 /dev/sdk3
-
-Extends a logical volume "vg01/lvol01" by 16MiB using physical extents
-/dev/sda:8\-9 and /dev/sdb:8\-9 for allocation of extents:
-.sp
-.B lvextend -L+16M vg01/lvol01 /dev/sda:8\-9 /dev/sdb:8\-9
-
-.SH SEE ALSO
-.BR fsadm (8),
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR lvcreate (8),
-.BR lvconvert (8),
-.BR lvreduce (8),
-.BR lvresize (8),
-.BR lvchange (8)
diff --git a/man/lvm-config.8.des b/man/lvm-config.8.des
new file mode 100644
index 0000000..1d36566
--- /dev/null
+++ b/man/lvm-config.8.des
@@ -0,0 +1,5 @@
+This command is the same as \fBlvmconfig\fP(8).
+
+lvm config produces formatted output from the LVM configuration tree. The
+sources of the configuration data include \fBlvm.conf\fP(5) and command
+line settings from \-\-config.
diff --git a/man/lvm-config.8.in b/man/lvm-config.8.in
deleted file mode 100644
index 5050d77..0000000
--- a/man/lvm-config.8.in
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/lvmconfig.8
diff --git a/man/lvm-dumpconfig.8.des b/man/lvm-dumpconfig.8.des
new file mode 100644
index 0000000..18593fb
--- /dev/null
+++ b/man/lvm-dumpconfig.8.des
@@ -0,0 +1,5 @@
+This command is the same as \fBlvmconfig\fP(8).
+
+lvm dumpconfig produces formatted output from the LVM configuration tree. The
+sources of the configuration data include \fBlvm.conf\fP(5) and command
+line settings from \-\-config.
diff --git a/man/lvm-dumpconfig.8.in b/man/lvm-dumpconfig.8.in
deleted file mode 100644
index 5050d77..0000000
--- a/man/lvm-dumpconfig.8.in
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/lvmconfig.8
diff --git a/man/lvm-fullreport.8.des b/man/lvm-fullreport.8.des
new file mode 100644
index 0000000..f350a0a
--- /dev/null
+++ b/man/lvm-fullreport.8.des
@@ -0,0 +1,6 @@
+lvm fullreport produces formatted output about PVs, PV segments, VGs, LVs
+and LV segments. The information is all gathered together for each VG
+(under a per-VG lock) so it is consistent. Information gathered from
+separate calls to \fBvgs\fP, \fBpvs\fP, and \fBlvs\fP can be inconsistent
+if information changes between commands.
+
diff --git a/man/lvm-fullreport.8.in b/man/lvm-fullreport.8.in
deleted file mode 100644
index 96ac937..0000000
--- a/man/lvm-fullreport.8.in
+++ /dev/null
@@ -1,145 +0,0 @@
-.TH LVM-FULLREPORT 8 "LVM TOOLS #VERSION#" "Red Hat, Inc" \" -*- nroff -*-
-.SH NAME
-lvm fullreport \(em Report information about PVs, PV segments, VGs, LVs and LV segments, all at once for each VG.
-.SH SYNOPSIS
-.B lvm fullreport
-.RB [ \-a | \-\-all ]
-.RB [ \-\-aligned ]
-.RB [ \-\-binary ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [[ \-\-configreport
-.IR ReportName ]
-.RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field1 [, Field2 ...]
-.RB [ \-O | \-\-sort
-.RI [ + | \- ] Key1 [, Key2 ...]]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB ...]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-ignoreskippedcluster ]
-.RB [ \-\-logonly ]
-.RB [ \-\-nameprefixes ]
-.RB [ \-\-noheadings ]
-.RB [ \-\-nosuffix ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-rows ]
-.RB [ \-\-separator
-.IR Separator ]
-.RB [ \-\-unbuffered ]
-.RB [ \-\-units
-.IR hHbBsSkKmMgGtTpPeE ]
-.RB [ \-\-unquoted ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RI [ VolumeGroupName
-.RI [ VolumeGroupName ...]]
-.SH DESCRIPTION
-lvm fullreport produces formatted output about PVs, PV segments, VGs, LVs
-and LV segments, all at once for each VG and guarded by per-VG lock
-for consistency.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.B \-\-all
-Include information in the output about internal Logical Volumes that
-are components of normally-accessible Logical Volumes, such as mirrors,
-but which are not independently accessible (e.g. not mountable).
-The names of such Logical Volumes are enclosed within square brackets
-in the output. For example, after creating a mirror using
-.B lvcreate -m1 \-\-mirrorlog disk
-, this option will reveal three internal Logical
-Volumes, with suffixes mimage_0, mimage_1, and mlog.
-.TP
-.B \-\-aligned
-Use with \fB\-\-separator\fP to align the output columns.
-.TP
-.B \-\-binary
-Use binary values "0" or "1" instead of descriptive literal values
-for columns that have exactly two valid values to report (not counting
-the "unknown" value which denotes that the value could not be determined).
-.TP
-.B \-\-configreport \fI ReportName
-Make any subsequent \fB\-o, \-\-options\fP, \fB\-O, \-\-sort\fP or
-\fB\-S, \-\-select\fP to apply for \fIReportName\fP where \fIReportName\fP
-is 'pv' for PV subreport, 'pvseg' for PV segment subreport, 'vg' for
-VG subreport, 'lv' for LV subreport, 'seg' for LV segment subreport or 'log'
-for log report. If \fB\-\-configreport\fP option is not used to identify a
-report, then all command's subreports are assumed except log report. The log
-report is available only if enabled by \fBlog/report_command_log\fP
-\fBlvm.conf\fP(5) setting or if \fB\-\-logonly\fP option is used.
-.TP
-.B \-\-logonly
-Suppress the main report itself and display only log report on output.
-.TP
-.B \-\-nameprefixes
-Add an "LVM2_" prefix plus the field name to the output. Useful
-with \fB\-\-noheadings\fP to produce a list of field=value pairs that can
-be used to set environment variables (for example, in \fBudev\fP(7) rules).
-.TP
-.B \-\-noheadings
-Suppress the headings line that is normally the first line of output.
-Useful if grepping the output.
-.TP
-.B \-\-nosuffix
-Suppress the suffix on output sizes. Use with \fB\-\-units\fP
-(except h and H) if processing the output.
-.TP
-.BR \-o ", " \-\-options
-Comma-separated ordered list of columns.
-.IP
-Precede the list with '\fI+\fP' to append to the current list
-of columns, '\fI-\fP' to remove from the current list of columns
-or '\fI#\fP' to compact given columns. The \fI\-o\fP option can
-be repeated, providing several lists. These lists are evaluated
-from left to right.
-.IP
-For the list of columns, see \fBpvs\fP(8), \fBvgs\fP(8),
-\fBlvs\fP(8) man page or check \fBpvs\fP, \fBvgs\fP, \fBlvs -o help\fP
-output.
-.TP
-.BR \-O ", " \-\-sort
-Comma-separated ordered list of columns to sort by. Replaces the default
-selection. Precede any column with '\fI\-\fP' for a reverse sort on that
-column.
-.TP
-.B \-\-rows
-Output columns as rows.
-.TP
-.BR \-S ", " \-\-select " " \fISelection
-Display only rows that match Selection criteria. All rows are displayed with
-the additional "selected" column (\fB-o selected\fP) showing 1 if the row
-matches the Selection and 0 otherwise. The Selection criteria are defined
-by specifying column names and their valid values (that can include reserved
-values) while making use of supported comparison operators. See \fBlvm\fP(8)
-and \fB\-S\fP, \fB\-\-select\fP description for more detailed information
-about constructing the Selection criteria. As a quick help and to see full
-list of column names that can be used in Selection including the list of
-reserved values and the set of supported selection operators, check the
-output of \fBpvs\fP, \fBvgs\fP, \fBlvs -S help\fP command.
-.TP
-.B \-\-separator \fISeparator
-String to use to separate each column. Useful if grepping the output.
-.TP
-.B \-\-unbuffered
-Produce output immediately without sorting or aligning the columns properly.
-.TP
-.B \-\-units \fIhHbBsSkKmMgGtTpPeE
-All sizes are output in these units: (h)uman-readable, (b)ytes, (s)ectors,
-(k)ilobytes, (m)egabytes, (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
-Capitalise to use multiples of 1000 (S.I.) instead of 1024. Can also specify
-custom units e.g. \-\-units 3M
-.TP
-.B \-\-unquoted
-When used with \fB\-\-nameprefixes\fP, output values in the field=value
-pairs are not quoted.
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvs (8),
-.BR vgs (8),
-.BR lvs (8)
diff --git a/man/lvm-lvpoll.8.des b/man/lvm-lvpoll.8.des
new file mode 100644
index 0000000..35c2522
--- /dev/null
+++ b/man/lvm-lvpoll.8.des
@@ -0,0 +1,4 @@
+lvm lvpoll is an internal command used by \fBlvmpolld\fP(8) to monitor and
+complete \fBlvconvert\fP(8) and \fBpvmove\fP(8) operations. lvpoll itself
+does not initiate these operations and should not normally need to be run
+directly.
diff --git a/man/lvm-lvpoll.8.end b/man/lvm-lvpoll.8.end
new file mode 100644
index 0000000..eddb364
--- /dev/null
+++ b/man/lvm-lvpoll.8.end
@@ -0,0 +1,33 @@
+.SH NOTES
+
+To find the name of the pvmove LV that was created by an original
+\fBpvmove /dev/name\fP command, use the command:
+.br
+\fBlvs -a -S move_pv=/dev/name\fP.
+
+.SH EXAMPLES
+
+Continue polling a pvmove operation.
+.br
+.B lvm lvpoll --polloperation pvmove vg00/pvmove0
+
+Abort a pvmove operation.
+.br
+.B lvm lvpoll --polloperation pvmove --abort vg00/pvmove0
+
+Continue polling a mirror conversion.
+.br
+.B lvm lvpoll --polloperation convert vg00/lvmirror
+
+Continue mirror repair.
+.br
+.B lvm lvpoll --polloperation convert vg/damaged_mirror --handlemissingpvs
+
+Continue snapshot merge.
+.br
+.B lvm lvpoll --polloperation merge vg/snapshot_old
+
+Continue thin snapshot merge.
+.br
+.B lvm lvpoll --polloperation merge_thin vg/thin_snapshot
+
diff --git a/man/lvm-lvpoll.8.in b/man/lvm-lvpoll.8.in
deleted file mode 100644
index 8ffbdd4..0000000
--- a/man/lvm-lvpoll.8.in
+++ /dev/null
@@ -1,89 +0,0 @@
-.TH "LVPOLL" "8" "LVM TOOLS #VERSION#" "Red Hat, Inc" \" -*- nroff -*-
-.SH NAME
-lvpoll \(em Internal command used by lvmpolld to complete some Logical Volume operations.
-
-.SH SYNOPSIS
-.B lvm lvpoll
-.BR \-\-polloperation
-.RI { pvmove | convert | merge | merge_thin }
-.RB [ \-\-abort ]
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-handlemissingpvs ]
-.RB [ \-i | \-\-interval
-.IR Seconds ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.IR LogicalVolume [ Path ]
-.SH DESCRIPTION
-\fBlvpoll\fP is an internal command used by \fBlvmpolld\fP(8) to monitor and
-complete \fBlvconvert\fP(8) and \fBpvmove\fP(8) operations.
-\fBlvpoll\fP itself does not initiate these operations and
-you should never normally need to invoke it directly.
-
-.I LogicalVolume
-The Logical Volume undergoing conversion or, in the case of pvmove, the name of
-the internal pvmove Logical Volume (see \fBEXAMPLES\fP).
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-\-polloperation " {" \fIconvert | \fImerge | \fImerge_thin | \fIpvmove }
-Mandatory option.
-\fIpvmove\fP refers to a pvmove operation that is moving data.
-\fIconvert\fP refers to an operation that is increasing the number of redundant copies of data maintained by a mirror.
-\fImerge\fP indicates a merge operation that doesn't involve thin volumes.
-\fImerge_thin\fP indicates a merge operation involving thin snapshots.
-\fBpvmove\fP(8) and \fBlvconvert\fP(8) describe how to initiate these operations.
-.TP
-.B \-\-abort
-Abort pvmove in progress. See \fBpvmove\fP(8).
-.TP
-.B \-\-handlemissingpvs
-Used when the polling operation needs to handle missing PVs to be able to
-continue. This can happen when \fBlvconvert\fP(8) is repairing a mirror
-with one or more faulty devices.
-.TP
-.BR \-i ", " \-\-interval " "\fISeconds
-Report progress at regular intervals
-
-.SH EXAMPLES
-Resume polling of a pvmove operation identified by the Logical Volume vg00/pvmove0:
-.sp
-.B lvm lvpoll --polloperation pvmove vg00/pvmove0
-.P
-Abort the same pvmove operation:
-.sp
-.B lvm lvpoll --polloperation pvmove --abort vg00/pvmove0
-.P
-To find out the name of the pvmove Logical Volume resulting from an original
-\fBpvmove /dev/sda1\fP command you may use the following \fBlvs\fP command.
-(Remove the parentheses from the LV name.)
-.sp
-.B lvs -a -S move_pv=/dev/sda1
-.P
-Resume polling of mirror conversion vg00/lvmirror:
-.sp
-.B lvm lvpoll --polloperation convert vg00/lvmirror
-.P
-Complete mirror repair:
-.sp
-.B lvm lvpoll --polloperation convert vg/damaged_mirror --handlemissingpvs
-.P
-Process snapshot merge:
-.sp
-.B lvm lvpoll --polloperation merge vg/snapshot_old
-.P
-Finish thin snapshot merge:
-.sp
-.B lvm lvpoll --polloperation merge_thin vg/thin_snapshot
-.SH SEE ALSO
-.BR lvconvert (8),
-.BR lvm (8),
-.BR lvmpolld (8),
-.BR lvs (8),
-.BR pvmove (8)
diff --git a/man/lvmchange.8.in b/man/lvmchange.8.in
deleted file mode 100644
index dc6b3bd..0000000
--- a/man/lvmchange.8.in
+++ /dev/null
@@ -1,10 +0,0 @@
-.TH LVMCHANGE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-lvmchange \(em change attributes of the logical volume manager
-.SH SYNOPSIS
-.B lvmchange
-.SH DESCRIPTION
-lvmchange is not currently supported under LVM2, although
-\fBdmsetup\fP(8) has a \fBremove_all\fP command.
-.SH SEE ALSO
-.BR dmsetup (8)
diff --git a/man/lvmconfig.8.des b/man/lvmconfig.8.des
new file mode 100644
index 0000000..17f9f18
--- /dev/null
+++ b/man/lvmconfig.8.des
@@ -0,0 +1,3 @@
+lvmconfig produces formatted output from the LVM configuration tree. The
+sources of the configuration data include \fBlvm.conf\fP(5) and command
+line settings from \-\-config.
diff --git a/man/lvmconfig.8.in b/man/lvmconfig.8.in
deleted file mode 100644
index f4b6abd..0000000
--- a/man/lvmconfig.8.in
+++ /dev/null
@@ -1,225 +0,0 @@
-.TH "LVMCONFIG" "8" "LVM TOOLS #VERSION#" "Red Hat, Inc" "\""
-.SH "NAME"
-lvmconfig, lvm dumpconfig, lvm config \(em Display LVM configuration
-.SH SYNOPSIS
-.
-.ad l
-.B lvmconfig
-.RB [ \-f | \-\-file
-.IR Filename ]
-.RB [ \-\-type
-.RB { current | default | diff | full |\: list | missing | new \c
-.RB | profilable | profilable-command | profilable-metadata }]
-.RB [ \-\-atversion
-.IR Version ]
-.RB [ \-\-sinceversion
-.IR Version ]
-.RB [ \-\-ignoreadvanced ]
-.RB [ \-\-ignoreunsupported ]
-.RB [ \-\-ignorelocal ]
-.RB [ \-l | \-\-list ]
-.RB [ \-\-config
-.IR ConfigurationString ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-\-profile
-.IR ProfileName ]
-.RB [ \-\-metadataprofile
-.IR ProfileName ]
-.RB [ \-\-mergedconfig ]
-.RB [ \-\-showdeprecated ]
-.RB [ \-\-showunsupported ]
-.RB [ \-\-validate ]
-.RB [ \-\-withsummary ]
-.RB [ \-\-withcomments ]
-.RB [ \-\-withspaces ]
-.RB [ \-\-withversions ]
-.RB [ ConfigurationNode... ]
-.ad b
-.
-.SH DESCRIPTION
-lvmconfig produces formatted output from the LVM configuration tree.
-The command was added in release 2.02.119 and has an identical longer form
-\fBlvm dumpconfig\fP.
-
-.SH OPTIONS
-.TP
-.BR \-f ", " \-\-file " \fIFilename"
-Send output to a file named 'filename'.
-
-.TP
-.BR \-l ", " \-\-list
-List configuration settings with summarizing comment. This is the same as using
-\fBlvmconfig --type list --withsummary\fP.
-
-.TP
-.BR \-\-type " {" current | default | diff | full | missing | new | profilable |\: profilable-command | profilable-metadata }
-Select the type of configuration to display. The configuration settings
-displayed have either default values or currently-used values assigned based on
-the type selected. If no type is selected, \fB\-\-type current\fP is used
-by default. Whenever a configuration setting with a default value is
-commented out, it means the setting does not have any concrete default
-value defined. Output can be saved and used as a proper \fBlvm.conf\fP(5)
-file.
-.RS
-.IP \fBcurrent\fP 3
-Display the current \fBlvm.conf\fP configuration merged with any \fBtag
-config\fP if used. See also \fBlvm.conf\fP(5) for more info about LVM
-configuration methods.
-.IP \fBdefault\fP 3
-Display all possible configuration settings with default values assigned.
-.IP \fBdiff\fP 3
-Display all configuration settings for which the values used differ from defaults.
-The value assigned for each configuration setting is the value currently used.
-Using this type also implies the use of \fB\-\-mergedconfig\fP option.
-This is actually minimal LVM configuration which can be used without
-a change to current configured behaviour.
-.IP \fBfull\fP 3
-Display full configuration tree - a combination of current configuration tree
-(\fB\-\-type current\fP) and tree of settings for which default values are
-used (\fB\-\-type missing\fP). This is exactly the configuration tree that
-LVM2 uses during command execution. Using this type also implies
-the use of \fB\-\-mergedconfig\fP option. If comments are displayed
-(see \fB\-\-withcomments\fP and \fB\-\-withsummary\fP options), then
-for each setting found in existing configuration and for which defaults
-are not used, there's an extra comment line printed to denote this.
-.IP \fBlist\fP 3
-Display plain list of configuration settings.
-.IP \fBmissing\fP 3
-Display all configuration settings with default values assigned which are
-missing in the configuration currently used and for which LVM automatically
-fallbacks to using these default values.
-.IP \fBnew\fP 3
-Display all new configuration settings introduced in current LVM version
-or specific version as defined by \fB\-\-atversion\fP option.
-.IP \fBprofilable\fP 3
-Display all profilable configuration settings with default values assigned.
-See \fBlvm.conf\fP(5) for more info about \fBprofile config\fP method.
-.IP \fBprofilable-command\fP 3
-Display all profilable configuration settings with default values assigned
-that can be used in command profile. This is a subset of settings displayed
-by \fB\-\-type profilable\fP.
-.IP \fBprofilable-metadata\fP 3
-Display all profilable configuration settings with default values assigned
-that can be used in metadata profile. This is a subset of settings displayed
-by \fB\-\-type profilable\fP.
-.RE
-
-.TP
-.BI \-\-atversion " Version"
-Specify an LVM version in x.y.z format where x is the major version,
-the y is the minor version and z is the patchlevel (e.g. 2.2.106).
-When configuration is displayed, the configuration settings recognized
-at this LVM version will be considered only. This can be used
-to display a configuration that a certain LVM version understands and
-which does not contain any newer settings for which LVM would
-issue a warning message when checking the configuration.
-
-.TP
-.BI \-\-sinceversion " Version"
-Specify an LVM version in x.y.z format where x is the major version,
-the y is the minor version and z is the patchlevel (e.g. 2.2.106).
-This option is currently applicable only with \fB\-\-type new\fP
-to display all configuration settings introduced since given version.
-
-.TP
-.B \-\-ignoreadvanced
-Exclude advanced configuration settings from the output.
-
-.TP
-.B \-\-ignoreunsupported
-Exclude unsupported configuration settings from the output. These settings are
-either used for debugging and development purposes only or their support is not
-yet complete and they are not meant to be used in production. The \fBcurrent\fP
-and \fBdiff\fP types include unsupported settings in their output by default,
-all the other types ignore unsupported settings.
-
-.TP
-.B \-\-ignorelocal
-Ignore local section.
-
-.TP
-.BI \-\-config " ConfigurationString"
-Use \fIConfigurationString\fP to override existing configuration.
-This configuration is then applied for the lvmconfig command itself.
-See also \fBlvm.conf\fP(5) for more info about \fBconfig cascade\fP.
-
-.TP
-.BI \-\-commandprofile " ProfileName"
-Use \fIProfileName\fP to override existing configuration.
-This configuration is then applied for the lvmconfig command itself.
-See also \fB\-\-mergedconfig\fP option and \fBlvm.conf\fP(5) for
-more info about \fBconfig cascade\fP.
-
-.TP
-.BI \-\-profile " ProfileName"
-The same as using \fB\-\-commandprofile\fP but the configuration is not
-applied for the lvmconfig command itself.
-
-.TP
-.BI \-\-metadataprofile " ProfileName"
-Use \fIProfileName\fP to override existing configuration.
-The configuration defined in metadata profile has no effect for
-the lvmconfig command itself. lvmconfig displays the configuration only.
-See also \fB\-\-mergedconfig\fP option and \fBlvm.conf\fP(5) for more
-info about \fBconfig cascade\fP.
-
-.TP
-.B \-\-mergedconfig
-When the lvmconfig command is run with the \fB\-\-config\fP option
-and/or \fB\-\-commandprofile\fP (or using \fBLVM_COMMAND_PROFILE\fP
-environment variable), \fB\-\-profile\fP, \fB\-\-metadataprofile\fP
-option, merge all the contents of the \fBconfig cascade\fP before displaying it.
-Without the \fB\-\-mergeconfig\fP option used, only the configuration at
-the front of the cascade is displayed. See also \fBlvm.conf\fP(5) for more
-info about \fBconfig cascade\fP.
-
-.TP
-.B \-\-showdeprecated
-Include deprecated configuration settings in the output. These settings
-are always deprecated since certain version. If concrete version is specified
-with \fB--atversion\fP option, deprecated settings are automatically included
-if specified version is lower that the version in which the settings were
-deprecated. The \fBcurrent\fP and \fBdiff\fP types include deprecated settings
-int their output by default, all the other types ignore deprecated settings.
-
-.TP
-.B \-\-showunsupported
-Include unsupported configuration settings in the output. These settings
-are either used for debugging or development purposes only or their support
-is not yet complete and they are not meant to be used in production. The
-\fBcurrent\fP and \fBdiff\fP types include unsupported settings in their
-output by default, all the other types ignore unsupported settings.
-
-.TP
-.B \-\-validate
-Validate current configuration used and exit with appropriate
-return code. The validation is done only for the configuration
-at the front of the \fBconfig cascade\fP. To validate the whole
-merged configuration tree, use also the \fB\-\-mergedconfig\fP option.
-The validation is done even if \fBconfig/checks\fP \fBlvm.conf\fP(5)
-option is disabled.
-
-.TP
-.B \-\-withsummary
-Display a one line comment for each configuration node.
-
-.TP
-.B \-\-withcomments
-Display a full comment for each configuration node. For deprecated
-settings, also display comments about deprecation in addition.
-
-.TP
-.B \-\-withspaces
-Where appropriate, add more spaces in output for better readability.
-
-.TP
-.B \-\-withversions
-Also display a comment containing the version of introduction for
-each configuration node. If the setting is deprecated, also display
-the version since which it is deprecated.
-
-.SH SEE ALSO
-.BR lvm (8)
-.BR lvmconf (8)
-.BR lvm.conf (5)
diff --git a/man/lvmdiskscan.8.des b/man/lvmdiskscan.8.des
new file mode 100644
index 0000000..c1e87cc
--- /dev/null
+++ b/man/lvmdiskscan.8.des
@@ -0,0 +1,7 @@
+lvmdiskscan scans all SCSI, (E)IDE disks, multiple devices and a bunch of
+other block devices in the system looking for LVM PVs. The size reported
+is the real device size. Define a filter in \fBlvm.conf\fP(5) to restrict
+the scan to avoid a CD ROM, for example.
+
+This command is deprecated, use \fBpvs\fP instead.
+
diff --git a/man/lvmdiskscan.8.in b/man/lvmdiskscan.8.in
deleted file mode 100644
index 6de34c1..0000000
--- a/man/lvmdiskscan.8.in
+++ /dev/null
@@ -1,27 +0,0 @@
-.TH LVMDISKSCAN 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-lvmdiskscan \(em scan for all devices visible to LVM2
-.SH SYNOPSIS
-.B lvmdiskscan
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-l | \-\-lvmpartition ]
-.RB [ \-v | \-\-verbose ]
-.SH DESCRIPTION
-lvmdiskscan scans all SCSI, (E)IDE disks, multiple devices and a bunch
-of other block devices in the system looking for LVM physical volumes.
-The size reported is the real device size.
-Define a filter in \fBlvm.conf\fP(5) to restrict
-the scan to avoid a CD ROM, for example.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-l ", " \-\-lvmpartition
-Only reports Physical Volumes.
-.SH SEE ALSO
-.BR lvm (8),
-.BR lvm.conf (5),
-.BR pvscan (8),
-.BR vgscan (8)
diff --git a/man/lvmlockd.8.in b/man/lvmlockd.8.in
index f01c695..6e9b703 100644
--- a/man/lvmlockd.8.in
+++ b/man/lvmlockd.8.in
@@ -573,25 +573,37 @@ To place the lvmlock LV on a specific device, create the VG with only that
device, then use vgextend to add other devices.
-.SS shared LVs
-
-When an LV is used concurrently from multiple hosts (e.g. by a
-multi\-host/cluster application or file system), the LV can be activated
-on multiple hosts concurrently using a shared lock.
-
-To activate the LV with a shared lock: lvchange \-asy vg/lv.
-
-With lvmlockd, an unspecified activation mode is always exclusive, i.e.
-\-ay defaults to \-aey.
-
-If the LV type does not allow the LV to be used concurrently from multiple
-hosts, then a shared activation lock is not allowed and the lvchange
-command will report an error. LV types that cannot be used concurrently
+.SS LV activation
+
+In a shared VG, activation changes involve locking through lvmlockd, and
+the following values are possible with lvchange/vgchange -a:
+
+.IP \fBy\fP|\fBey\fP
+The command activates the LV in exclusive mode, allowing a single host
+to activate the LV. Before activating the LV, the command uses lvmlockd
+to acquire an exclusive lock on the LV. If the lock cannot be acquired,
+the LV is not activated and an error is reported. This would happen if
+the LV is active on another host.
+
+.IP \fBsy\fP
+The command activates the LV in shared mode, allowing multiple hosts to
+activate the LV concurrently. Before activating the LV, the
+command uses lvmlockd to acquire a shared lock on the LV. If the lock
+cannot be acquired, the LV is not activated and an error is reported.
+This would happen if the LV is active exclusively on another host. If the
+LV type prohibits shared access, such as a snapshot, the command will
+report an error and fail.
+The shared mode is intended for a multi\-host/cluster application or
+file system.
+LV types that cannot be used concurrently
from multiple hosts include thin, cache, raid, mirror, and snapshot.
-
lvextend on LV with shared locks is not yet allowed. The LV must be
deactivated, or activated exclusively to run lvextend.
+.IP \fBn\fP
+The command deactivates the LV. After deactivating the LV, the command
+uses lvmlockd to release the current lock on the LV.
+
.SS recover from lost PV holding sanlock locks
diff --git a/man/lvmsadc.8.des b/man/lvmsadc.8.des
new file mode 100644
index 0000000..e4cfd8d
--- /dev/null
+++ b/man/lvmsadc.8.des
@@ -0,0 +1,3 @@
+lvmsadc is not currently supported in LVM. The device-mapper statistics
+facility provides similar performance metrics using the \fBdmstats(8)\fP
+command.
diff --git a/man/lvmsadc.8.in b/man/lvmsadc.8.in
deleted file mode 100644
index 81d2b66..0000000
--- a/man/lvmsadc.8.in
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH "LVMSADC" "8" "LVM TOOLS #VERSION#" "Red Hat, Inc" "\""
-
-.SH "NAME"
-lvmsadc \(em LVM system activity data collector
-
-.SH "SYNOPSIS"
-.B lvmsadc
-
-.SH "DESCRIPTION"
-lvmsadc is not currently supported under LVM2: the device-mapper statistics
-facility provides similar performance metrics using the \fBdmstats(8)\fP
-command.
-
-.SH "SEE ALSO"
-.BR dmstats (8)
-.BR lvm (8)
diff --git a/man/lvmsar.8.des b/man/lvmsar.8.des
new file mode 100644
index 0000000..3177506
--- /dev/null
+++ b/man/lvmsar.8.des
@@ -0,0 +1,3 @@
+lvmsar is not currently supported in LVM. The device-mapper statistics
+facility provides similar performance metrics using the \fBdmstats(8)\fP
+command.
diff --git a/man/lvmsar.8.in b/man/lvmsar.8.in
deleted file mode 100644
index fca111f..0000000
--- a/man/lvmsar.8.in
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH "LVMSAR" "8" "LVM TOOLS #VERSION#" "Red Hat, Inc" "\""
-
-.SH "NAME"
-lvmsar \(em LVM system activity reporter
-
-.SH "SYNOPSIS"
-.B lvmsar
-
-.SH "DESCRIPTION"
-lvmsar is not currently supported under LVM2: the device-mapper statistics
-facility provides similar performance metrics using the \fBdmstats(8)\fP
-command.
-
-.SH "SEE ALSO"
-.BR dmstats (8)
-.BR lvm (8)
diff --git a/man/lvreduce.8.des b/man/lvreduce.8.des
new file mode 100644
index 0000000..7f0ba0c
--- /dev/null
+++ b/man/lvreduce.8.des
@@ -0,0 +1,14 @@
+lvreduce reduces the size of an LV. The freed logical extents are returned
+to the VG to be used by other LVs. A copy\-on\-write snapshot LV can also
+be reduced if less space is needed to hold COW blocks. Use
+\fBlvconvert\fP(8) to change the number of data images in a RAID or
+mirrored LV.
+
+Be careful when reducing an LV's size, because data in the reduced area is
+lost. Ensure that any file system on the LV is resized \fBbefore\fP
+running lvreduce so that the removed extents are not in use by the file
+system.
+
+Sizes will be rounded if necessary. For example, the LV size must be an
+exact number of extents, and the size of a striped segment must be a
+multiple of the number of stripes.
diff --git a/man/lvreduce.8.end b/man/lvreduce.8.end
new file mode 100644
index 0000000..59fde52
--- /dev/null
+++ b/man/lvreduce.8.end
@@ -0,0 +1,5 @@
+.SH EXAMPLES
+
+Reduce the size of an LV by 3 logical extents:
+.br
+.B lvreduce \-l \-3 vg00/lvol1
diff --git a/man/lvreduce.8.in b/man/lvreduce.8.in
deleted file mode 100644
index edf0c92..0000000
--- a/man/lvreduce.8.in
+++ /dev/null
@@ -1,110 +0,0 @@
-.TH LVREDUCE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-lvreduce \(em reduce the size of a logical volume
-.SH SYNOPSIS
-.B lvreduce
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RB [ \-f | \-\-force ]
-.RB [ \-\-noudevsync ]
-.RB { \-l | \-\-extents
-.RI [ \- ] LogicalExtentsNumber [ % { VG | LV | FREE | ORIGIN }]
-.RB |
-.BR \-L | \-\-size
-.RI [ \- ] LogicalVolumeSize [ bBsSkKmMgGtTpPeE ]}
-.RB [ \-n | \-\-nofsck ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-r | \-\-resizefs ]
-.IR LogicalVolume { Name | Path }
-.SH DESCRIPTION
-lvreduce allows you to reduce the size of a logical volume.
-Be careful when reducing a logical volume's size, because data in the
-reduced part is lost!!!
-.br
-You should therefore ensure that any filesystem on the volume is
-resized
-.I before
-running lvreduce so that the extents that are to be removed are not in use.
-.br
-Shrinking snapshot logical volumes (see
-.BR lvcreate (8)
-for information to create snapshots) is supported as well.
-But to change the number of copies in a mirrored logical
-volume use
-.BR lvconvert (8).
-.br
-Sizes will be rounded if necessary - for example, the volume size must
-be an exact number of extents and the size of a striped segment must
-be a multiple of the number of stripes.
-.br
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-f ", " \-\-force
-Force size reduction without prompting even when it may cause data loss.
-.TP
-.IR \fB\-l ", " \fB\-\-extents " [" \- ] LogicalExtentsNumber [ % { VG | LV | FREE | ORIGIN }]
-Reduce or set the logical volume size in units of logical extents.
-With the \fI-\fP sign the value will be subtracted from
-the logical volume's actual size and without it the value will be taken
-as an absolute size.
-The total number of physical extents freed will be greater than this logical
-value if, for example, the volume is mirrored.
-The number can also be expressed as a percentage of the total space
-in the Volume Group with the suffix \fI%VG\fP, relative to the existing
-size of the Logical Volume with the suffix \fI%LV\fP, as a percentage of the
-remaining free space in the Volume Group with the suffix \fI%FREE\fP, or (for
-a snapshot) as a percentage of the total space in the Origin Logical
-Volume with the suffix \fI%ORIGIN\fP.
-The resulting value for the subtraction is rounded downward, for the absolute
-size it is rounded upward.
-N.B. In a future release, when expressed as a percentage with VG or FREE, the
-number will be treated as an approximate total number of physical extents to be
-freed (including extents used by any mirrors, for example). The code may
-currently release more space than you might otherwise expect.
-.TP
-.IR \fB\-L ", " \fB\-\-size " [" \- ] LogicalVolumeSize [ bBsSkKmMgGtTpPeE ]
-Reduce or set the logical volume size in units of megabytes.
-A size suffix of \fIk\fP for kilobyte, \fIm\fP for megabyte,
-\fIg\fP for gigabytes, \fIt\fP for terabytes, \fIp\fP for petabytes
-or \fIe\fP for exabytes is optional.
-With the \fI\-\fP sign the value will be subtracted from
-the logical volume's actual size and without it it will be taken as
-an absolute size.
-.TP
-.BR \-n ", " \-\-nofsck
-Do not perform fsck before resizing filesystem when filesystem
-requires it. You may need to use \fB\-\-force\fR to proceed with
-this option.
-.TP
-.BR \-\-noudevsync
-Disable udev synchronisation. The
-process will not wait for notification from udev.
-It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running
-or has rules that ignore the devices LVM2 creates.
-.TP
-.BR \-r ", " \-\-resizefs
-Resize underlying filesystem together with the logical volume using
-.BR fsadm (8).
-.SH Examples
-Reduce the size of logical volume lvol1 in volume group vg00 by 3 logical extents:
-.sp
-.B lvreduce \-l \-3 vg00/lvol1
-.SH SEE ALSO
-.BR fsadm (8),
-.BR lvchange (8),
-.BR lvconvert (8),
-.BR lvcreate (8),
-.BR lvextend (8),
-.BR lvm (8),
-.BR lvresize (8),
-.BR vgreduce (8)
diff --git a/man/lvremove.8.des b/man/lvremove.8.des
new file mode 100644
index 0000000..d049c63
--- /dev/null
+++ b/man/lvremove.8.des
@@ -0,0 +1,22 @@
+lvremove removes one or more LVs. For standard LVs, this returns the
+logical extents that were used by the LV to the VG for use by other LVs.
+
+Confirmation will be requested before deactivating any active LV prior to
+removal. LVs cannot be deactivated or removed while they are open (e.g.
+if they contain a mounted filesystem). Removing an origin LV will also
+remove all dependent snapshots.
+
+\fBHistorical LVs\fP
+
+If the configuration setting \fBmetadata/record_lvs_history\fP is enabled
+and the LV being removed forms part of the history of at least one LV that
+is still present, then a simplified representation of the LV will be
+retained. This includes the time of removal (\fBlv_time_removed\fP
+reporting field), creation time (\fBlv_time\fP), name (\fBlv_name\fP), LV
+uuid (\fBlv_uuid\fP) and VG name (\fBvg_name\fP). This allows later
+reporting to see the ancestry chain of thin snapshot volumes, even after
+some intermediate LVs have been removed. The names of such historical LVs
+acquire a hyphen as a prefix (e.g. '-lvol1') and cannot be reactivated.
+Use lvremove a second time, with the hyphen, to remove the record of the
+former LV completely.
+
diff --git a/man/lvremove.8.end b/man/lvremove.8.end
new file mode 100644
index 0000000..5c70ed6
--- /dev/null
+++ b/man/lvremove.8.end
@@ -0,0 +1,11 @@
+.SH EXAMPLES
+
+Remove an active LV without asking for confirmation.
+.br
+.B lvremove \-f vg00/lvol1
+
+Remove all LVs the specified VG.
+.br
+.B lvremove vg00
+
+
diff --git a/man/lvremove.8.in b/man/lvremove.8.in
deleted file mode 100644
index fe9375c..0000000
--- a/man/lvremove.8.in
+++ /dev/null
@@ -1,80 +0,0 @@
-.TH LVREMOVE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-lvremove \(em remove a logical volume
-.SH SYNOPSIS
-.B lvremove
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-\-nohistory ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RB [ \-f | \-\-force ]
-.RB [ \-\-noudevsync ]
-.RI [ LogicalVolume { Name | Path }...]
-.SH DESCRIPTION
-lvremove removes one or more logical volumes.
-Confirmation will be requested before deactivating any active logical
-volume prior to removal. Logical volumes cannot be deactivated
-or removed while they are open (e.g. if they contain a mounted filesystem).
-Removing an origin logical volume will also remove all dependent snapshots.
-.sp
-If the logical volume is clustered then it must be deactivated on all
-nodes in the cluster before it can be removed. A single lvchange command
-issued from one node can do this.
-.sp
-If the configuration setting \fBmetadata/record_lvs_history\fP is enabled
-and the logical volume being removed forms part of the history of at least
-one logical volume that is still present then a simplified representation of
-the logical volume will be retained. This includes the time of removal
-(\fBlv_time_removed\fP reporting field), creation time (\fBlv_time\fP), name
-(\fBlv_name\fP), LV uuid (\fBlv_uuid\fP) and VG name (\fBvg_name\fP) and
-allows you to see the ancestry chain of thin snapshot volumes even after
-some intermediate logical volumes have been removed.
-The names of such historical logical volumes acquire a hyphen as a prefix
-(e.g. '-lvol1') and cannot be reactivated. Use lvremove a second time,
-with the hyphen, to remove the record of the former logical volume completely.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-f ", " \-\-force
-Remove active logical volumes without confirmation.
-Tool will try to deactivate \fIunused\fP volume.
-To proceed with damaged pools use \-ff
-.TP
-.B \-\-nohistory
-Disable the recording of history of logical volumes which are being removed.
-(This has no effect unless the configuration setting
-\fBmetadata/record_lvs_history\fP is enabled.)
-.TP
-.B \-\-noudevsync
-Disable udev synchronisation. The
-process will not wait for notification from udev.
-It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running
-or has rules that ignore the devices LVM2 creates.
-.SH Examples
-Remove the active logical volume lvol1 in volume group vg00
-without asking for confirmation:
-.sp
-.B lvremove \-f vg00/lvol1
-.sp
-Remove all logical volumes in volume group vg00:
-.sp
-.B lvremove vg00
-.SH SEE ALSO
-.BR lvcreate (8),
-.BR lvdisplay (8),
-.BR lvchange (8),
-.BR lvm (8),
-.BR lvs (8),
-.BR lvscan (8),
-.BR vgremove (8)
diff --git a/man/lvrename.8.des b/man/lvrename.8.des
new file mode 100644
index 0000000..a8455fc
--- /dev/null
+++ b/man/lvrename.8.des
@@ -0,0 +1,2 @@
+lvrename renames an existing LV or a historical LV (see \fBlvremove\fP for
+historical LV information.)
diff --git a/man/lvrename.8.end b/man/lvrename.8.end
new file mode 100644
index 0000000..3409b8a
--- /dev/null
+++ b/man/lvrename.8.end
@@ -0,0 +1,10 @@
+.SH EXAMPLES
+
+Rename "lvold" to "lvnew":
+.br
+.B lvrename /dev/vg02/lvold vg02/lvnew
+
+An alternate syntax to rename "lvold" to "lvnew":
+.br
+.B lvrename vg02 lvold lvnew
+
diff --git a/man/lvrename.8.in b/man/lvrename.8.in
deleted file mode 100644
index de6e519..0000000
--- a/man/lvrename.8.in
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH LVRENAME 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-lvrename \(em rename a logical volume
-.SH SYNOPSIS
-.B lvrename
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RB [ \-f | \-\-force ]
-.RB [ \-\-noudevsync ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RI { OldLogicalVolume { Name | Path }
-.IR NewLogicalVolume { Name | Path }
-|
-.I VolumeGroupName OldLogicalVolumeName NewLogicalVolumeName\fR}
-.SH DESCRIPTION
-lvrename renames an existing logical volume or an existing
-historical logical volume from
-.IR OldLogicalVolume { Name | Path }
-to
-.IR NewLogicalVolume { Name | Path }.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-\-noudevsync
-Disable udev synchronisation. The
-process will not wait for notification from udev.
-It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running
-or has rules that ignore the devices LVM2 creates.
-.SH EXAMPLE
-To rename lvold in volume group vg02 to lvnew:
-.sp
-.B lvrename /dev/vg02/lvold vg02/lvnew
-.sp
-An alternate syntax to rename this logical volume is:
-.sp
-.B lvrename vg02 lvold lvnew
-.sp
-.SH SEE ALSO
-.BR lvm (8),
-.BR lvchange (8),
-.BR vgcreate (8),
-.BR vgrename (8)
diff --git a/man/lvresize.8.des b/man/lvresize.8.des
new file mode 100644
index 0000000..7fdcacc
--- /dev/null
+++ b/man/lvresize.8.des
@@ -0,0 +1,2 @@
+lvresize resizes an LV in the same way as lvextend and lvreduce. See
+\fBlvextend\fP(8) and \fBlvreduce\fP(8) for more information.
diff --git a/man/lvresize.8.end b/man/lvresize.8.end
new file mode 100644
index 0000000..a336d62
--- /dev/null
+++ b/man/lvresize.8.end
@@ -0,0 +1,6 @@
+.SH EXAMPLES
+
+Extend an LV by 16MB using specific physical extents:
+.br
+.B lvresize \-L+16M vg1/lv1 /dev/sda:0\-1 /dev/sdb:0\-1
+
diff --git a/man/lvresize.8.in b/man/lvresize.8.in
deleted file mode 100644
index 9cdb787..0000000
--- a/man/lvresize.8.in
+++ /dev/null
@@ -1,124 +0,0 @@
-.TH LVRESIZE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-lvresize \(em resize a logical volume
-.SH SYNOPSIS
-.B lvresize
-.RB [ \-\-alloc " " \fIAllocationPolicy ]
-.RB [ \-\-noudevsync ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-i | \-\-stripes " " \fIStripes
-.RB [ \-I | \-\-stripesize " " \fIStripeSize ]]
-.RB { \-l | \-\-extents
-.RI [ + | \- ] LogicalExtentsNumber [ % { VG | LV | PVS | FREE | ORIGIN "}] |"
-.BR \-L | \-\-size
-.RI [ + | \- ] LogicalVolumeSize [ bBsSkKmMgGtTpPeE ]}
-.RB [ \-\-poolmetadatasize
-.RI [ + ] MetadataVolumeSize [ bBsSkKmMgG ]]
-.RB [ \-f | \-\-force ]
-.RB [ \-n | \-\-nofsck ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-r | \-\-resizefs ]
-.IR LogicalVolume { Name | Path }
-.RI [ PhysicalVolumePath [ :PE [ \-PE ]]...]
-.SH DESCRIPTION
-lvresize allows you to resize a logical volume.
-Be careful when reducing a logical volume's size, because data in the reduced
-part is lost!!!
-You should therefore ensure that any filesystem on the volume is
-shrunk first so that the extents that are to be removed are not in use.
-Resizing snapshot logical volumes (see
-.BR lvcreate (8)
-for information about creating snapshots) is supported as well.
-But to change the number of copies in a mirrored logical
-volume use
-.BR lvconvert (8).
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-f ", " \-\-force
-Force resize without prompting even when it may cause data loss.
-.TP
-.BR \-n ", " \-\-nofsck
-Do not perform fsck before resizing filesystem when filesystem
-requires it. You may need to use \fB\-\-force\fR to proceed with
-this option.
-.TP
-.BR \-r ", " \-\-resizefs
-Resize underlying filesystem together with the logical volume using
-\fBfsadm\fR(8).
-.TP
-.IR \fB\-l ", " \fB\-\-extents " [" + | \- ] LogicalExtentsNumber [ % { VG | LV | PVS | FREE | ORIGIN }]
-Change or set the logical volume size in units of logical extents.
-With the \fI+\fP or \fI\-\fP 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 total number of physical extents affected will be
-greater than this if, for example, the volume is mirrored.
-The number can also be expressed as a percentage of the total space
-in the Volume Group with the suffix \fI%VG\fP, relative to the existing
-size of the Logical Volume with the suffix \fI%LV\fP, as a percentage of
-the remaining free space of the PhysicalVolumes on the command line with the
-suffix \fI%PVS\fP, as a percentage of the remaining free space in the
-Volume Group with the suffix \fI%FREE\fP, or (for a snapshot) as a percentage
-of the total space in the Origin Logical Volume with the suffix \fI%ORIGIN\fP.
-The resulting value is rounded downward for the subtraction otherwise
-it is rounded upward.
-N.B. In a future release, when expressed as a percentage with PVS, VG or FREE,
-the number will be treated as an approximate total number of physical extents
-to be allocated or freed (including extents used by any mirrors, for example).
-The code may currently allocate or remove more space than you might otherwise
-expect.
-.TP
-.IR \fB\-L ", " \fB\-\-size " [" + | \- ] LogicalVolumeSize [ bBsSkKmMgGtTpPeE ]
-Change or set the logical volume size in units of megabytes.
-A size suffix of \fIM\fP for megabytes,
-\fIG\fP for gigabytes, \fIT\fP for terabytes, \fIP\fP for petabytes
-or \fIE\fP for exabytes is optional.
-With the \fI+\fP or \fI\-\fP sign the value is added or subtracted
-from the actual size of the logical volume and rounded
-to the full extent size and without it,
-the value is taken as an absolute one.
-.TP
-.BR \-i ", " \-\-stripes " " \fIStripes
-Gives the number of stripes to use when extending a Logical Volume.
-Defaults to whatever the last segment of the Logical Volume uses.
-Not applicable to LVs using the original metadata LVM format, which must
-use a single value throughout.
-.TP
-.IR \fB\-\-poolmetadatasize " [" + ] MetadataVolumeSize [ bBsSkKmMgG ]
-Change or set the thin pool metadata logical volume size.
-With the \fI+\fP sign the value is added to the actual size
-of the metadata volume and rounded to the full extent size
-and without it, the value is taken as an absolute one.
-Maximal size is 16GiB. Default unit is megabytes.
-.TP
-.BR \-I ", " \-\-stripesize " " \fIStripeSize
-Gives the number of kilobytes for the granularity of the stripes.
-Defaults to whatever the last segment of the Logical Volume uses.
-Not applicable to LVs using the original metadata LVM format, which
-must use a single value throughout.
-.br
-StripeSize must be 2^n (n = 2 to 9) for metadata in LVM1 format.
-For metadata in LVM2 format, the stripe size may be a larger
-power of 2 but must not exceed the physical extent size.
-.TP
-.B \-\-noudevsync
-Disable udev synchronisation. The
-process will not wait for notification from udev.
-It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running
-or has rules that ignore the devices LVM2 creates.
-.SH EXAMPLES
-.br
-Extend a logical volume vg1/lv1 by 16MB using physical extents
-/dev/sda:0\-1 and /dev/sdb:0\-1 for allocation of extents:
-.sp
-.B lvresize \-L+16M vg1/lv1 /dev/sda:0\-1 /dev/sdb:0\-1
-.SH SEE ALSO
-.BR fsadm (8),
-.BR lvm (8),
-.BR lvconvert (8),
-.BR lvcreate (8),
-.BR lvreduce (8),
-.BR lvchange (8)
diff --git a/man/lvs.8.des b/man/lvs.8.des
new file mode 100644
index 0000000..5f80764
--- /dev/null
+++ b/man/lvs.8.des
@@ -0,0 +1 @@
+lvs produces formatted output about LVs.
diff --git a/man/lvs.8.end b/man/lvs.8.end
new file mode 100644
index 0000000..d71f7c1
--- /dev/null
+++ b/man/lvs.8.end
@@ -0,0 +1,75 @@
+.SH NOTES
+.
+The lv_attr bits are:
+.IP 1 3
+Volume type: (C)ache, (m)irrored, (M)irrored without initial sync, (o)rigin,
+(O)rigin with merging snapshot, (r)aid, (R)aid without initial sync,
+(s)napshot, merging (S)napshot, (p)vmove, (v)irtual,
+mirror or raid (i)mage, mirror or raid (I)mage out-of-sync, mirror (l)og device,
+under (c)onversion, thin (V)olume, (t)hin pool, (T)hin pool data, raid or
+pool m(e)tadata or pool metadata spare.
+.IP 2 3
+Permissions: (w)riteable, (r)ead-only, (R)ead-only activation of non-read-only
+volume
+.IP 3 3
+Allocation policy: (a)nywhere, (c)ontiguous, (i)nherited, c(l)ing, (n)ormal
+This is capitalised if the volume is currently locked against allocation
+changes, for example during
+.BR pvmove (8).
+.IP 4 3
+fixed (m)inor
+.IP 5 3
+State: (a)ctive, (h)istorical, (s)uspended, (I)nvalid snapshot,
+invalid (S)uspended snapshot, snapshot (m)erge failed,
+suspended snapshot (M)erge failed, mapped (d)evice present without tables,
+mapped device present with (i)nactive table, thin-pool (c)heck needed,
+suspended thin-pool (C)heck needed, (X) unknown
+.IP 6 3
+device (o)pen, (X) unknown
+.IP 7 3
+Target type: (C)ache, (m)irror, (r)aid, (s)napshot, (t)hin, (u)nknown, (v)irtual.
+This groups logical volumes related to the same kernel target together. So,
+for example, mirror images, mirror logs as well as mirrors themselves appear as
+(m) if they use the original device-mapper mirror kernel driver; whereas the raid
+equivalents using the md raid kernel driver all appear as (r).
+Snapshots using the original device-mapper driver appear as (s); whereas
+snapshots of thin volumes using the new thin provisioning driver appear as (t).
+.IP 8 3
+Newly-allocated data blocks are overwritten with blocks of (z)eroes before use.
+.IP 9 3
+Volume Health, where there are currently three groups of attributes identified:
+.IP
+Common ones for all Logical Volumes: (p)artial, (X) unknown.
+.br
+(p)artial signifies that one or more of the Physical Volumes this Logical
+Volume uses is missing from the system. (X) unknown signifies the status
+is unknown.
+.IP
+Related to RAID Logical Volumes: (r)efresh needed, (m)ismatches exist, (w)ritemostly.
+.br
+(r)efresh signifies that one or more of the Physical Volumes this RAID Logical
+Volume uses had suffered a write error. The write error could be due to a
+temporary failure of that Physical Volume or an indication that it is failing.
+The device should be refreshed or replaced. (m)ismatches signifies that the
+RAID logical volume has portions of the array that are not coherent.
+Inconsistencies are detected by initiating a "check" on a RAID logical volume.
+(The scrubbing operations, "check" and "repair", can be performed on a RAID
+logical volume via the 'lvchange' command.) (w)ritemostly signifies the
+devices in a RAID 1 logical volume that have been marked write-mostly.
+.IP
+Related to Thin pool Logical Volumes: (F)ailed, out of (D)ata space,
+(M)etadata read only.
+.br
+(F)ailed is set if thin pool encounters serious failures and hence no further I/O
+is permitted at all. The out of (D)ata space is set if thin pool has run out of
+data space. (M)etadata read only signifies that thin pool encounters certain
+types of failures but it's still possible to do reads at least,
+but no metadata changes are allowed.
+.IP
+Related to Thin Logical Volumes: (F)ailed.
+.br
+(F)ailed is set when related thin pool enters Failed state and no further I/O
+is permitted at all.
+.IP 10 3
+s(k)ip activation: this volume is flagged to be skipped during activation.
+
diff --git a/man/lvs.8.in b/man/lvs.8.in
deleted file mode 100644
index 48ef866..0000000
--- a/man/lvs.8.in
+++ /dev/null
@@ -1,290 +0,0 @@
-.TH LVS 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-lvs \(em report information about logical volumes
-.SH SYNOPSIS
-.B lvs
-.RB [ \-\-aligned ]
-.RB [ \-\-binary ]
-.RB [ \-a | \-\-all ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [[ \-\-configreport
-.IR ReportName ]
-.RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field1 [, Field2 ...]
-.RB [ \-O | \-\-sort
-.RI [ + | \- ] Key1 [, Key2 ...]]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB ...]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-H | \-\-history ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-ignoreskippedcluster ]
-.RB [ \-\-logonly ]
-.RB [ \-\-nameprefixes ]
-.RB [ \-\-noheadings ]
-.RB [ \-\-nosuffix ]
-.RI [ + | \- ] Key1 [,[ + | \- ] Key2 [,...]]]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-rows ]
-.RB [ \-\-separator
-.IR Separator ]
-.RB [ \-\-segments ]
-.RB [ \-\-unbuffered ]
-.RB [ \-\-units
-.IR hHbBsSkKmMgGtTpPeE ]
-.RB [ \-\-unquoted ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RI [ VolumeGroupName | LogicalVolume { Name | Path }
-.RI [ VolumeGroupName | LogicalVolume { Name | Path }\ ...]]
-
-.SH DESCRIPTION
-lvs produces formatted output about logical volumes.
-.SH OPTIONS
-See
-.BR lvm (8)
-for common options.
-.TP
-.B \-\-aligned
-Use with \fB\-\-separator\fP to align the output columns.
-.TP
-.B \-\-all
-Include information in the output about internal Logical Volumes that
-are components of normally-accessible Logical Volumes, such as mirrors,
-but which are not independently accessible (e.g. not mountable).
-The names of such Logical Volumes are enclosed within square brackets
-in the output. For example, after creating a mirror using
-.B lvcreate -m1 \-\-mirrorlog disk
-, this option will reveal three internal Logical
-Volumes, with suffixes mimage_0, mimage_1, and mlog.
-.TP
-.B \-\-binary
-Use binary values "0" or "1" instead of descriptive literal values
-for columns that have exactly two valid values to report (not counting
-the "unknown" value which denotes that the value could not be determined).
-.TP
-.B \-\-configreport \fI ReportName
-Make any subsequent \fB\-o, \-\-options\fP, \fB\-O, \-\-sort\fP or
-\fB\-S, \-\-select\fP to apply for \fIReportName\fP where \fIReportName\fP
-is either 'lv' for command's main report or 'log' for log report.
-If \fB\-\-configreport\fP option is not used to identify a report, then
-command's main report is assumed. The log report is available only if
-enabled by \fBlog/report_command_log\fP \fBlvm.conf\fP(5) setting or
-if \fB\-\-logonly\fP option is used.
-.TP
-.B \-H ", " \-\-history
-Include historical logical volumes in the output.
-(This has no effect unless logical volumes were removed while the configuration
-setting \fBmetadata/record_lvs_history\fP was enabled.)
-.TP
-.B \-\-logonly
-Suppress the lvs report itself and display only log report on output.
-.TP
-.B \-\-nameprefixes
-Add an "LVM2_" prefix plus the field name to the output. Useful
-with \fB\-\-noheadings\fP to produce a list of field=value pairs that can
-be used to set environment variables (for example, in
-.BR udev (7)
-rules).
-.TP
-.B \-\-noheadings
-Suppress the headings line that is normally the first line of output.
-Useful if grepping the output.
-.TP
-.B \-\-nosuffix
-Suppress the suffix on output sizes. Use with \fB\-\-units\fP
-(except h and H) if processing the output.
-.TP
-.BR \-o ", " \-\-options
-Comma-separated ordered list of columns.
-.IP
-Precede the list with '\fI+\fP' to append to the current list
-of columns, '\fI-\fP' to remove from the current list of columns
-or '\fI#\fP' to compact given columns. The \fI\-o\fP option can
-be repeated, providing several lists. These lists are evaluated
-from left to right.
-.IP
-Use \fB\-o lv_all\fP to select all logical volume columns,
-and \fB\-o seg_all\fP
-to select all logical volume segment columns.
-.IP
-Use \fB\-o help\fP to view the full list of columns available.
-.IP
-Column names include:
-chunk_size,
-convert_lv,
-copy_percent,
-data_lv,
-devices,
-discards,
-lv_attr,
-lv_host,
-lv_kernel_major,
-lv_kernel_minor,
-lv_kernel_read_ahead,
-lv_major,
-lv_minor,
-lv_name,
-lv_path,
-lv_profile,
-lv_read_ahead,
-lv_size,
-lv_tags,
-lv_time,
-lv_uuid,
-metadata_lv,
-mirror_log,
-modules,
-move_pv,
-origin,
-origin_size,
-pool_lv,
-raid_max_recovery_rate,
-raid_min_recovery_rate,
-raid_mismatch_count,
-raid_sync_action,
-raid_write_behind,
-region_size,
-segtype,
-seg_count,
-seg_pe_ranges,
-seg_size,
-seg_size_pe,
-seg_start,
-seg_start_pe,
-seg_tags,
-snap_percent,
-stripes,
-stripe_size,
-sync_percent,
-thin_count,
-transaction_id,
-zero.
-.IP
-With \fB\-\-segments\fP, any "seg_" prefixes are optional;
-otherwise any "lv_" prefixes are optional. Columns mentioned in
-.BR vgs (8)
-can also be chosen.
-.IP
-The lv_attr bits are:
-.RS
-.IP 1 3
-Volume type: (C)ache, (m)irrored, (M)irrored without initial sync, (o)rigin,
-(O)rigin with merging snapshot, (r)aid, (R)aid without initial sync,
-(s)napshot, merging (S)napshot, (p)vmove, (v)irtual,
-mirror or raid (i)mage, mirror or raid (I)mage out-of-sync, mirror (l)og device,
-under (c)onversion, thin (V)olume, (t)hin pool, (T)hin pool data, raid or
-pool m(e)tadata or pool metadata spare.
-.IP 2 3
-Permissions: (w)riteable, (r)ead-only, (R)ead-only activation of non-read-only
-volume
-.IP 3 3
-Allocation policy: (a)nywhere, (c)ontiguous, (i)nherited, c(l)ing, (n)ormal
-This is capitalised if the volume is currently locked against allocation
-changes, for example during
-.BR pvmove (8).
-.IP 4 3
-fixed (m)inor
-.IP 5 3
-State: (a)ctive, (h)istorical, (s)uspended, (I)nvalid snapshot,
-invalid (S)uspended snapshot, snapshot (m)erge failed,
-suspended snapshot (M)erge failed, mapped (d)evice present without tables,
-mapped device present with (i)nactive table, thin-pool (c)heck needed,
-suspended thin-pool (C)heck needed, (X) unknown
-.IP 6 3
-device (o)pen, (X) unknown
-.IP 7 3
-Target type: (C)ache, (m)irror, (r)aid, (s)napshot, (t)hin, (u)nknown, (v)irtual.
-This groups logical volumes related to the same kernel target together. So,
-for example, mirror images, mirror logs as well as mirrors themselves appear as
-(m) if they use the original device-mapper mirror kernel driver; whereas the raid
-equivalents using the md raid kernel driver all appear as (r).
-Snapshots using the original device-mapper driver appear as (s); whereas
-snapshots of thin volumes using the new thin provisioning driver appear as (t).
-.IP 8 3
-Newly-allocated data blocks are overwritten with blocks of (z)eroes before use.
-.IP 9 3
-Volume Health, where there are currently three groups of attributes identified:
-.IP
-Common ones for all Logical Volumes: (p)artial, (X) unknown.
-.br
-(p)artial signifies that one or more of the Physical Volumes this Logical
-Volume uses is missing from the system. (X) unknown signifies the status
-is unknown.
-.IP
-Related to RAID Logical Volumes: (r)efresh needed, (m)ismatches exist, (w)ritemostly.
-.br
-(r)efresh signifies that one or more of the Physical Volumes this RAID Logical
-Volume uses had suffered a write error. The write error could be due to a
-temporary failure of that Physical Volume or an indication that it is failing.
-The device should be refreshed or replaced. (m)ismatches signifies that the
-RAID logical volume has portions of the array that are not coherent.
-Inconsistencies are detected by initiating a "check" on a RAID logical volume.
-(The scrubbing operations, "check" and "repair", can be performed on a RAID
-logical volume via the 'lvchange' command.) (w)ritemostly signifies the
-devices in a RAID 1 logical volume that have been marked write-mostly.
-.IP
-Related to Thin pool Logical Volumes: (F)ailed, out of (D)ata space,
-(M)etadata read only.
-.br
-(F)ailed is set if thin pool encounters serious failures and hence no further I/O
-is permitted at all. The out of (D)ata space is set if thin pool has run out of
-data space. (M)etadata read only signifies that thin pool encounters certain
-types of failures but it's still possible to do reads at least,
-but no metadata changes are allowed.
-.IP
-Related to Thin Logical Volumes: (F)ailed.
-.br
-(F)ailed is set when related thin pool enters Failed state and no further I/O
-is permitted at all.
-.IP 10 3
-s(k)ip activation: this volume is flagged to be skipped during activation.
-.RE
-.TP
-.BR \-O ", " \-\-sort
-Comma-separated ordered list of columns to sort by. Replaces the default
-selection. Precede any column with '\fI\-\fP' for a reverse sort on that column.
-.TP
-.B \-\-rows
-Output columns as rows.
-.TP
-.BR \-S ", " \-\-select " " \fISelection
-Display only rows that match Selection criteria. All rows are displayed with
-the additional "selected" column (\fB-o selected\fP) showing 1 if the row
-matches the Selection and 0 otherwise. The Selection criteria are defined
-by specifying column names and their valid values (that can include reserved
-values) while making use of supported comparison operators. See \fBlvm\fP(8)
-and \fB\-S\fP, \fB\-\-select\fP description for more detailed information
-about constructing the Selection criteria. As a quick help and to see full
-list of column names that can be used in Selection including the list of
-reserved values and the set of supported selection operators, check the
-output of \fBlvs -S help\fP command.
-.TP
-.B \-\-segments
-Use default columns that emphasize segment information.
-.TP
-.B \-\-separator \fISeparator
-String to use to separate each column. Useful if grepping the output.
-.TP
-.B \-\-unbuffered
-Produce output immediately without sorting or aligning the columns properly.
-.TP
-.B \-\-units \fIhHbBsSkKmMgGtTpPeE
-All sizes are output in these units: (h)uman-readable, (b)ytes, (s)ectors,
-(k)ilobytes, (m)egabytes, (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
-Capitalise to use multiples of 1000 (S.I.) instead of 1024. Can also specify
-custom units e.g. \fB\-\-units 3M\fP
-.TP
-.B \-\-unquoted
-When used with \fB\-\-nameprefixes\fP, output values in the field=value
-pairs are not quoted.
-.SH SEE ALSO
-.BR lvm (8),
-.BR lvdisplay (8),
-.BR pvs (8),
-.BR vgs (8)
diff --git a/man/lvscan.8.des b/man/lvscan.8.des
new file mode 100644
index 0000000..e30eb58
--- /dev/null
+++ b/man/lvscan.8.des
@@ -0,0 +1,5 @@
+lvscan scans all VGs or all supported LVM block devices in the system for
+LVs. The output consists of one line for each LV indicating whether or not
+it is active, a snapshot or origin, the size of the device and its
+allocation policy. Use \fBlvs\fP(8) or \fBlvdisplay\fP(8) to obtain more
+comprehensive information about LVs.
diff --git a/man/lvscan.8.in b/man/lvscan.8.in
deleted file mode 100644
index 5710e3c..0000000
--- a/man/lvscan.8.in
+++ /dev/null
@@ -1,52 +0,0 @@
-.TH LVSCAN 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-lvscan \(em scan (all disks) for Logical Volumes
-.SH SYNOPSIS
-.B lvscan
-.RB [ \-a | \-\-all]
-.RB [ \-b | \-\-blockdevice ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-v | \-\-verbose ]
-.SH DESCRIPTION
-lvscan scans all known volume groups or all supported LVM block devices
-in the system for defined Logical Volumes. The output consists
-of one line for each Logical Volume indicating whether or not it is active,
-a snapshot or origin, the size of the device and its allocation policy.
-Use \fBlvs\fP(8) or \fBlvdisplay\fP(8) to obtain more-comprehensive
-information about the Logical Volumes.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-\-all
-Include information in the output about internal Logical Volumes that
-are components of normally-accessible Logical Volumes, such as mirrors,
-but which are not independently accessible (e.g. not mountable).
-For example, after creating a mirror using
-.B lvcreate \-m1 \-\-mirrorlog disk\fR,
-this option will reveal three internal Logical Volumes, with suffixes
-mimage_0, mimage_1, and mlog.
-.TP
-.BR \-b ", " \-\-blockdevice
-This option is now ignored. Instead, use \fBlvs\fP(8) or
-\fBlvdisplay\fP(8) to obtain the device number.
-.TP
-.IR \fB\-\-cache " " LogicalVolume
-Applicable only when \fBlvmetad\fP(8) is in use (see also \fBlvm.conf\fP(5),
-global/use_lvmetad). This command issues a rescan of physical volume labels and
-metadata areas of all PVs that the logical volume uses. In particular, this can
-be used when a RAID logical volume becomes degraded, to update information
-about physical volume availability. This is only necessary if the logical
-volume is \fBnot\fP being monitored by dmeventd (see \fBlvchange\fP(8), option
-\fB\-\-monitor\fP).
-.SH SEE ALSO
-.BR lvm (8),
-.BR lvcreate (8),
-.BR lvdisplay (8)
-.BR lvs (8)
diff --git a/man/pvchange.8.des b/man/pvchange.8.des
new file mode 100644
index 0000000..802850f
--- /dev/null
+++ b/man/pvchange.8.des
@@ -0,0 +1 @@
+pvchange changes PV attributes in the VG.
diff --git a/man/pvchange.8.end b/man/pvchange.8.end
new file mode 100644
index 0000000..a524d07
--- /dev/null
+++ b/man/pvchange.8.end
@@ -0,0 +1,6 @@
+.SH EXAMPLES
+
+Disallow the allocation of physical extents on a PV (e.g. because of
+disk errors, or because it will be removed after freeing it).
+.br
+.B pvchange \-x n /dev/sdk1
diff --git a/man/pvchange.8.in b/man/pvchange.8.in
deleted file mode 100644
index c7ddc58..0000000
--- a/man/pvchange.8.in
+++ /dev/null
@@ -1,59 +0,0 @@
-.TH PVCHANGE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-pvchange \(em change attributes of a physical volume
-.SH SYNOPSIS
-.B pvchange
-.RB [ \-\-addtag
-.IR Tag ]
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-f | \-\-force ]
-.RB [ \-\-deltag
-.IR Tag ]
-.RB [ \-\-metadataignore
-.RI { y | n }]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-a | \-\-all ]
-.RB [ \-x | \-\-allocatable
-.RI { y | n }]
-.RB [ \-u | \-\-uuid ]
-.RI [ PhysicalVolumePath ...]
-.SH DESCRIPTION
-pvchange allows you to change the allocation permissions of one or
-more physical volumes.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-a ", " \-\-all
-If PhysicalVolumePath is not specified on the command line all
-physical volumes are searched for and used.
-.TP
-.BR \-\-metadataignore " {" \fIy | \fIn }
-Ignore or un-ignore metadata areas on this physical volume.
-If metadata areas on a physical volume are ignored, LVM will
-not not store metadata in the metadata areas present on this Physical
-Volume.
-.TP
-.BR \-u ", " \-\-uuid
-Generate new random UUID for specified physical volumes.
-.TP
-.BR \-x ", " \-\-allocatable " {" \fIy | \fIn }
-Enable or disable allocation of physical extents on this physical volume.
-.SH Example
-Disallows the allocation of physical extents on this physical volume
-(possibly because of disk errors, or because it will be removed after
-freeing it:
-.sp
-.B pvchange \-x n /dev/sdk1
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvcreate (8)
diff --git a/man/pvck.8.des b/man/pvck.8.des
new file mode 100644
index 0000000..0a32657
--- /dev/null
+++ b/man/pvck.8.des
@@ -0,0 +1 @@
+pvck checks the LVM metadata for consistency on PVs.
diff --git a/man/pvck.8.end b/man/pvck.8.end
new file mode 100644
index 0000000..67af238
--- /dev/null
+++ b/man/pvck.8.end
@@ -0,0 +1,8 @@
+.SH EXAMPLES
+
+If the partition table is corrupted or lost on /dev/sda, and you suspect
+there was an LVM partition at approximately 100 MiB, then this
+area of the disk can be scanned using the \fB\-\-labelsector\fP
+parameter with a value of 204800 (100 * 1024 * 1024 / 512 = 204800).
+.br
+.B pvck \-\-labelsector 204800 /dev/sda
diff --git a/man/pvck.8.in b/man/pvck.8.in
deleted file mode 100644
index 368dc06..0000000
--- a/man/pvck.8.in
+++ /dev/null
@@ -1,37 +0,0 @@
-.TH PVCK 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-pvck \(em check physical volume metadata
-.SH SYNOPSIS
-.B pvck
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-labelsector
-.IR sector ]
-.I PhysicalVolume
-.RI [ PhysicalVolume ...]
-.SH DESCRIPTION
-pvck checks physical volume LVM metadata for consistency.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.B \-\-labelsector \fIsector
-By default, 4 sectors of \fBPhysicalVolume\fP are scanned for an LVM label,
-starting at sector 0. This parameter allows you to specify a different
-starting sector for the scan and is useful for recovery situations. For
-example, suppose the partition table is corrupted or lost on /dev/sda,
-but you suspect there was an LVM partition at approximately 100 MiB. This
-area of the disk may be scanned by using the \fB\-\-labelsector\fP parameter
-with a value of 204800 (100 * 1024 * 1024 / 512 = 204800):
-.sp
-.B pvck \-\-labelsector 204800 /dev/sda
-.sp
-Note that a script can be used with \fB\-\-labelsector\fP to automate the
-process of finding LVM labels.
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvcreate (8),
-.BR pvscan (8)
-.BR vgck (8)
diff --git a/man/pvcreate.8.des b/man/pvcreate.8.des
new file mode 100644
index 0000000..3dfddbc
--- /dev/null
+++ b/man/pvcreate.8.des
@@ -0,0 +1,18 @@
+pvcreate initializes a PV so that it is recognized as belonging to LVM,
+and allows the PV to be used in a VG. A PV can be a disk partition, whole
+disk, meta device, or loopback file.
+
+For DOS disk partitions, the partition id should be set to 0x8e using
+.BR fdisk (8),
+.BR cfdisk (8),
+or a equivalent. For GUID Partition Table (GPT), the id is
+E6D6D379-F507-44C2-A23C-238F2A3DF928. For
+whole disk devices only
+the partition table must be erased, which will effectively destroy all
+data on that disk. This can be done by zeroing the first sector with:
+
+.BI "dd if=/dev/zero of=" PhysicalVolume " bs=512 count=1"
+
+Use \fBvgcreate\fP(8) to create a new VG on the PV, or \fBvgextend\fP(8)
+to add the PV to existing VG.
+
diff --git a/man/pvcreate.8.end b/man/pvcreate.8.end
new file mode 100644
index 0000000..b1b0f3e
--- /dev/null
+++ b/man/pvcreate.8.end
@@ -0,0 +1,13 @@
+.SH EXAMPLES
+
+Initialize a partition and a full device.
+.br
+.B pvcreate /dev/sdc4 /dev/sde
+
+If a device is a 4KiB sector drive that compensates for windows
+partitioning (sector 7 is the lowest aligned logical block, the 4KiB
+sectors start at LBA -1, and consequently sector 63 is aligned on a 4KiB
+boundary) manually account for this when initializing for use by LVM.
+.br
+.B pvcreate \-\-dataalignmentoffset 7s /dev/sdb
+
diff --git a/man/pvcreate.8.in b/man/pvcreate.8.in
deleted file mode 100644
index 97a9909..0000000
--- a/man/pvcreate.8.in
+++ /dev/null
@@ -1,210 +0,0 @@
-.TH PVCREATE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-pvcreate \(em initialize a disk or partition for use by LVM
-.SH SYNOPSIS
-.B pvcreate
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RB [ \-f [ f ]| \-\-force
-.RB [ \-\-force ]]
-.RB [ \-y | \-\-yes ]
-.RB [ \-\-labelsector ]
-.RB [ \-\-bootloaderareasize
-.IR size ]
-.RB [ \-M | \-\-metadatatype
-.IR type ]
-.RB [ \-\- [ pv ] metadatacopies
-.IR NumberOfCopies ]
-.RB [ \-\-metadatasize
-.IR size ]
-.RB [ \-\-metadataignore
-.RI { y | n }]
-.RB [ \-\-dataalignment
-.IR alignment ]
-.RB [ \-\-dataalignmentoffset
-.IR alignment_offset ]
-.RB [ \-\-restorefile
-.IR file ]
-.RB [ \-\-norestorefile ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-setphysicalvolumesize
-.IR size ]
-.RB [ \-u | \-\-uuid
-.IR uuid ]
-.RB [ \-Z | \-\-zero
-.RI { y | n }]
-.I PhysicalVolume
-.RI [ PhysicalVolume ...]
-.SH DESCRIPTION
-pvcreate initializes
-.I PhysicalVolume
-for later use by the Logical Volume Manager (LVM). Each
-.I PhysicalVolume
-can be a disk partition, whole disk, meta device, or loopback file.
-For DOS disk partitions, the partition id should be set to 0x8e using
-.BR fdisk (8),
-.BR cfdisk (8),
-or a equivalent. For GUID Partition Table (GPT), the id is
-E6D6D379-F507-44C2-A23C-238F2A3DF928. For
-.B whole disk devices only
-the partition table must be erased, which will effectively destroy all
-data on that disk. This can be done by zeroing the first sector with:
-.sp
-.BI "dd if=/dev/zero of=" PhysicalVolume " bs=512 count=1"
-.sp
-Continue with
-.BR vgcreate (8)
-to create a new volume group on
-.IR PhysicalVolume ,
-or
-.BR vgextend (8)
-to add
-.I PhysicalVolume
-to an existing volume group.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-f ", " \-\-force
-Force the creation without any confirmation. You can not recreate
-(reinitialize) a physical volume belonging to an existing volume group.
-In an emergency you can override this behaviour with \fB-ff\fP.
-.TP
-.BR \-u ", " \-\-uuid " " \fIuuid
-Specify the uuid for the device.
-Without this option, \fBpvcreate\fP(8) generates a random uuid.
-All of your physical volumes must have unique uuids.
-You need to use this option before restoring a backup of LVM metadata
-onto a replacement device - see \fBvgcfgrestore\fP(8). As such, use of
-\fB\-\-restorefile\fP is compulsory unless the \fB\-\-norestorefile\fP is
-used.
-.TP
-.BR \-y ", " \-\-yes
-Answer yes to all questions.
-.TP
-.BR \-Z ", " \-\-zero " {" \fIy | \fIn }
-Whether or not the first 4 sectors (2048 bytes) of the device should be
-wiped.
-If this option is not given, the
-default is to wipe these sectors unless either or both of the
-\fB\-\-restorefile\fP or \fB\-\-uuid\fP options were specified.
-.SH NEW METADATA OPTIONS
-LVM2 introduces a new format for storing metadata on disk.
-This new format is more efficient and resilient than the format the
-original version of LVM used and offers the advanced user greater
-flexibility and control.
-.P
-The new format may be selected on the command line with \fB\-M2\fP or by
-setting \fBformat = "lvm2"\fP in the \fBglobal\fP section of \fBlvm.conf\fP(5).
-Each physical volume in the same volume group must use the same format, but
-different volume groups on a machine may use different formats
-simultaneously: the tools can handle both formats.
-Additional formats can be added as shared libraries.
-.P
-Additional tools for manipulating the locations and sizes of metadata areas
-will be written in due course. Use the verbose/debug options on the tools
-to see where the metadata areas are placed.
-.TP
-.B \-\-metadatasize \fIsize
-The approximate amount of space to be set aside for each metadata area.
-(The size you specify may get rounded.)
-.TP
-.B \-\-dataalignment \fIalignment
-Align the start of the data to a multiple of this number.
-You should also specify an appropriate \fIPhysicalExtentSize\fP when creating
-the Volume Group with \fBvgcreate\fP.
-.sp
-To see the location of the first Physical Extent of an existing Physical Volume
-use \fBpvs \-o +pe_start\fP . It will be a multiple of the requested
-alignment. In addition it may be shifted by \fIalignment_offset\fP from
-\fIdata_alignment_offset_detection\fP (if enabled in \fBlvm.conf\fP(5)) or
-\fB\-\-dataalignmentoffset\fP.
-.TP
-.B \-\-dataalignmentoffset \fIalignment_offset
-Shift the start of the data area by this additional \fIalignment_offset\fP.
-.TP
-.BR \-\- [ pv ] metadatacopies " " \fINumberOfCopies
-The number of metadata areas to set aside on each PV. Currently
-this can be 0, 1 or 2.
-If set to 2, two copies of the volume group metadata
-are held on the PV, one at the front of the PV and one at the end.
-If set to 1 (the default), one copy is kept at the front of the PV
-(starting in the 5th sector).
-If set to 0, no copies are kept on this PV - you might wish to use this
-with VGs containing large numbers of PVs. But if you do this and
-then later use \fBvgsplit\fP(8) you must ensure that each VG is still going
-to have a suitable number of copies of the metadata after the split!
-.TP
-.BR \-\-metadataignore " {" \fIy | \fIn }
-Ignore or un-ignore metadata areas on this physical volume.
-The default is "n". This setting can be changed with \fBpvchange\fP.
-If metadata areas on a physical volume are ignored, LVM will
-not store metadata in the metadata areas present on this Physical
-Volume. Metadata areas cannot be created or extended after Logical
-Volumes have been allocated on the device. If you do not want to store
-metadata on this device, it is still wise always to allocate a metadata
-area in case you need it in the future and to use this option to instruct
-LVM2 to ignore it.
-.TP
-.B \-\-restorefile \fIfile
-In conjunction with \fB\-\-uuid\fP, this extracts the location and size
-of the data on the PV from the file (produced by \fBvgcfgbackup\fP)
-and ensures that the metadata that the program produces is consistent
-with the contents of the file i.e. the physical extents will be in
-the same place and not get overwritten by new metadata. This provides
-a mechanism to upgrade the metadata format or to add/remove metadata
-areas. Use with care. See also \fBvgconvert\fP(8).
-.TP
-.B \-\-norestorefile
-In conjunction with \fB\-\-uuid\fP, this allows a \fIuuid\fP to be specified
-without also requiring that a backup of the metadata be provided.
-.TP
-.B \-\-labelsector \fIsector
-By default the PV is labelled with an LVM2 identifier in its second
-sector (sector 1). This lets you use a different sector near the
-start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS
-in the source). Use with care.
-.TP
-.B \-\-bootloaderareasize \fIsize
-Create a separate bootloader area of specified size besides PV's data
-area. The bootloader area is an area of reserved space on the PV from
-which LVM2 will not allocate any extents and it's kept untouched. This is
-primarily aimed for use with bootloaders to embed their own data or metadata.
-The start of the bootloader area is always aligned, see also \fB\-\-dataalignment\fP
-and \fB\-\-dataalignmentoffset\fP. The bootloader area size may eventually
-end up increased due to the alignment, but it's never less than the
-size that is requested. To see the bootloader area start and size of
-an existing Physical Volume use \fBpvs \-o +pv_ba_start,pv_ba_size\fP.
-.TP
-.B \-\-setphysicalvolumesize \fIsize
-Overrides the automatically-detected size of the PV. Use with care.
-.SH Examples
-Initialize partition #4 on the third SCSI disk and the entire fifth
-SCSI disk for later use by LVM:
-.sp
-.B pvcreate /dev/sdc4 /dev/sde
-
-If the 2nd SCSI disk is a 4KiB sector drive that compensates for windows
-partitioning (sector 7 is the lowest aligned logical block, the 4KiB
-sectors start at LBA -1, and consequently sector 63 is aligned on a 4KiB
-boundary) manually account for this when initializing for use by LVM:
-.sp
-.B pvcreate \-\-dataalignmentoffset 7s /dev/sdb
-
-.SH SEE ALSO
-.BR lvm.conf (5),
-.BR lvm (8),
-.BR vgcreate (8),
-.BR vgextend (8),
-.BR lvcreate (8),
-.BR cfdisk (8),
-.BR fdisk (8),
-.BR losetup (8),
-.BR mdadm (8),
-.BR vgcfgrestore (8),
-.BR vgconvert (8)
diff --git a/man/pvdisplay.8.des b/man/pvdisplay.8.des
new file mode 100644
index 0000000..74d57ca
--- /dev/null
+++ b/man/pvdisplay.8.des
@@ -0,0 +1,5 @@
+pvdisplay shows the attributes of PVs, like size, physical extent size,
+space used for the VG descriptor area, etc.
+
+\fBpvs\fP(8) is a preferred alternative that shows the same information
+and more, using a more compact and configurable output format.
diff --git a/man/pvdisplay.8.in b/man/pvdisplay.8.in
deleted file mode 100644
index 9bca720..0000000
--- a/man/pvdisplay.8.in
+++ /dev/null
@@ -1,109 +0,0 @@
-.TH PVDISPLAY 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-pvdisplay \- display attributes of a physical volume
-.SH SYNOPSIS
-.B pvdisplay
-.RB [ \-c | \-\-colon ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-ignoreskippedcluster ]
-.RB [ \-\-maps ]
-.RB [ \-\-nosuffix ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-s | \-\-short ]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB [ \-\-units
-.IR hsbkmgtHKMGT ]
-.RB [ \-v [ v ]| \-\-verbose
-.RB [ \-\-verbose ]]
-.RB [ \-\-version ]
-.RI [ PhysicalVolumePath ...]
-.br
-
-.br
-.B pvdisplay
-.BR \-C | \-\-columns
-.RB [ \-\-aligned ]
-.RB [ \-\-binary ]
-.RB [ \-a | \-\-all ]
-.RB [ \-\-commandprofile
-.RB [[ \-\-configreport
-.IR ReportName ]
-.RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field1 [, Field2 ...]
-.RB [ \-O | \-\-sort
-.RI [ + | \- ] Key1 [, Key2 ...]]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB ...]
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-logonly ]
-.RB [ \-\-noheadings ]
-.RB [ \-\-nosuffix ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-separator
-.IR Separator ]
-.RB [ \-\-unbuffered ]
-.RB [ \-\-units
-.IR hHbBsSkKmMgGtTpPeE ]
-.RB [ \-v [ v ]| \-\-verbose
-.RB [ \-\-verbose ]]
-.RB [ \-\-version ]
-.RI [ PhysicalVolumePath ...]
-.SH DESCRIPTION
-pvdisplay allows you to see the attributes of one or more physical volumes
-like size, physical extent size, space used for the volume group descriptor
-area and so on.
-.P
-\fBpvs\fP(8) is an alternative that provides the same information
-in the style of \fBps\fP(1).
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-C ", " \-\-columns
-Display output in columns, the equivalent of \fBpvs\fP(8). See
-\fBpvs\fP(8) for a description of other options with this form of
-\fBpvdisplay\fP.
-.TP
-.BR \-c ", " \-\-colon
-Generate colon separated output for easier parsing in scripts or programs.
-N.B. \fBpvs\fP(8) provides considerably more control over the output.
-.nf
-
-The values are:
-
-\(bu physical volume device name
-\(bu volume group name
-\(bu physical volume size in sectors
-\(bu internal physical volume number (obsolete)
-\(bu physical volume status
-\(bu physical volume (not) allocatable
-\(bu current number of logical volumes on this physical volume
-\(bu physical extent size in kilobytes
-\(bu total number of physical extents
-\(bu free number of physical extents
-\(bu allocated number of physical extents
-
-.fi
-.TP
-.BR \-s ", " \-\-short
-Only display the size of the given physical volumes.
-.TP
-.BR \-m ", " \-\-maps
-Display the mapping of physical extents to logical volumes and
-logical extents.
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvs (8),
-.BR pvcreate (8),
-.BR lvcreate (8),
-.BR vgcreate (8)
diff --git a/man/pvmove.8.des b/man/pvmove.8.des
new file mode 100644
index 0000000..5286ef4
--- /dev/null
+++ b/man/pvmove.8.des
@@ -0,0 +1,61 @@
+pvmove moves the allocated physical extents (PEs) on a source PV to one or
+more destination PVs. You can optionally specify a source LV in which
+case only extents used by that LV will be moved to free (or specified)
+extents on the destination PV. If no destination PV is specified, the
+normal allocation rules for the VG are used.
+
+If pvmove is interrupted for any reason (e.g. the machine crashes) then
+run pvmove again without any PV arguments to restart any operations that
+were in progress from the last checkpoint. Alternatively, use the abort
+option at any time to abort the operation. The resulting location of LVs
+after an abort depends on whether the atomic option was used.
+
+More than one pvmove can run concurrently if they are moving data from
+different source PVs, but additional pvmoves will ignore any LVs already
+in the process of being changed, so some data might not get moved.
+
+pvmove works as follows:
+
+1. A temporary 'pvmove' LV is created to store details of all the data
+movements required.
+
+2. Every LV in the VG is searched for contiguous data that need moving
+according to the command line arguments.
+For each piece of data found, a new segment is added to the end of the
+pvmove LV.
+This segment takes the form of a temporary mirror to copy the data
+from the original location to a newly allocated location.
+The original LV is updated to use the new temporary mirror segment
+in the pvmove LV instead of accessing the data directly.
+
+3. The VG metadata is updated on disk.
+
+4. The first segment of the pvmove LV is activated and starts to mirror
+the first part of the data. Only one segment is mirrored at once as this
+is usually more efficient.
+
+5. A daemon repeatedly checks progress at the specified time interval.
+When it detects that the first temporary mirror is in sync, it breaks that
+mirror so that only the new location for that data gets used and writes a
+checkpoint into the VG metadata on disk. Then it activates the mirror for
+the next segment of the pvmove LV.
+
+6. When there are no more segments left to be mirrored, the temporary LV
+is removed and the VG metadata is updated so that the LVs reflect the new
+data locations.
+
+Note that this new process cannot support the original LVM1
+type of on-disk metadata. Metadata can be converted using
+\fBvgconvert\fP(8).
+
+If the \fB\-\-atomic\fP option is used, a slightly different approach is
+used for the move. Again, a temporary 'pvmove' LV is created to store the
+details of all the data movements required. This temporary LV contains
+all the segments of the various LVs that need to be moved. However, in
+this case, an identical LV is allocated that contains the same number of
+segments and a mirror is created to copy the contents from the first
+temporary LV to the second. After a complete copy is made, the temporary
+LVs are removed, leaving behind the segments on the destination PV. If an
+abort is issued during the move, all LVs being moved will remain on the
+source PV.
+
diff --git a/man/pvmove.8.end b/man/pvmove.8.end
new file mode 100644
index 0000000..9dd3adc
--- /dev/null
+++ b/man/pvmove.8.end
@@ -0,0 +1,46 @@
+.SH EXAMPLES
+
+Move all physical extents that are used by simple LVs on the specified PV to
+free physical extents elsewhere in the VG.
+.br
+.B pvmove /dev/sdb1
+
+Use a specific destination PV when moving physical extents.
+.br
+.B pvmove /dev/sdb1 /dev/sdc1
+
+Move extents belonging to a single LV.
+.br
+.B pvmove \-n lvol1 /dev/sdb1 /dev/sdc1
+
+Rather than moving the contents of an entire device, it is possible to
+move a range of physical extents, for example numbers 1000 to 1999
+inclusive on the specified PV.
+.br
+.B pvmove /dev/sdb1:1000\-1999
+
+A range of physical extents to move can be specified as start+length. For
+example, starting from PE 1000. (Counting starts from 0, so this refers to the
+1001st to the 2000th PE inclusive.)
+.br
+.B pvmove /dev/sdb1:1000+1000
+
+Move a range of physical extents to a specific PV (which must have
+sufficient free extents).
+.br
+.B pvmove /dev/sdb1:1000\-1999 /dev/sdc1
+
+Move a range of physical extents to specific new extents on a new PV.
+.br
+.B pvmove /dev/sdb1:1000\-1999 /dev/sdc1:0\-999
+
+If the source and destination are on the same disk, the
+\fBanywhere\fP allocation policy is needed.
+.br
+.B pvmove \-\-alloc anywhere /dev/sdb1:1000\-1999 /dev/sdb1:0\-999
+
+The part of a specific LV present within in a range of physical
+extents can also be picked out and moved.
+.br
+.B pvmove \-n lvol1 /dev/sdb1:1000\-1999 /dev/sdc1
+
diff --git a/man/pvmove.8.in b/man/pvmove.8.in
deleted file mode 100644
index 39fdfe4..0000000
--- a/man/pvmove.8.in
+++ /dev/null
@@ -1,187 +0,0 @@
-.TH PVMOVE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-pvmove \(em move physical extents
-.SH SYNOPSIS
-.B pvmove
-.RB [ \-\-abort ]
-.RB [ \-\-alloc
-.IR AllocationPolicy ]
-.RB [ \-\-atomic ]
-.RB [ \-b | \-\-background ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-i | \-\-interval
-.IR Seconds ]
-.RB [ \-\-noudevsync ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-n | \-\-name
-.IR LogicalVolume ]
-.RI [ SourcePhysicalVolume [ :PE [ \-PE ]...]
-.RI [ DestinationPhysicalVolume [ :PE [ \-PE ]...]...]]
-.SH DESCRIPTION
-pvmove allows you to move the allocated physical extents (PEs) on
-.I SourcePhysicalVolume
-to one or more other physical volumes (PVs).
-You can optionally specify a source
-.I LogicalVolume
-in which case only extents used by that LV will be moved to
-free (or specified) extents on
-.IR DestinationPhysicalVolume (s).
-If no
-.I DestinationPhysicalVolume
-is specified, the normal allocation rules for the Volume Group are used.
-
-If pvmove gets interrupted for any reason (e.g. the machine crashes)
-then run pvmove again without any PhysicalVolume arguments to
-restart any moves that were in progress from the last checkpoint.
-Alternatively use \fBpvmove \-\-abort\fP at any time to abort. The
-resulting location of logical volumes after an abort is issued depends
-on whether the
-.B \-\-atomic
-option was used when starting the pvmove process.
-
-You can run more than one pvmove at once provided they are moving data
-off different SourcePhysicalVolumes, but additional pvmoves will ignore
-any Logical Volumes already in the process of being changed, so some
-data might not get moved.
-
-\fBpvmove\fP works as follows:
-
-1. A temporary 'pvmove' Logical Volume is created to store
-details of all the data movements required.
-
-2. Every Logical Volume in the Volume Group is searched
-for contiguous data that need moving
-according to the command line arguments.
-For each piece of data found, a new segment is added to the end of the
-pvmove LV.
-This segment takes the form of a temporary mirror to copy the data
-from the original location to a newly-allocated location.
-The original LV is updated to use the new temporary mirror segment
-in the pvmove LV instead of accessing the data directly.
-
-3. The Volume Group metadata is updated on disk.
-
-4. The first segment of the pvmove Logical Volume is activated and starts
-to mirror the first part of the data. Only one segment is mirrored at once
-as this is usually more efficient.
-
-5. A daemon repeatedly checks progress at the specified time interval.
-When it detects that the first temporary mirror is in-sync,
-it breaks that mirror so that only the new location for that data gets used
-and writes a checkpoint into the Volume Group metadata on disk.
-Then it activates the mirror for the next segment of the pvmove LV.
-
-6. When there are no more segments left to be mirrored,
-the temporary Logical Volume is removed and the Volume Group metadata
-is updated so that the Logical Volumes reflect the new data locations.
-
-Note that this new process cannot support the original LVM1
-type of on-disk metadata. Metadata can be converted using \fBvgconvert\fP(8).
-
-If the
-.B \-\-atomic
-option is used, a slightly different approach is used for the move. Again,
-a temporary 'pvmove' logical volume is created to store the details of all
-the data movements required. This temporary LV contains all the segments of
-the various LVs that need to be moved. However this time, an identical
-logical volume is allocated that contains the same number of segments and
-a mirror is created to copy the contents from the first temporary LV to the
-second. When a complete copy is accomplished, the temporary logical volumes
-are removed, leaving behind the segments on the destination physical volume.
-If an abort is issued during the move, all logical volumes being moved will
-remain on the source physical volume.
-
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.B \-\-abort
-Abort any moves in progress. If the
-.B \-\-atomic
-option was used to start the pvmove, all logical volumes will remain on
-the source physical volume. Otherwise, those segments that have completed
-the move will stay on the destination physical volume, while those that
-have not will remain on the source physical volume.
-.TP
-.B \-\-atomic
-Make the entire operation atomic. That is, ensure that all affected logical
-volumes are moved to the destination physical volume together; unless the move
-has been aborted. If the move has been aborted, all logical volumes will
-remain on the source physical volume.
-.TP
-.B \-\-noudevsync
-Disable udev synchronisation. The
-process will not wait for notification from udev.
-It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running
-or has rules that ignore the devices LVM2 creates.
-.TP
-.BR \-b ", " \-\-background
-Run the daemon in the background.
-.TP
-.BR \-i ", " \-\-interval " " \fISeconds
-Report progress as a percentage at regular intervals.
-.TP
-.BR \-n ", " \-\-name " " \fILogicalVolume
-Move only the extents belonging to
-.I LogicalVolume
-from
-.I SourcePhysicalVolume
-instead of all allocated extents to the destination physical volume(s).
-
-.SH Examples
-To move all Physical Extents that are used by simple Logical Volumes on
-/dev/sdb1 to free Physical Extents elsewhere in the Volume Group use:
-.sp
-.B pvmove /dev/sdb1
-.P
-Additionally, a specific destination device /dev/sdc1
-can be specified like this:
-.sp
-.B pvmove /dev/sdb1 /dev/sdc1
-.P
-To perform the action only on extents belonging to the single Logical Volume
-lvol1 do this:
-.sp
-.B pvmove \-n lvol1 /dev/sdb1 /dev/sdc1
-.P
-Rather than moving the contents of the entire device, it is possible to
-move a range of Physical Extents - for example numbers 1000 to 1999
-inclusive on /dev/sdb1 - like this:
-.sp
-.B pvmove /dev/sdb1:1000\-1999
-.P
-A range can also be specified as start+length, so
-.sp
-.B pvmove /dev/sdb1:1000+1000
-.P
-also refers to 1000 Physical Extents starting from Physical Extent number 1000.
-(Counting starts from 0, so this refers to the 1001st to the 2000th inclusive.)
-.P
-To move a range of Physical Extents to a specific location (which must have
-sufficient free extents) use the form:
-.sp
-.B pvmove /dev/sdb1:1000\-1999 /dev/sdc1
-.sp
-or
-.sp
-.B pvmove /dev/sdb1:1000\-1999 /dev/sdc1:0\-999
-.P
-If the source and destination are on the same disk, the
-.B anywhere
-allocation policy would be needed, like this:
-.sp
-.B pvmove \-\-alloc anywhere /dev/sdb1:1000\-1999 /dev/sdb1:0\-999
-.P
-The part of a specific Logical Volume present within in a range of Physical
-Extents can also be picked out and moved, like this:
-.sp
-.B pvmove \-n lvol1 /dev/sdb1:1000\-1999 /dev/sdc1
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgconvert (8)
-.BR pvs (8)
diff --git a/man/pvremove.8.des b/man/pvremove.8.des
new file mode 100644
index 0000000..f12b76e
--- /dev/null
+++ b/man/pvremove.8.des
@@ -0,0 +1,2 @@
+pvremove wipes the label on a device so that LVM will no longer recognise
+it as a PV.
diff --git a/man/pvremove.8.in b/man/pvremove.8.in
deleted file mode 100644
index 6444884..0000000
--- a/man/pvremove.8.in
+++ /dev/null
@@ -1,37 +0,0 @@
-.TH PVREMOVE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-pvremove \(em remove a physical volume
-.SH SYNOPSIS
-.B pvremove
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RB [ \-f [ f ]| \-\-force
-.RB [ \-\-force ]]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-y | \-\-yes ]
-.I PhysicalVolume
-.RI [ PhysicalVolume ...]
-.SH DESCRIPTION
-pvremove wipes the label on a device so that LVM will no longer
-recognise it as a physical volume.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-ff ", " \-\-force " " \-\-force
-Force the removal of a physical volume belonging to an existing volume group.
-Normally \fBvgreduce\fP(8) should be used instead of this command.
-You cannot remove a physical volume which in use by some active logical volume.
-.TP
-.BR \-y ", " \-\-yes
-Answer yes to all questions.
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvcreate (8),
-.BR pvdisplay (8),
-.BR vgreduce (8)
diff --git a/man/pvresize.8.des b/man/pvresize.8.des
new file mode 100644
index 0000000..b3cfe63
--- /dev/null
+++ b/man/pvresize.8.des
@@ -0,0 +1,2 @@
+pvresize resizes a PV. The PV may already be in a VG and may have active
+LVs allocated on it.
diff --git a/man/pvresize.8.end b/man/pvresize.8.end
new file mode 100644
index 0000000..316e408
--- /dev/null
+++ b/man/pvresize.8.end
@@ -0,0 +1,16 @@
+.SH NOTES
+
+pvresize will refuse to shrink a PV if it has allocated extents beyond the
+new end.
+
+.SH EXAMPLES
+
+Expand a PV after enlarging the partition.
+.br
+.B pvresize /dev/sda1
+
+Shrink a PV prior to shrinking the partition (ensure that the PV size is
+appropriate for the intended new partition size).
+.br
+.B pvresize \-\-setphysicalvolumesize 40G /dev/sda1
+
diff --git a/man/pvresize.8.in b/man/pvresize.8.in
deleted file mode 100644
index b7d8f33..0000000
--- a/man/pvresize.8.in
+++ /dev/null
@@ -1,56 +0,0 @@
-.TH PVRESIZE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-pvresize \(em resize a disk or partition in use by LVM2
-.SH SYNOPSIS
-.B pvresize
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-setphysicalvolumesize
-.IR size ]
-.I PhysicalVolume
-.RI [ PhysicalVolume ...]
-.SH DESCRIPTION
-pvresize resizes
-.I PhysicalVolume
-which may already be in a volume group and have active logical volumes
-allocated on it.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BI \-\-setphysicalvolumesize " size"
-Overrides the automatically-detected size of the PV. Use with care, or
-prior to reducing the physical size of the device.
-.SH EXAMPLES
-Expand the PV on /dev/sda1 after enlarging the partition with fdisk:
-.sp
-.B pvresize /dev/sda1
-.sp
-Shrink the PV on /dev/sda1 prior to shrinking the partition with fdisk
-(ensure that the PV size is appropriate for your intended new partition
-size):
-.sp
-.B pvresize \-\-setphysicalvolumesize 40G /dev/sda1
-.sp
-.SH RESTRICTIONS
-pvresize will refuse to shrink
-.I PhysicalVolume
-if it has allocated extents after where its new end would be. In the future,
-it should relocate these elsewhere in the volume group if there is sufficient
-free space, like
-.B pvmove
-does.
-.sp
-.B pvresize
-won't currently work correctly on LVM1 volumes.
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvmove (8),
-.BR lvresize (8),
-.BR fdisk (8)
diff --git a/man/pvs.8.des b/man/pvs.8.des
new file mode 100644
index 0000000..08497ce
--- /dev/null
+++ b/man/pvs.8.des
@@ -0,0 +1 @@
+pvs produces formatted output about PVs.
diff --git a/man/pvs.8.end b/man/pvs.8.end
new file mode 100644
index 0000000..ba36a8b
--- /dev/null
+++ b/man/pvs.8.end
@@ -0,0 +1,11 @@
+.SH NOTES
+.
+The pv_attr bits are:
+.IP 1 3
+(d)uplicate, (a)llocatable, (u)sed
+.IP 2 3
+e(x)ported
+.IP 3 3
+(m)issing
+
+
diff --git a/man/pvs.8.in b/man/pvs.8.in
deleted file mode 100644
index 54f21c3..0000000
--- a/man/pvs.8.in
+++ /dev/null
@@ -1,153 +0,0 @@
-.TH PVS 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-pvs \(em report information about physical volumes
-.SH SYNOPSIS
-.B pvs
-.RB [ \-a | \-\-all ]
-.RB [ \-\-aligned ]
-.RB [ \-\-binary ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [[ \-\-configreport
-.IR ReportName ]
-.RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field1 [, Field2 ...]
-.RB [ \-O | \-\-sort
-.RI [ + | \- ] Key1 [, Key2 ...]]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB ...]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-ignoreskippedcluster ]
-.RB [ \-\-logonly ]
-.RB [ \-\-nameprefixes ]
-.RB [ \-\-noheadings ]
-.RB [ \-\-nosuffix ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-rows ]
-.RB [ \-\-segments ]
-.RB [ \-\-separator
-.IR Separator ]
-.RB [ \-\-unbuffered ]
-.RB [ \-\-units
-.IR hHbBsSkKmMgGtTpPeE ]
-.RB [ \-\-unquoted ]
-.RB [ \-v|\-\-verbose ]
-.RB [ \-\-version]
-.RI [ PhysicalVolume
-.RI [ PhysicalVolume ...]]
-.SH DESCRIPTION
-pvs produces formatted output about physical volumes.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.B \-\-all
-Include information in the output about devices that have not been
-initialized with \fBpvcreate\fP(8).
-.TP
-.B \-\-aligned
-Use with \fB\-\-separator\fP to align the output columns.
-.TP
-.B \-\-binary
-Use binary values "0" or "1" instead of descriptive literal values
-for columns that have exactly two valid values to report (not counting
-the "unknown" value which denotes that the value could not be determined).
-.TP
-.B \-\-configreport \fI ReportName
-Make any subsequent \fB\-o, \-\-options\fP, \fB\-O, \-\-sort\fP or
-\fB\-S, \-\-select\fP to apply for \fIReportName\fP where \fIReportName\fP
-is either 'pv' for command's main report or 'log' for log report.
-If \fB\-\-configreport\fP option is not used to identify a report, then
-command's main report is assumed. The log report is available only if
-enabled by \fBlog/report_command_log\fP \fBlvm.conf\fP(5) setting or
-if \fB\-\-logonly\fP option is used.
-.TP
-.B \-\-logonly
-Suppress the pvs report itself and display only log report on output.
-.TP
-.B \-\-nameprefixes
-Add an "LVM2_" prefix plus the field name to the output. Useful
-with \fB\-\-noheadings\fP to produce a list of field=value pairs that can
-be used to set environment variables (for example, in \fBudev\fP(7) rules).
-.TP
-.B \-\-noheadings
-Suppress the headings line that is normally the first line of output.
-Useful if grepping the output.
-.TP
-.B \-\-nosuffix
-Suppress the suffix on output sizes. Use with \fB\-\-units\fP
-(except h and H) if processing the output.
-.TP
-.BR \-o ", " \-\-options
-Comma-separated ordered list of columns.
-.IP
-Precede the list with '\fI+\fP' to append to the current list
-of columns, '\fI-\fP' to remove from the current list of columns
-or '\fI#\fP' to compact given columns. The \fI\-o\fP option can
-be repeated, providing several lists. These lists are evaluated
-from left to right.
-.IP
-Use \fB-o pv_all\fP to select all physical volume columns,
-and \fB-o pvseg_all\fP to select all Physical Volume segment columns.
-.IP
-Use \fB-o help\fP to view the full list of columns available.
-.IP
-Column names include: pv_fmt, pv_uuid, dev_size, pv_name, pv_mda_free,
-pv_mda_size, pv_ba_start, pv_ba_size, pe_start, pv_size, pv_free, pv_used,
-pv_attr, pv_pe_count, pv_pe_alloc_count, pv_tags, pv_mda_count,
-pv_mda_used_count, pvseg_start, and pvseg_size
-.IP
-With \fB\-\-segments\fP, any "pvseg_" prefixes are optional; otherwise any
-"pv_" prefixes are optional. Columns mentioned in \fBvgs\fP(8) can also
-be chosen. The pv_attr bits are: (a)llocatable, e(x)ported, (m)issing,
-(u)sed (but not allocatable), (d)uplicate.
-.TP
-.B \-\-segments
-Produces one line of output for each contiguous allocation of space on each
-Physical Volume, showing the start (pvseg_start) and length (pvseg_size) in
-units of physical extents.
-.TP
-.BR \-S ", " \-\-select " " \fISelection
-Display only rows that match Selection criteria. All rows are displayed with
-the additional "selected" column (\fB-o selected\fP) showing 1 if the row
-matches the Selection and 0 otherwise. The Selection criteria are defined
-by specifying column names and their valid values (that can include reserved
-values) while making use of supported comparison operators. See \fBlvm\fP(8)
-and \fB\-S\fP, \fB\-\-select\fP description for more detailed information
-about constructing the Selection criteria. As a quick help and to see full
-list of column names that can be used in Selection including the list of
-reserved values and the set of supported selection operators, check the
-output of \fBpvs -S help\fP command.
-.TP
-.BR \-O ", " \-\-sort
-Comma-separated ordered list of columns to sort by. Replaces the default
-selection. Precede any column with '\fI\-\fP' for a reverse sort on that
-column.
-.TP
-.B \-\-rows
-Output columns as rows.
-.TP
-.B \-\-separator \fISeparator
-String to use to separate each column. Useful if grepping the output.
-.TP
-.B \-\-unbuffered
-Produce output immediately without sorting or aligning the columns properly.
-.TP
-.B \-\-units \fIhHbBsSkKmMgGtTpPeE
-All sizes are output in these units: (h)uman-readable, (b)ytes, (s)ectors,
-(k)ilobytes, (m)egabytes, (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
-Capitalise to use multiples of 1000 (S.I.) instead of 1024. Can also specify
-custom units e.g. \-\-units 3M
-.TP
-.B \-\-unquoted
-When used with \fB\-\-nameprefixes\fP, output values in the field=value
-pairs are not quoted.
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvdisplay (8),
-.BR lvs (8),
-.BR vgs (8)
diff --git a/man/pvscan.8.des b/man/pvscan.8.des
new file mode 100644
index 0000000..ab8c50c
--- /dev/null
+++ b/man/pvscan.8.des
@@ -0,0 +1,105 @@
+pvscan scans all supported LVM block devices in the system for PVs.
+
+\fBScanning with lvmetad\fP
+
+pvscan operates differently when used with the
+.BR lvmetad (8)
+daemon.
+
+Scanning disks is required to read LVM metadata and identify LVM PVs.
+Once read, lvmetad caches the metadata so that LVM commands can read it
+without repeatedly scanning disks. This is helpful because scanning disks
+is time consuming, and frequent scanning may interfere with the normal
+work of the system and disks.
+
+When lvmetad is not used, LVM commands revert to scanning disks to read
+metadata. Any LVM command that needs metadata will scan disks for it;
+running the pvscan command is not necessary for the sake of other LVM
+commands.
+
+When lvmetad is used, LVM commands avoid scanning disks by reading
+metadata from lvmetad. When new disks appear, they must be scanned so
+their metadata can be cached in lvmetad. This is done by the command
+pvscan \-\-cache, which scans disks and passes the metadata to lvmetad.
+
+The pvscan \-\-cache command is typically run automatically by system
+services when a new device appears. Users do not generally need to run
+this command if the system and lvmetad are running properly.
+
+Many scripts contain unnecessary pvscan (or vgscan) commands for
+historical reasons. To avoid disrupting the system with extraneous disk
+scanning, an ordinary pvscan (without \-\-cache) will simply read metadata
+from lvmetad like other LVM commands. It does not do anything beyond
+displaying the current state of the cache.
+
+.IP \[bu] 2
+When given specific device name arguments, pvscan \-\-cache will only
+read the named devices.
+
+.IP \[bu] 2
+LVM udev rules and systemd services are used to initiate automatic device
+scanning.
+
+.IP \[bu] 2
+To prevent devices from being scanned by pvscan --cache, add them
+to
+.BR lvm.conf (5)
+.B devices/global_filter.
+The devices/filter setting does not
+apply to system level scanning.
+For more information, see:
+.br
+.B lvmconfig --withcomments devices/global_filter
+
+.IP \[bu] 2
+If lvmetad is started or restarted after devices are visible, or
+if the global_filter has changed, then all devices must be rescanned
+for metadata with the command pvscan \-\-cache.
+
+.IP \[bu] 2
+lvmetad does not cache older metadata formats, e.g. lvm1, and will
+be temporarily disabled if they are seen.
+
+.IP \[bu] 2
+To notify lvmetad about a device that is no longer present, the major and
+minor numbers must be given, not the path.
+
+.P
+
+\fBAutomatic activation\fP
+
+When event-driven system services detect a new LVM device, the first step
+is to automatically scan and cache the metadata from the device. This is
+done by pvscan \-\-cache. A second step is to automatically activate LVs
+that are present on the new device. This auto-activation is done by the
+same pvscan \-\-cache command when the option '\-a|\-\-activate ay' is
+included.
+
+Auto-activation of VGs or LVs can be enabled/disabled using:
+.br
+.BR lvm.conf (5)
+.B activation/auto_activation_volume_list
+
+For more information, see:
+.br
+.B lvmconfig --withcomments activation/auto_activation_volume_list
+
+When this setting is undefined, all LVs are auto-activated (when lvm is
+fully integrated with the event-driven system services.)
+
+When a VG or LV is not auto-activated, traditional activation using
+vgchange or lvchange -a|--activate is needed.
+
+.IP \[bu] 2
+pvscan auto-activation can be only done in combination with \-\-cache.
+
+.IP \[bu] 2
+Auto-activation is designated by the "a" argument in '-a|--activate ay'.
+This is meant to distinguish system generated commands from explicit user
+commands, although it can be used in any activation command. Whenever it
+is used, the auto_activation_volume_list is applied.
+
+.IP \[bu] 2
+Auto-activation is not yet supported for LVs that are part of partial or
+clustered volume groups.
+
diff --git a/man/pvscan.8.in b/man/pvscan.8.in
deleted file mode 100644
index 5ff5fa5..0000000
--- a/man/pvscan.8.in
+++ /dev/null
@@ -1,178 +0,0 @@
-.TH PVSCAN 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-pvscan \(em scan all disks for physical volumes
-
-.SH SYNOPSIS
-.B pvscan
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-e | \-\-exported ]
-.RB [ \-n | \-\-novolumegroup ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-s | \-\-short ]
-.RB [ \-u | \-\-uuid ]
-.BR
-
-.B pvscan
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.B \-\-cache
-.RB [ \-a | \-\-activate " " \fIay ]
-.RB [ \-b | \-\-background ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-major
-.I major
-.B \-\-minor
-.I minor
-|
-.IR DevicePath
-|
-.IR major:minor ]...
-
-.SH DESCRIPTION
-pvscan scans all supported LVM block devices in the system for physical
-volumes.
-
-.SS Scanning with lvmetad
-
-pvscan operates differently when used with the
-.BR lvmetad (8)
-daemon.
-
-Scanning disks is required to read LVM metadata and identify LVM PVs.
-Once read, lvmetad caches the metadata so that LVM commands can read it
-without repeatedly scanning disks. This is helpful because scanning disks
-is time consuming, and frequent scanning may interfere with the normal
-work of the system and disks.
-
-When lvmetad is not used, LVM commands revert to scanning disks to read
-metadata. Any LVM command that needs metadata will scan disks for it;
-running the pvscan command is not necessary for the sake of other LVM
-commands.
-
-When lvmetad is used, LVM commands avoid scanning disks by reading
-metadata from lvmetad. When new disks appear, they must be scanned so
-their metadata can be cached in lvmetad. This is done by the command
-pvscan \-\-cache, which scans disks and passes the metadata to lvmetad.
-
-The pvscan \-\-cache command is typically run automatically by system
-services when a new device appears. Users do not generally need to run
-this command if the system and lvmetad are running properly.
-
-Many scripts contain unnecessary pvscan (or vgscan) commands for
-historical reasons. To avoid disrupting the system with extraneous disk
-scanning, an ordinary pvscan (without \-\-cache) will simply read metadata
-from lvmetad like other LVM commands. It does not do anything beyond
-displaying the current state of the cache.
-
-.I Notes
-
-.IP \[bu] 2
-When given specific device name arguments, pvscan \-\-cache will only
-read the named devices.
-
-.IP \[bu] 2
-LVM udev rules and systemd services are used to initiate automatic device
-scanning.
-
-.IP \[bu] 2
-To prevent devices from being scanned by pvscan --cache, add them
-to
-.BR lvm.conf (5)
-.B devices/global_filter.
-The devices/filter setting does not
-apply to system level scanning.
-For more information, see:
-.br
-.B lvmconfig --withcomments devices/global_filter
-
-.IP \[bu] 2
-If lvmetad is started or restarted after devices are visible, or
-if the global_filter has changed, then all devices must be rescanned
-for metadata with the command pvscan \-\-cache.
-
-.IP \[bu] 2
-lvmetad does not cache older metadata formats, e.g. lvm1, and will
-be temporarily disabled if they are seen.
-
-.IP \[bu] 2
-To notify lvmetad about a device that is no longer present, the major and
-minor numbers must be given, not the path.
-
-.SS Automatic activation
-
-When event-driven system services detect a new LVM device, the first step
-is to automatically scan and cache the metadata from the device. This is
-done by pvscan \-\-cache. A second step is to automatically activate LVs
-that are present on the new device. This auto-activation is done by the
-same pvscan \-\-cache command when the option '\-a|\-\-activate ay' is
-included.
-
-Auto-activation of VGs or LVs can be enabled/disabled using:
-.br
-.BR lvm.conf (5)
-.B activation/auto_activation_volume_list
-
-For more information, see:
-.br
-.B lvmconfig --withcomments activation/auto_activation_volume_list
-
-When this setting is undefined, all LVs are auto-activated (when lvm is
-fully integrated with the event-driven system services.)
-
-When a VG or LV is not auto-activated, traditional activation using
-vgchange or lvchange -a|--activate is needed.
-
-.I Notes
-
-.IP \[bu] 2
-pvscan auto-activation can be only done in combination with \-\-cache.
-
-.IP \[bu] 2
-Auto-activation is designated by the "a" argument in '-a|--activate ay'.
-This is meant to distinguish system generated commands from explicit user
-commands, although it can be used in any activation command. Whenever it
-is used, the auto_activation_volume_list is applied.
-
-.IP \[bu] 2
-Auto-activation is not yet supported for LVs that are part of partial or
-clustered volume groups.
-
-.P
-
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-e ", " \-\-exported
-Only show physical volumes belonging to exported volume groups.
-.TP
-.BR \-n ", " \-\-novolumegroup
-Only show physical volumes not belonging to any volume group.
-.TP
-.BR \-s ", " \-\-short
-Short listing format.
-.TP
-.BR \-u ", " \-\-uuid
-Show UUIDs in addition to device names.
-.TP
-.BR \-a ", " \-\-activate " " \fIay
-Automatically activate any logical volumes that are possible to activate
-with the addition of the new devices.
-.TP
-.BR \-b ", " \-\-background
-Run the command in the background.
-.TP
-.BR \-\-cache " [" \-\-major " " \fImajor " " \-\-minor " " \fIminor " | " \fIDevicePath " | " \fImajor:minor " ]..."
-Scan one or more devices and send the metadata to lvmetad.
-
-.SH SEE ALSO
-.BR lvm (8),
-.BR lvmconfig (8),
-.BR lvmetad (8)
diff --git a/man/see_also.end b/man/see_also.end
new file mode 100644
index 0000000..70eeb89
--- /dev/null
+++ b/man/see_also.end
@@ -0,0 +1,67 @@
+.SH SEE ALSO
+
+.BR lvm (8)
+.BR lvm.conf (5)
+.BR lvmconfig (8)
+
+.BR pvchange (8)
+.BR pvck (8)
+.BR pvcreate (8)
+.BR pvdisplay (8)
+.BR pvmove (8)
+.BR pvremove (8)
+.BR pvresize (8)
+.BR pvs (8)
+.BR pvscan (8)
+
+.BR vgcfgbackup (8)
+.BR vgcfgrestore (8)
+.BR vgchange (8)
+.BR vgck (8)
+.BR vgcreate (8)
+.BR vgconvert (8)
+.BR vgdisplay (8)
+.BR vgexport (8)
+.BR vgextend (8)
+.BR vgimport (8)
+.BR vgimportclone (8)
+.BR vgmerge (8)
+.BR vgmknodes (8)
+.BR vgreduce (8)
+.BR vgremove (8)
+.BR vgrename (8)
+.BR vgs (8)
+.BR vgscan (8)
+.BR vgsplit (8)
+
+.BR lvcreate (8)
+.BR lvchange (8)
+.BR lvconvert (8)
+.BR lvdisplay (8)
+.BR lvextend (8)
+.BR lvreduce (8)
+.BR lvremove (8)
+.BR lvrename (8)
+.BR lvresize (8)
+.BR lvs (8)
+.BR lvscan (8)
+
+.BR lvm2-activation-generator (8)
+.BR blkdeactivate (8)
+.BR lvmdump (8)
+
+.BR dmeventd (8)
+.BR lvmetad (8)
+.BR lvmpolld (8)
+.BR lvmlockd (8)
+.BR lvmlockctl (8)
+.BR clvmd (8)
+.BR cmirrord (8)
+.BR lvmdbusd (8)
+
+.BR lvmsystemid (7)
+.BR lvmreport (7)
+.BR lvmraid (7)
+.BR lvmthin (7)
+.BR lvmcache (7)
+
diff --git a/man/vgcfgbackup.8.des b/man/vgcfgbackup.8.des
new file mode 100644
index 0000000..0720e01
--- /dev/null
+++ b/man/vgcfgbackup.8.des
@@ -0,0 +1,16 @@
+vgcfgbackup creates back up files containing metadata of VGs.
+If no VGs are named, back up files are created for all VGs.
+See \fBvgcfgrestore\fP for information on using the back up
+files.
+
+In a default installation, each VG is backed up into a separate file
+bearing the name of the VG in the directory \fI#DEFAULT_BACKUP_DIR#\fP.
+
+To use an alternative back up file, use \fB\-f\fP. In this case, when
+backing up multiple VGs, the file name is treated as a template, with %s
+replaced by the VG name.
+
+NB. This DOES NOT back up the data content of LVs.
+
+It may also be useful to regularly back up the files in
+\fI#DEFAULT_SYS_DIR#\fP.
diff --git a/man/vgcfgbackup.8.in b/man/vgcfgbackup.8.in
deleted file mode 100644
index c6f20d9..0000000
--- a/man/vgcfgbackup.8.in
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH VGCFGBACKUP 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgcfgbackup \(em backup volume group descriptor area
-.SH SYNOPSIS
-.B vgcfgbackup
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-f | \-\-file
-.IR Filename ]
-.RB [ \-h | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-v | \-\-verbose ]
-.RI [ VolumeGroupName ...]
-.SH DESCRIPTION
-vgcfgbackup allows you to backup the metadata of your volume groups.
-If you don't name any volume groups on the command line, all of them
-will be backed up.
-.sp
-In a default installation, each volume group gets backed up into a separate
-file bearing the name of the volume group in the directory
-\fI#DEFAULT_BACKUP_DIR#\fP.
-You can write the backup to an alternative file using \fB\-f\fP. In this case
-if you are backing up more than one volume group the filename is
-treated as a template, and %s gets replaced by the volume group name.
-.sp
-NB. This DOESN'T backup user/system data in logical
-volume(s)! Backup \fI#DEFAULT_SYS_DIR#\fP regularly too.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgcfgrestore (8)
diff --git a/man/vgcfgrestore.8.des b/man/vgcfgrestore.8.des
new file mode 100644
index 0000000..cb7867d
--- /dev/null
+++ b/man/vgcfgrestore.8.des
@@ -0,0 +1,8 @@
+vgcfgrestore restores the metadata of a VG from a text back up file
+produced by \fBvgcfgbackup\fP. This writes VG metadata onto the devices
+specifed in back up file.
+
+A back up file can be specified with \fB\-\-file\fP. If no backup file is
+specified, the most recent one is used. Use \fB\-\-list\fP for a list of
+the available back up and archive files of a VG.
+
diff --git a/man/vgcfgrestore.8.end b/man/vgcfgrestore.8.end
new file mode 100644
index 0000000..5ac451d
--- /dev/null
+++ b/man/vgcfgrestore.8.end
@@ -0,0 +1,9 @@
+.SH NOTES
+
+To replace PVs, \fBvgdisplay \-\-partial \-\-verbose\fP will show the
+UUIDs and sizes of any PVs that are no longer present. If a PV in the VG
+is lost and you wish to substitute another of the same size, use
+\fBpvcreate \-\-restorefile filename \-\-uuid uuid\fP (plus additional
+arguments as appropriate) to initialise it with the same UUID as the
+missing PV. Repeat for all other missing PVs in the VG. Then use
+\fBvgcfgrestore \-\-file filename\fP to restore the VG's metadata.
diff --git a/man/vgcfgrestore.8.in b/man/vgcfgrestore.8.in
deleted file mode 100644
index 96b0a10..0000000
--- a/man/vgcfgrestore.8.in
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH VGCFGRESTORE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgcfgrestore \(em restore volume group descriptor area
-.SH SYNOPSIS
-.B vgcfgrestore
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-f | \-\-file
-.RI < filename >]
-.RB [ \-\-force ]
-.RB [ \-l [ l ]| \-\-list ]
-.RB [ \-h | \-\-help ]
-.RB [ \-M | \-\-metadatatype
-.IR 1 | 2 ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RI \fIVolumeGroupName\fP
-.SH DESCRIPTION
-vgcfgrestore allows you to restore the metadata of \fIVolumeGroupName\fP
-from a text backup file produced by \fBvgcfgbackup\fP.
-You can specify a backup file with \fB\-\-file\fP.
-If no backup file is specified, the most recent
-one is used. Use \fB\-\-list\fP for a list of the available
-backup and archive files of \fIVolumeGroupName\fP.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-l ", " \-\-list\fP
-List files pertaining to \fIVolumeGroupName\fP
-List metadata backup and archive files pertaining to \fIVolumeGroupName\fP.
-May be used with the \fB\-f\fP option. Does not restore \fIVolumeGroupName\fP.
-.TP
-.BR \-f ", " \-\-file " " \fIfilename
-Name of LVM metadata backup file
-Specifies a metadata backup or archive file to be used for restoring
-VolumeGroupName. Often this file has been created with \fBvgcfgbackup\fP.
-.TP
-.B \-\-force
-Necessary to restore metadata with thin pool volumes.
-.br
-\fBWARNING: Use with extreme caution.
-Most changes to thin metadata cannot be reverted.
-You may lose data if you restore metadata that does not match the thin pool
-kernel metadata precisely.\fP
-.SH REPLACING PHYSICAL VOLUMES
-\fBvgdisplay \-\-partial \-\-verbose\fP will show you the UUIDs and sizes of
-any PVs that are no longer present.
-If a PV in the VG is lost and you wish to substitute
-another of the same size, use
-\fBpvcreate \-\-restorefile filename \-\-uuid uuid\fP (plus additional
-arguments as appropriate) to initialise it with the same UUID as
-the missing PV. Repeat for all other missing PVs in the VG.
-Then use \fBvgcfgrestore \-\-file filename\fP to restore the volume
-group's metadata.
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgcreate (8)
diff --git a/man/vgchange.8.des b/man/vgchange.8.des
new file mode 100644
index 0000000..6b873d8
--- /dev/null
+++ b/man/vgchange.8.des
@@ -0,0 +1,2 @@
+vgchange changes VG attributes, changes LV activation in the kernel, and
+includes other utilities for VG maintenance.
diff --git a/man/vgchange.8.end b/man/vgchange.8.end
new file mode 100644
index 0000000..a11bdd1
--- /dev/null
+++ b/man/vgchange.8.end
@@ -0,0 +1,16 @@
+.SH NOTES
+
+If vgchange recognizes COW snapshot LVs that were dropped because they ran
+out of space, it displays a message informing the administrator that the
+snapshots should be removed.
+
+.SH EXAMPLES
+
+Activate all LVs in all VGs on all existing devices.
+.br
+.B vgchange \-a y
+
+Change the maximum number of LVs for an inactive VG.
+.br
+.B vgchange \-l 128 vg00
+
diff --git a/man/vgchange.8.in b/man/vgchange.8.in
deleted file mode 100644
index 3b2fc3e..0000000
--- a/man/vgchange.8.in
+++ /dev/null
@@ -1,346 +0,0 @@
-.TH VGCHANGE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgchange \(em change attributes of a volume group
-.SH SYNOPSIS
-.B vgchange
-.RB [ \-\-addtag
-.IR Tag ]
-.RB [ \-\-alloc
-.IR AllocationPolicy ]
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-a | \-\-activate
-.RI [ a | e | s | l ]
-.RI { y | n }]
-.RB [ \-\-activationmode
-.IB { complete | degraded | partial } ]
-.RB [ \-K | \-\-ignoreactivationskip ]
-.RB [ \-\-monitor
-.RI { y | n }]
-.RB [ \-\-poll
-.RI { y | n }]
-.RB [ \-c | \-\-clustered
-.RI { y | n }]
-.RB [ \-u | \-\-uuid ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-\-deltag
-.IR Tag ]
-.RB [ \-\-detachprofile ]
-.RB [ \-h | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-ignoremonitoring ]
-.RB [ \-\-ignoreskippedcluster ]
-.RB [ \-\-sysinit ]
-.RB [ \-\-noudevsync ]
-.RB [ \-\-lock\-start ]
-.RB [ \-\-lock\-stop ]
-.RB [ \-\-lock\-type
-.IR LockType ]
-.RB [ \-l | \-\-logicalvolume
-.IR MaxLogicalVolumes ]
-.RB [ \-p | \-\-maxphysicalvolumes
-.IR MaxPhysicalVolumes ]
-.RB [ \-\-metadataprofile
-.IR ProfileName ]
-.RB [ \-\- [ vg ] metadatacopies
-.IR NumberOfCopies | unmanaged | all ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-s | \-\-physicalextentsize
-.IR PhysicalExtentSize [ bBsSkKmMgGtTpPeE ]]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB [ \-\-systemid
-.IR SystemID ]
-.RB [ \-\-refresh ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RB [ \-x | \-\-resizeable
-.RI { y | n }]
-.RI [ VolumeGroupName ...]
-.SH DESCRIPTION
-vgchange allows you to change the attributes of one or more
-volume groups. Its main purpose is to activate and deactivate
-.IR VolumeGroupName ,
-or all volume groups if none is specified. Only active volume groups
-are subject to changes and allow access to their logical volumes.
-[Not yet implemented: During volume group activation, if
-.B vgchange
-recognizes snapshot logical volumes which were dropped because they ran
-out of space, it displays a message informing the administrator that such
-snapshots should be removed (see
-.BR lvremove (8)).
-]
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-A ", " \-\-autobackup " {" \fIy | \fIn }
-Controls automatic backup of metadata after the change. See
-.BR vgcfgbackup (8).
-Default is yes.
-.TP
-.BR \-a ", " \-\-activate " [" \fIa | \fIe | \fIs | \fIl ]{ \fIy | \fIn }
-Controls the availability of the logical volumes in the volume
-group for input/output.
-In other words, makes the logical volumes known/unknown to the kernel.
-If autoactivation option is used (\-aay), each logical volume in
-the volume group is activated only if it matches an item in the
-activation/auto_activation_volume_list set in lvm.conf. If this
-list is not set, then all volumes are considered for activation.
-The \-aay option should be also used during system boot so it's
-possible to select which volumes to activate using the
-activation/auto_activation_volume_list settting.
-.IP
-Activation of a logical volume creates a symbolic link
-/dev/VolumeGroupName/LogicalVolumeName pointing to the device node.
-This link is removed on deactivation.
-All software and scripts should access the device through
-this symbolic link and present this as the name of the device.
-The location and name of the underlying device node may depend on
-the distribution and configuration (e.g. udev) and might change
-from release to release.
-.IP
-In a clustered VG, clvmd is used for activation, and the
-following options are possible:
-
-With \-aey, clvmd activates the LV in exclusive mode
-(with an exclusive lock), allowing a single node to activate the LV.
-
-With \-asy, clvmd activates the LV in shared mode
-(with a shared lock), allowing multiple nodes to activate the LV concurrently.
-If the LV type prohibits shared access, such as an LV with a snapshot,
-the 's' option is ignored and an exclusive lock is used.
-
-With \-ay (no mode specified), clvmd activates the LV in shared mode
-if the LV type allows concurrent access, such as a linear LV.
-Otherwise, clvmd activates the LV in exclusive mode.
-
-With \-aey, \-asy, and \-ay, clvmd attempts to activate the LV
-on all nodes. If exclusive mode is used, then only one of the
-nodes will be successful.
-
-With \-an, clvmd attempts to deactivate the LV on all nodes.
-
-With \-aly, clvmd activates the LV only on the local node, and \-aln
-deactivates only on the local node. If the LV type allows concurrent
-access, then shared mode is used, otherwise exclusive.
-
-LVs with snapshots are always activated exclusively because they can only
-be used on one node at once.
-
-For local VGs, \-ay, \-aey, and \-asy are all equivalent.
-.IP
-In a shared VG, lvmlockd is used for locking if LVM is compiled with lockd
-support, and the following options are possible:
-
-With \-aey, the command activates the LV in exclusive mode, allowing a
-single host to activate the LV (the host running the command). Before
-activating the LV, the command uses lvmlockd to acquire an exclusive lock
-on the LV. If the lock cannot be acquired, the LV is not activated and an
-error is reported. This would happen if the LV is active on another host.
-
-With \-asy, the command activates the LV in shared mode, allowing multiple
-hosts to activate the LV concurrently. Before activating the LV, the
-command uses lvmlockd to acquire a shared lock on the LV. If the lock
-cannot be acquired, the LV is not activated and an error is reported.
-This would happen if the LV is active exclusively on another host. If the
-LV type prohibits shared access, such as a snapshot, the command will
-report an error and fail.
-
-With \-an, the command deactivates the LV on the host running the command.
-After deactivating the LV, the command uses lvmlockd to release the
-current lock on the LV.
-
-With lvmlockd, an unspecified mode is always exclusive, \-ay defaults to
-\-aey.
-
-.TP
-.BR \-\-activationmode " {" \fIcomplete | \fIdegraded | \fIpartial }
-The activation mode determines whether logical volumes are allowed to
-activate when there are physical volumes missing (e.g. due to a device
-failure). \fIcomplete\fP is the most restrictive; allowing only those
-logical volumes to be activated that are not affected by the missing
-PVs. \fIdegraded\fP allows RAID logical volumes to be activated even if
-they have PVs missing. (Note that the "mirror" segment type is not
-considered a RAID logical volume. The "raid1" segment type should
-be used instead.) Finally, \fIpartial\fP allows any logical volume to
-be activated even if portions are missing due to a missing or failed
-PV. This last option should only be used when performing recovery or
-repair operations. \fIdegraded\fP is the default mode. To change it, modify
-.B activation_mode
-in
-.BR lvm.conf (5).
-.TP
-.BR \-K ", " \-\-ignoreactivationskip
-Ignore the flag to skip Logical Volumes during activation.
-.TP
-.BR \-c ", " \-\-clustered " {" \fIy | \fIn }
-If clustered locking is enabled, this indicates whether this
-Volume Group is shared with other nodes in the cluster or whether
-it contains only local disks that are not visible on the other nodes.
-If the cluster infrastructure is unavailable on a particular node at a
-particular time, you may still be able to use Volume Groups that
-are not marked as clustered.
-.TP
-.BR \-\-detachprofile
-Detach any metadata configuration profiles attached to given
-Volume Groups. See \fBlvm.conf\fP(5) for more information
-about \fBmetadata profiles\fP.
-.TP
-.BR \-u ", " \-\-uuid
-Generate new random UUID for specified Volume Groups.
-.TP
-.BR \-\-monitor " {" \fIy | \fIn }
-Start or stop monitoring a mirrored or snapshot logical volume with
-dmeventd, if it is installed.
-If a device used by a monitored mirror reports an I/O error,
-the failure is handled according to
-.B mirror_image_fault_policy
-and
-.B mirror_log_fault_policy
-set in
-.BR lvm.conf (5).
-.TP
-.BR \-\-poll " {" \fIy | \fIn }
-Without polling a logical volume's backgrounded transformation process
-will never complete. If there is an incomplete pvmove or lvconvert (for
-example, on rebooting after a crash), use \fB\-\-poll y\fP to restart the
-process from its last checkpoint. However, it may not be appropriate to
-immediately poll a logical volume when it is activated, use
-\fB\-\-poll n\fP to defer and then \fB\-\-poll y\fP to restart the process.
-.TP
-.BR \-\-sysinit
-Indicates that vgchange(8) is being invoked from early system initialisation
-scripts (e.g. rc.sysinit or an initrd), before writeable filesystems are
-available. As such, some functionality needs to be disabled and this option
-acts as a shortcut which selects an appropriate set of options. Currently
-this is equivalent to using
-.BR \-\-ignorelockingfailure ,
-.BR \-\-ignoremonitoring ,
-.B \-\-poll n
-and setting \fBLVM_SUPPRESS_LOCKING_FAILURE_MESSAGES\fP
-environment variable.
-
-If \fB\-\-sysinit\fP is used in conjunction with lvmetad(8) enabled and running,
-autoactivation is preferred over manual activation via direct vgchange call.
-Logical volumes are autoactivated according to auto_activation_volume_list
-set in lvm.conf(5).
-.TP
-.BR \-\-noudevsync
-Disable udev synchronisation. The
-process will not wait for notification from udev.
-It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running
-or has rules that ignore the devices LVM2 creates.
-.TP
-.BR \-\-ignoremonitoring
-Make no attempt to interact with dmeventd unless
-.BR \-\-monitor
-is specified.
-Do not use this if dmeventd is already monitoring a device.
-.TP
-.BR \-\-lock\-start
-Start the lockspace of a shared VG in lvmlockd. lvmlockd locks becomes
-available for the VG, allowing LVM to use the VG. See
-.BR lvmlockd (8).
-.TP
-.BR \-\-lock\-stop
-Stop the lockspace of a shared VG in lvmlockd. lvmlockd locks become
-unavailable for the VG, preventing LVM from using the VG. See
-.BR lvmlockd (8).
-.TP
-.BR \-\-lock\-type " " \fILockType
-Change the VG lock type to or from a shared lock type used with lvmlockd. See
-.BR lvmlockd (8).
-.TP
-.BR \-l ", " \-\-logicalvolume " " \fIMaxLogicalVolumes
-Changes the maximum logical volume number of an existing inactive
-volume group.
-.TP
-.BR \-p ", " \-\-maxphysicalvolumes " " \fIMaxPhysicalVolumes
-Changes the maximum number of physical volumes that can belong
-to this volume group.
-For volume groups with metadata in lvm1 format, the limit is 255.
-If the metadata uses lvm2 format, the value 0 removes this restriction:
-there is then no limit. If you have a large number of physical volumes in
-a volume group with metadata in lvm2 format, for tool performance reasons,
-you should consider some use of \fB\-\-pvmetadatacopies 0\fP as described in
-\fBpvcreate(8)\fP, and/or use \fB\-\-vgmetadatacopies\fP.
-.TP
-.BR \-\-metadataprofile " " \fIProfileName
-Uses and attaches ProfileName configuration profile to the volume group
-metadata. Whenever the volume group is processed next time, the profile
-is automatically applied. The profile is inherited by all logical volumes
-in the volume group unless the logical volume itself has its own profile
-attached. See \fBlvm.conf\fP(5) for more information about \fBmetadata profiles\fP.
-.TP
-.BR \-\- [ vg ] metadatacopies " " \fINumberOfCopies | \fIunmanaged | \fIall
-Sets the desired number of metadata copies in the volume group. If set to
-a non-zero value, LVM will automatically manage the 'metadataignore'
-flags on the physical volumes (see \fBpvchange\fP or \fBpvcreate \-\-metadataignore\fP) in order
-to achieve \fINumberOfCopies\fP copies of metadata. If set to \fIunmanaged\fP,
-LVM will not automatically manage the 'metadataignore' flags. If set to
-\fIall\fP, LVM will first clear all of the 'metadataignore' flags on all
-metadata areas in the volume group, then set the value to \fIunmanaged\fP.
-The \fBvgmetadatacopies\fP option is useful for volume groups containing
-large numbers of physical volumes with metadata as it may be used to
-minimize metadata read and write overhead.
-.TP
-.BR \-s ", " \-\-physicalextentsize " " \fIPhysicalExtentSize [ \fIBbBsSkKmMgGtTpPeE ]
-Changes the physical extent size on physical volumes of this volume group.
-A size suffix (k for kilobytes up to t for terabytes) is optional, megabytes
-is the default if no suffix is present. For LVM2 format, the value must be a
-power of 2 of at least 1 sector (where the sector size is the largest sector
-size of the PVs currently used in the VG) or, if not a power of 2, at least
-128KiB. For the older LVM1 format, it must be a power of 2 of at least 8KiB.
-The default is 4 MiB.
-
-Before increasing the physical extent size, you might need to use lvresize,
-pvresize and/or pvmove so that everything fits. For example, every
-contiguous range of extents used in a logical volume must start and
-end on an extent boundary.
-
-If the volume group metadata uses lvm1 format, extents can vary in size from
-8KiB to 16GiB and there is a limit of 65534 extents in each logical volume.
-The default of 4 MiB leads to a maximum logical volume size of around 256GiB.
-
-If the volume group metadata uses lvm2 format those restrictions do not apply,
-but having a large number of extents will slow down the tools but have no
-impact on I/O performance to the logical volume. The smallest PE is 1KiB.
-
-The 2.4 kernel has a limitation of 2TiB per block device.
-.TP
-.BR \-\-systemid " " \fISystemID
-Changes the system ID of the VG. Using this option requires caution
-because the VG may become foreign to the host running the command,
-leaving the host unable to access it. See
-.BR lvmsystemid (7).
-.TP
-.BR \-\-refresh
-If any logical volume in the volume group is active, reload its metadata.
-This is not necessary in normal operation, but may be useful
-if something has gone wrong or if you're doing clustering
-manually without a clustered lock manager.
-.TP
-.BR \-x ", " \-\-resizeable " {" \fIy | \fIn }
-Enables or disables the extension/reduction of this volume group
-with/by physical volumes.
-.SH Examples
-To activate all known volume groups in the system:
-.sp
-.B vgchange \-a y
-
-To change the maximum number of logical volumes of inactive volume group
-vg00 to 128.
-.sp
-.B vgchange \-l 128 /dev/vg00
-
-
-.SH SEE ALSO
-.BR lvchange (8),
-.BR lvm (8),
-.BR vgcreate (8)
diff --git a/man/vgck.8.des b/man/vgck.8.des
new file mode 100644
index 0000000..24e1dbe
--- /dev/null
+++ b/man/vgck.8.des
@@ -0,0 +1 @@
+vgck checks LVM metadata for consistency.
diff --git a/man/vgck.8.in b/man/vgck.8.in
deleted file mode 100644
index b10f57e..0000000
--- a/man/vgck.8.in
+++ /dev/null
@@ -1,22 +0,0 @@
-.TH VGCK 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgck \(em check volume group metadata
-.SH SYNOPSIS
-.B vgck
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-v | \-\-verbose ]
-.RI [ VolumeGroupName ...]
-.SH DESCRIPTION
-vgck checks LVM metadata for each named volume group for consistency.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgcreate (8),
-.BR vgchange (8),
-.BR vgscan (8)
diff --git a/man/vgconvert.8.des b/man/vgconvert.8.des
new file mode 100644
index 0000000..47bc0cc
--- /dev/null
+++ b/man/vgconvert.8.des
@@ -0,0 +1,7 @@
+vgconvert converts VG metadata from one format to another. The new
+metadata format must be able to fit into the space provided by the old
+format.
+
+Because the LVM1 format should no longer be used, this command is no
+longer needed in general.
+
diff --git a/man/vgconvert.8.in b/man/vgconvert.8.in
deleted file mode 100644
index d864483..0000000
--- a/man/vgconvert.8.in
+++ /dev/null
@@ -1,48 +0,0 @@
-.TH VGCONVERT 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgconvert \- convert volume group metadata format
-.SH SYNOPSIS
-.B vgconvert
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-labelsector ]
-.RB [ \-\-bootloaderareasize
-.IR size ]
-.RB [ \-M | \-\-metadatatype
-.IR type ]
-.RB [ \-\-pvmetadatacopies
-.IR NumberOfCopies ]
-.RB [ \-\-metadatasize
-.IR size ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-version ]
-.I VolumeGroupName
-.RI [ VolumeGroupName ...]
-.SH DESCRIPTION
-vgconvert converts
-.I VolumeGroupName
-metadata from one format to another provided that the metadata
-fits into the same space.
-.SH OPTIONS
-See \fBlvm\fP(8) and \fBpvcreate\fP(8) for options.
-.SH Examples
-Convert volume group vg1 from LVM1 metadata format to the new LVM2
-metadata format.
-.sp
-.B vgconvert \-M2 vg1
-.SH RECOVERY
-Use \fBpvscan\fP(8) to see which PVs lost their metadata.
-Run \fBpvcreate\fP(8) with the \fB\-\-uuid\fP and \fB\-\-restorefile\fP
-options on each such PV to reformat it as it was, using the archive
-file that \fBvgconvert\fP(8) created at the start of the procedure.
-Finally run \fBvgcfgrestore\fP(8) with that archive file to restore
-the original metadata.
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvcreate (8),
-.BR vgcfgrestore (8)
diff --git a/man/vgcreate.8.des b/man/vgcreate.8.des
new file mode 100644
index 0000000..a2d7161
--- /dev/null
+++ b/man/vgcreate.8.des
@@ -0,0 +1,4 @@
+vgcreate creates a new VG on block devices. If the devices were not
+previously intialized as PVs with \fBpvcreate\fP(8), vgcreate will
+inititialize them, making them PVs. The pvcreate options for initializing
+devices are also available with vgcreate.
diff --git a/man/vgcreate.8.end b/man/vgcreate.8.end
new file mode 100644
index 0000000..66bcfbb
--- /dev/null
+++ b/man/vgcreate.8.end
@@ -0,0 +1,6 @@
+.SH EXAMPLES
+
+Create a VG with two PVs, using the default physical extent size.
+.br
+.B vgcreate myvg /dev/sdk1 /dev/sdl1
+
diff --git a/man/vgcreate.8.in b/man/vgcreate.8.in
deleted file mode 100644
index c66753b..0000000
--- a/man/vgcreate.8.in
+++ /dev/null
@@ -1,187 +0,0 @@
-.TH VGCREATE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgcreate \(em create a volume group
-.SH SYNOPSIS
-.B vgcreate
-.RB [ \-\-addtag
-.IR Tag ]
-.RB [ \-\-alloc
-.IR AllocationPolicy ]
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-c | \-\-clustered
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-l | \-\-maxlogicalvolumes
-.IR MaxLogicalVolumes ]
-.RB [ \-M | \-\-metadatatype
-.IR type ]
-.RB [ \-\-metadataprofile
-.IR ProfileName ]
-.RB [ \-p | \-\-maxphysicalvolumes
-.IR MaxPhysicalVolumes ]
-.RB [ \-\- [ vg ] metadatacopies
-.IR NumberOfCopies | unmanaged | all ]
-.RB [ \-s | \-\-physicalextentsize
-.IR PhysicalExtentSize [ bBsSkKmMgGtTpPeE ]]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-shared ]
-.RB [ \-\-systemid
-.IR SystemID ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RB [ "PHYSICAL DEVICE OPTIONS" ]
-.I VolumeGroupName PhysicalDevicePath
-.RI [ PhysicalDevicePath ...]
-.SH DESCRIPTION
-vgcreate creates a new volume group called
-.I VolumeGroupName
-using the block special device \fIPhysicalDevicePath\fP.
-.sp
-If \fIPhysicalDevicePath\fP was not previously configured for LVM with
-\fBpvcreate\fP(8), the device will be initialized with the same
-default values used with \fBpvcreate\fP(8). If non-default
-\fPpvcreate\fP values are desired, they may be given on the
-commandline with the same options as \fBpvcreate\fP(8). See
-.B PHYSICAL DEVICE OPTIONS
-for available options. Note that the restore-related options such as
-.BR \-\-restorefile ", " \-\-uuid " and " \-\-physicalvolumesize
-are not available. If a restore operation is needed, use
-\fBpvcreate\fP(8) and \fBvgcfgrestore\fP(8).
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-c ", " \-\-clustered " {" \fIy | \fIn }
-If clustered locking is enabled, this defaults to \fBy\fP indicating that
-this Volume Group is shared with other nodes in the cluster.
-
-If the new Volume Group contains only local disks that are not visible
-on the other nodes, you must specify \fB\-\-clustered\ n\fP.
-If the cluster infrastructure is unavailable on a particular node at a
-particular time, you may still be able to use such Volume Groups.
-.TP
-.BR \-l ", " \-\-maxlogicalvolumes " " \fIMaxLogicalVolumes
-Sets the maximum number of logical volumes allowed in this
-volume group.
-The setting can be changed with \fBvgchange\fP(8).
-For volume groups with metadata in lvm1 format, the limit
-and default value is 255.
-If the metadata uses lvm2 format, the default value is 0
-which removes this restriction: there is then no limit.
-.TP
-.BR \-p ", " \-\-maxphysicalvolumes " " \fIMaxPhysicalVolumes
-Sets the maximum number of physical volumes that can belong
-to this volume group.
-The setting can be changed with \fBvgchange\fP.
-For volume groups with metadata in lvm1 format, the limit
-and default value is 255.
-If the metadata uses lvm2 format, the value 0 removes this restriction:
-there is then no limit. If you have a large number of physical volumes in
-a volume group with metadata in lvm2 format, for tool performance reasons,
-you should consider some use of \fB\-\-pvmetadatacopies 0\fP as described in
-\fBpvcreate\fP(8), and/or use \fB\-\-vgmetadatacopies\fP.
-.TP
-.BR \-\- [ vg ] metadatacopies " " \fINumberOfCopies | \fIunmanaged | \fIall
-Sets the desired number of metadata copies in the volume group. If set to
-a non-zero value, LVM will automatically manage the 'metadataignore'
-flags on the physical volumes (see \fBpvcreate\fP(8) or
-\fBpvchange \-\-metadataignore\fP) in order
-to achieve \fINumberOfCopies\fP copies of metadata. If set to \fIunmanaged\fP,
-LVM will not automatically manage the 'metadataignore' flags. If set to
-\fIall\fP, LVM will first clear all of the 'metadataignore' flags on all
-metadata areas in the volume group, then set the value to \fIunmanaged\fP.
-The \fBvgmetadatacopies\fP option is useful for volume groups containing
-large numbers of physical volumes with metadata as it may be used to
-minimize metadata read and write overhead.
-The default value is \fIunmanaged\fP.
-.TP
-.BR \-\-metadataprofile " " \fIProfileName
-Uses and attaches the ProfileName configuration profile to the volume group
-metadata. Whenever the volume group is processed next time, the profile is
-automatically applied. The profile is inherited by all logical volumes in
-the volume group unless the logical volume itself has its own profile attached.
-See \fBlvm.conf\fP(5) for more information about \fBmetadata profiles\fP.
-.TP
-.BR \-s ", " \-\-physicalextentsize " " \fIPhysicalExtentSize [ \fIbBsSkKmMgGtTpPeE ]
-Sets the physical extent size on physical volumes of this volume group.
-A size suffix (k for kilobytes up to t for terabytes) is optional, megabytes
-is the default if no suffix is present. For LVM2 format, the value must be a
-power of 2 of at least 1 sector (where the sector size is the largest sector
-size of the PVs currently used in the VG) or, if not a power of 2, at least
-128KiB. For the older LVM1 format, it must be a power of 2 of at least 8KiB.
-The default is 4 MiB.
-Once this value has been set, it is difficult to change it without recreating
-the volume group which would involve backing up and restoring data on any
-logical volumes. However, if no extents need moving for the new
-value to apply, it can be altered using \fBvgchange \-s\fP.
-
-If the volume group metadata uses lvm1 format, extents can vary in size from
-8KiB to 16GiB and there is a limit of 65534 extents in each logical volume. The
-default of 4 MiB leads to a maximum logical volume size of around 256GiB.
-
-If the volume group metadata uses lvm2 format those restrictions do not apply,
-but having a large number of extents will slow down the tools but have no
-impact on I/O performance to the logical volume. The smallest PE is 1KiB
-
-The 2.4 kernel has a limitation of 2TiB per block device.
-
-.TP
-.B \-\-shared
-Create a shared VG using lvmlockd if LVM is compiled with lockd support.
- lvmlockd will select lock type sanlock or dlm depending on which lock
-manager is running. This allows multiple hosts to share a VG on shared
-devices. lvmlockd and a lock manager must be configured and running. See
-.BR lvmlockd (8).
-
-.TP
-.BR \-\-systemid " " \fISystemID
-Specifies the system ID that will be given to the new VG, overriding the
-system ID of the host running the command. A VG is normally created
-without this option, in which case the new VG is given the system ID of
-the host creating it. Using this option requires caution because the
-system ID of the new VG may not match the system ID of the host running
-the command, leaving the VG inaccessible to the host. See
-.BR lvmsystemid (7).
-
-.SH PHYSICAL DEVICE OPTIONS
-The following options are available for initializing physical devices in the
-volume group. These options are further described in the \fBpvcreate\fP(8)
-man page.
-.TP
-.BR \-f ", " \-\-force
-.TP
-.BR \-y ", " \-\-yes
-.TP
-.BR \-Z ", " \-\-zero " {" \fIy | \fIn }
-.TP
-.B \-\-labelsector \fIsector
-.TP
-.B \-\-metadatasize \fIsize
-.TP
-.B \-\-pvmetadatacopies \fIcopies
-.TP
-.B \-\-dataalignment \fIalignment
-.TP
-.B \-\-dataalignmentoffset \fIalignment_offset
-.SH Examples
-Creates a volume group named "test_vg" using physical volumes "/dev/sdk1"
-and "/dev/sdl1" with default physical extent size of 4MiB:
-.sp
-.B vgcreate test_vg /dev/sdk1 /dev/sdl1
-
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvdisplay (8),
-.BR pvcreate (8),
-.BR vgdisplay (8),
-.BR vgextend (8),
-.BR vgreduce (8),
-.BR lvcreate (8),
-.BR lvdisplay (8),
-.BR lvextend (8),
-.BR lvreduce (8)
diff --git a/man/vgdisplay.8.des b/man/vgdisplay.8.des
new file mode 100644
index 0000000..c42f821
--- /dev/null
+++ b/man/vgdisplay.8.des
@@ -0,0 +1,4 @@
+vgdisplay shows the attributes of VGs, and the associated PVs and LVs.
+
+\fBvgs\fP(8) is a preferred alternative that shows the same information
+and more, using a more compact and configurable output format.
diff --git a/man/vgdisplay.8.in b/man/vgdisplay.8.in
deleted file mode 100644
index 045a6ae..0000000
--- a/man/vgdisplay.8.in
+++ /dev/null
@@ -1,123 +0,0 @@
-.TH VGDISPLAY 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgdisplay \(em display attributes of volume groups
-.SH SYNOPSIS
-.B vgdisplay
-.RB [ \-A | \-\-activevolumegroups ]
-.RB [ \-c | \-\-colon ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-s | \-\-short ]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-ignoreskippedcluster ]
-.RB [ \-\-nosuffix ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-units
-.IR hHbBsSkKmMgGtTpPeE ]
-.RB [ \-\-version ]
-.RI [ VolumeGroupName ...]
-.br
-
-.br
-.B vgdisplay
-.BR \-C | \-\-columns
-.RB [ \-\-aligned ]
-.RB [ \-\-binary ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [[ \-\-configreport
-.IR ReportName ]
-.RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field1 [, Field2 ...]
-.RB [ \-O | \-\-sort
-.RI [ + | \- ] Key1 [, Key2 ...]]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB ...]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-ignoreskippedcluster ]
-.RB [ \-\-logonly ]
-.RB [ \-\-noheadings ]
-.RB [ \-\-nosuffix ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-separator
-.IR Separator ]
-.RB [ \-\-unbuffered ]
-.RB [ \-\-units
-.IR hHbBsSkKmMgGtTpPeE ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RI [ VolumeGroupName ...]
-.SH DESCRIPTION
-vgdisplay allows you to see the attributes of
-.I VolumeGroupName
-(or all volume groups if none is given) with it's physical and logical
-volumes and their sizes etc.
-.P
-\fBvgs\fP(8) is an alternative that provides the same information
-in the style of \fBps\fP(1).
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-A ", " \-\-activevolumegroups
-Only select the active volume groups. The volume group is considered active
-if at least one of its logical volumes is active.
-.TP
-.BR \-C ", " \-\-columns
-Display output in columns, the equivalent of \fBvgs\fP(8).
-Options listed are the same as options given in \fPvgs\fP(8).
-.TP
-.BR \-c ", " \-\-colon
-Generate colon separated output for easier parsing in scripts or programs.
-N.B. \fBvgs\fP(8) provides considerably more control over the output.
-.nf
-
-The values are:
-
-1 volume group name
-2 volume group access
-3 volume group status
-4 internal volume group number
-5 maximum number of logical volumes
-6 current number of logical volumes
-7 open count of all logical volumes in this volume group
-8 maximum logical volume size
-9 maximum number of physical volumes
-10 current number of physical volumes
-11 actual number of physical volumes
-12 size of volume group in kilobytes
-13 physical extent size
-14 total number of physical extents for this volume group
-15 allocated number of physical extents for this volume group
-16 free number of physical extents for this volume group
-17 uuid of volume group
-
-.fi
-.TP
-.BR \-s ", " \-\-short
-Give a short listing showing the existence of volume groups.
-.TP
-.BR \-v ", " \-\-verbose
-Display verbose information containing long listings of physical
-and logical volumes. If given twice, also display verbose runtime
-information of vgdisplay's activities.
-.TP
-.B \-\-version
-Display version and exit successfully.
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgs (8),
-.BR pvcreate (8),
-.BR vgcreate (8),
-.BR lvcreate (8)
diff --git a/man/vgexport.8.des b/man/vgexport.8.des
new file mode 100644
index 0000000..f9fa49c
--- /dev/null
+++ b/man/vgexport.8.des
@@ -0,0 +1,8 @@
+vgexport makes inactive VGs unknown to the system. In this state, all the
+PVs in the VG can be moved to a different system, from which
+\fBvgimport\fP can then be run.
+
+Most LVM tools ignore exported VGs.
+
+vgexport clears the VG system ID, and vgimport sets the VG system ID to
+match the host running vgimport (if the host has a system ID).
diff --git a/man/vgexport.8.in b/man/vgexport.8.in
deleted file mode 100644
index 6e2ecbf..0000000
--- a/man/vgexport.8.in
+++ /dev/null
@@ -1,37 +0,0 @@
-.TH VGEXPORT 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgexport \- make volume groups unknown to the system
-.SH SYNOPSIS
-.B vgexport
-.RB [ \-a | \-\-all ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB [ \-v | \-\-verbose ]
-.RI [ VolumeGroupName ...]
-.SH DESCRIPTION
-vgexport allows you to make the inactive
-.IR VolumeGroupName (s)
-unknown to the system.
-You can then move all the Physical Volumes in that Volume Group to
-a different system for later
-.BR vgimport (8).
-Most LVM2 tools ignore exported Volume Groups.
-vgexport clears the VG system ID, and vgimport sets the VG system ID
-to match the host running vgimport (if the host has a system ID).
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-a ", " \-\-all
-Export all inactive Volume Groups.
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvscan (8),
-.BR vgimport (8),
-.BR vgscan (8),
-.BR lvmsystemid (7)
diff --git a/man/vgextend.8.des b/man/vgextend.8.des
new file mode 100644
index 0000000..85fe6fc
--- /dev/null
+++ b/man/vgextend.8.des
@@ -0,0 +1,11 @@
+vgextend adds one or more PVs to a VG. This increases the space available
+for LVs in the VG.
+
+Also, PVs that have gone missing and then returned, e.g. due to a
+transient device failure, can be added back to the VG without
+re-initializing them (see \-\-restoremissing).
+
+If the specified PVs have not yet been initialized with pvcreate, vgextend
+will initialize them. In this case pvcreate options can be used, e.g.
+\-\-labelsector, \-\-metadatasize, \-\-metadataignore,
+\-\-pvmetadatacopies, \-\-dataalignment, \-\-dataalignmentoffset.
diff --git a/man/vgextend.8.end b/man/vgextend.8.end
new file mode 100644
index 0000000..e50fcce
--- /dev/null
+++ b/man/vgextend.8.end
@@ -0,0 +1,6 @@
+.SH EXAMPLES
+
+Add two PVs to a VG.
+.br
+.B vgextend vg00 /dev/sda4 /dev/sdn1
+
diff --git a/man/vgextend.8.in b/man/vgextend.8.in
deleted file mode 100644
index 51bd615..0000000
--- a/man/vgextend.8.in
+++ /dev/null
@@ -1,71 +0,0 @@
-.TH VGEXTEND 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgextend \(em add physical volumes to a volume group
-.SH SYNOPSIS
-.B vgextend
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-restoremissing ]
-.RB [ \-f | \-\-force ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RB [ "PHYSICAL DEVICE OPTIONS" ]
-.I VolumeGroupName PhysicalDevicePath
-.RI [ PhysicalDevicePath ...]
-.SH DESCRIPTION
-vgextend allows you to add one or more initialized physical volumes
-(see \fBpvcreate\fP(8)) to an existing volume group to extend it in size. Moreover, it allows you to
-re-add a physical volume that has gone missing previously, due to a transient
-device failure, without re-initialising it. Use
-\fBvgextend \-\-restoremissing\fP to that effect.
-.sp
-If \fIPhysicalDevicePath\fP was not previously configured for LVM with
-\fBpvcreate\fP(8), the device will be initialized with the same
-default values used with \fBpvcreate\fP(8). If non-default
-\fPpvcreate\fP(8) values are desired, they may be given on the
-commandline with the same options as \fPpvcreate\fP(8). See
-.B PHYSICAL DEVICE OPTIONS
-for available options. Note that the restore-related options such as
-.BR \-\-restorefile ", " \-\-uuid " and " \-\-physicalvolumesize
-are not available. If a restore operation
-is needed, use \fBpvcreate\fP(8) and \fBvgcfgrestore\fP(8).
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.SH PHYSICAL DEVICE OPTIONS
-The following options are available for initializing physical devices in the
-volume group. These options are further described in the
-\fBpvcreate\fP(8) man page.
-.TP
-.BR \-f ", " \-\-force
-.TP
-.BR \-y ", " \-\-yes
-.TP
-.BR \-Z ", " \-\-zero " {" \fIy | \fIn }
-.TP
-.B \-\-labelsector \fIsector
-.TP
-.B \-\-metadatasize \fIsize
-.TP
-.BR \-\-metadataignore " {" \fIy | \fIn }
-.TP
-.B \-\-pvmetadatacopies \fIcopies
-.TP
-.B \-\-dataalignment \fIalignment
-.TP
-.B \-\-dataalignmentoffset \fIalignment_offset
-.SH Examples
-Extends the existing volume group "vg00" by the new physical volumes
-(see \fBpvcreate\fP(8)) "/dev/sda4" and "/dev/sdn1".
-.sp
-.B vgextend vg00 /dev/sda4 /dev/sdn1
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgcreate (8),
-.BR vgreduce (8),
-.BR pvcreate (8)
diff --git a/man/vgimport.8.des b/man/vgimport.8.des
new file mode 100644
index 0000000..91196b6
--- /dev/null
+++ b/man/vgimport.8.des
@@ -0,0 +1,5 @@
+vgimport makes exported VGs known to the system again, perhaps after
+moving the PVs from a different system.
+
+vgexport clears the VG system ID, and vgimport sets the VG system ID to
+match the host running vgimport (if the host has a system ID).
diff --git a/man/vgimport.8.in b/man/vgimport.8.in
deleted file mode 100644
index ba4fdf9..0000000
--- a/man/vgimport.8.in
+++ /dev/null
@@ -1,38 +0,0 @@
-.TH VGIMPORT 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgimport \(em make exported volume groups known to the system
-.SH SYNOPSIS
-.B vgimport
-.RB [ \-a | \-\-all ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB [ \-v | \-\-verbose ]
-.RI [ VolumeGroupName ...]
-.SH DESCRIPTION
-vgimport allows you to make a Volume Group that was previously
-exported using
-.BR vgexport (8)
-known to the system again, perhaps after moving its Physical Volumes
-from a different machine.
-vgexport clears the VG system ID, and vgimport sets the VG system ID
-to match the host running vgimport (if the host has a system ID).
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-a ", " \-\-all
-Import all exported Volume Groups.
-.TP
-.BR \-\-force
-Import exported Volume Groups even if there are missing Physical Volumes.
-This option should only be used if the missing devices are known to have
-failed and they cannot be restored.
-.SH SEE ALSO
-.BR lvm (8),
-.BR pvscan (8),
-.BR vgexport (8),
-.BR vgscan (8),
-.BR lvmsystemid (7)
diff --git a/man/vgimportclone.8.des b/man/vgimportclone.8.des
new file mode 100644
index 0000000..a5002da
--- /dev/null
+++ b/man/vgimportclone.8.des
@@ -0,0 +1,6 @@
+vgimportclone imports a VG from duplicated PVs, e.g. created by a hardware
+snapshot of existing PVs.
+
+A duplicated VG cannot used until it is made to coexist with the original
+VG. vgimportclone renames the VG associated with the specified PVs and
+changes the associated VG and PV UUIDs.
diff --git a/man/vgimportclone.8.end b/man/vgimportclone.8.end
new file mode 100644
index 0000000..83394b5
--- /dev/null
+++ b/man/vgimportclone.8.end
@@ -0,0 +1,9 @@
+.SH EXAMPLES
+
+An original VG "vg00" has PVs "/dev/sda" and "/dev/sdb".
+The corresponding PVs from a hardware snapshot are "/dev/sdc" and "/dev/sdd".
+Rename the VG associated with "/dev/sdc" and "/dev/sdd" from "vg00" to "vg00_snap"
+(and change associated UUIDs).
+.br
+.B vgimportclone \-\-basevgname vg00_snap /dev/sdc /dev/sdd
+
diff --git a/man/vgimportclone.8.in b/man/vgimportclone.8.in
deleted file mode 100644
index cdf5e68..0000000
--- a/man/vgimportclone.8.in
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH VGIMPORTCLONE 8 "LVM TOOLS #VERSION#" "Red Hat, Inc." \" -*- nroff -*-
-.SH NAME
-vgimportclone \(em import and rename duplicated volume group (e.g. a hardware snapshot)
-.SH SYNOPSIS
-.B vgimportclone
-.RB [ \-n | \-\-basevgname
-.IR VolumeGroupName ]
-.RB [ \-i | \-\-import ]
-.I PhysicalVolume
-.RI [ PhysicalVolume ...]
-.SH DESCRIPTION
-vgimportclone is used to import a duplicated VG (e.g. hardware snapshot).
-Duplicate VG(s) and PV(s) are not able to be used until they are made
-to coexist with the origin VG(s) and PV(s).
-vgimportclone renames the VG associated with the specified PV(s) and
-changes the associated VG and PV UUIDs.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-n ", " \-\-basevgname " " \fIVolumeGroupName
-By default the snapshot VG will be renamed to the original name plus a
-numeric suffix to avoid duplicate naming (e.g. 'test_vg' would be renamed
-to 'test_vg1'). This option will override the base VG name that is
-used for all VG renames. If a VG already exists with the specified name
-a numeric suffix will be added (like the previous example) to make it unique.
-.TP
-.BR \-i ", " \-\-import
-Import exported Volume Groups. Otherwise VGs that have been exported
-will not be changed (nor will their associated PVs).
-.SH ENVIRONMENT VARIABLES
-.TP
-.B LVM_BINARY
-The LVM2 binary to use. Defaults to "lvm".
-.SH Examples
-The origin VG "vg00" has origin PVs "/dev/sda" and "/dev/sdb"
-and the respective snapshot PVs are "/dev/sdc" and "/dev/sdd".
-To rename the VG associated with "/dev/sdc" and "/dev/sdd"
-from "vg00" to "vg00_snap"
-(and to change associated VG and PV UUIDs) do:
-.sp
-.B vgimportclone \-\-basevgname vg00_snap /dev/sdc /dev/sdd
-
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgrename (8)
-
diff --git a/man/vgmerge.8.des b/man/vgmerge.8.des
new file mode 100644
index 0000000..ff7c177
--- /dev/null
+++ b/man/vgmerge.8.des
@@ -0,0 +1,3 @@
+vgmerge merges two existing VGs. The inactive source VG is merged into the
+destination VG if physical extent sizes are equal and PV and LV summaries
+of both VGs fit into the destination VG's limits.
diff --git a/man/vgmerge.8.end b/man/vgmerge.8.end
new file mode 100644
index 0000000..9787c6a
--- /dev/null
+++ b/man/vgmerge.8.end
@@ -0,0 +1,7 @@
+.SH EXAMPLES
+
+Merge an inactive VG named "vg00" into the active or inactive VG named
+"databases", giving verbose runtime information.
+.br
+.B vgmerge \-v databases vg00
+
diff --git a/man/vgmerge.8.in b/man/vgmerge.8.in
deleted file mode 100644
index bfc8c34..0000000
--- a/man/vgmerge.8.in
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH VGMERGE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgmerge \(em merge two volume groups
-.SH SYNOPSIS
-.B vgmerge
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-l | \-\-list ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.I DestinationVolumeGroupName
-.I SourceVolumeGroupName
-.SH DESCRIPTION
-vgmerge merges two existing volume groups. The inactive
-\fISourceVolumeGroupName\fP will be merged into
-the \fIDestinationVolumeGroupName\fP if physical extent sizes
-are equal and physical and logical volume summaries of both volume groups
-fit into \fIDestinationVolumeGroupName\fP's limits.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-l ", " \-\-list
-Display merged \fIDestinationVolumeGroupName\fP like \fBvgdisplay \-v\fP.
-.TP
-.BR \-t ", " \-\-test
-Do a test run WITHOUT making any real changes.
-.SH Examples
-Merge the inactive volume group named "my_vg"
-into the active or inactive volume group named "databases" giving verbose
-runtime information:
-.sp
-.B vgmerge \-v databases my_vg
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgcreate (8),
-.BR vgextend (8),
-.BR vgreduce (8)
diff --git a/man/vgmknodes.8.des b/man/vgmknodes.8.des
new file mode 100644
index 0000000..a93d629
--- /dev/null
+++ b/man/vgmknodes.8.des
@@ -0,0 +1,5 @@
+vgmknodes checks the LVM device nodes in /dev that are needed for active
+LVs and creates any that are missing and removes unused ones.
+
+This command should not usually be needed if all the system components are
+interoperating correctly.
diff --git a/man/vgmknodes.8.in b/man/vgmknodes.8.in
deleted file mode 100644
index c5bb5d4..0000000
--- a/man/vgmknodes.8.in
+++ /dev/null
@@ -1,30 +0,0 @@
-.TH VGMKNODES 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgmknodes \(em recreate volume group directory and logical volume special files
-.SH SYNOPSIS
-.B vgmknodes
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-\-refresh ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-v | \-\-verbose ]
-.RI [[ VolumeGroupName | LogicalVolumePath ]...]
-.SH DESCRIPTION
-Checks the LVM2 special files in /dev that are needed for active
-logical volumes and creates any missing ones and removes unused ones.
-.SH OPTIONS
-.TP
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-\-refresh
-If any logical volume in the volume group is active, reload its metadata.
-This is not necessary in normal operation, but may be useful
-if something has gone wrong or if you're doing clustering
-manually without a clustered lock manager.
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgscan (8),
-.BR dmsetup (8)
diff --git a/man/vgreduce.8.des b/man/vgreduce.8.des
new file mode 100644
index 0000000..1bcdaf9
--- /dev/null
+++ b/man/vgreduce.8.des
@@ -0,0 +1 @@
+vgreduce removes one or more unused PVs from a VG.
diff --git a/man/vgreduce.8.in b/man/vgreduce.8.in
deleted file mode 100644
index cce31e8..0000000
--- a/man/vgreduce.8.in
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH VGREDUCE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgreduce \(em reduce a volume group
-.SH SYNOPSIS
-.B vgreduce
-.RB [ \-a | \-\-all ]
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-removemissing ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.I VolumeGroupName
-.RI [ PhysicalVolumePath ...]
-.SH DESCRIPTION
-vgreduce allows you to remove one or more unused physical volumes
-from a volume group.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-a ", " \-\-all
-Removes all empty physical volumes if none are given on command line.
-.TP
-.B \-\-removemissing
-Removes all missing physical volumes from the volume group, if there are no
-logical volumes allocated on those. This resumes normal operation of the volume
-group (new logical volumes may again be created, changed and so on).
-
-If this is not possible (there are logical volumes referencing the missing
-physical volumes) and you cannot or do not want to remove them manually, you
-can run this option with \fB\-\-force\fP to have \fBvgreduce\fP
-remove any partial LVs.
-
-Any logical volumes and dependent snapshots that were partly on the
-missing disks get removed completely. This includes those parts
-that lie on disks that are still present.
-
-If your logical volumes spanned several disks including the ones that are
-lost, you might want to try to salvage data first by activating your
-logical volumes with \fB\-\-partial\fP as described in \fBlvm\fP(8).
-
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgextend (8)
diff --git a/man/vgremove.8.des b/man/vgremove.8.des
new file mode 100644
index 0000000..04dc0e3
--- /dev/null
+++ b/man/vgremove.8.des
@@ -0,0 +1,6 @@
+vgremove removes one or more VGs. If LVs exist in the VG, a prompt is used
+to confirm LV removal.
+
+If one or more PVs in the VG are lost, consider
+\fBvgreduce \-\-removemissing\fP to make the VG
+metadata consistent again.
diff --git a/man/vgremove.8.in b/man/vgremove.8.in
deleted file mode 100644
index 4e600ef..0000000
--- a/man/vgremove.8.in
+++ /dev/null
@@ -1,46 +0,0 @@
-.TH VGREMOVE 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgremove \(em remove a volume group
-.SH SYNOPSIS
-.B vgremove
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-f | \-\-force ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-noudevsync ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.RI [ VolumeGroupName ...]
-.SH DESCRIPTION
-vgremove allows you to remove one or more volume groups.
-If one or more physical volumes in the volume group are lost,
-consider \fBvgreduce \-\-removemissing\fP to make the volume group
-metadata consistent again.
-.sp
-If there are logical volumes that exist in the volume group,
-a prompt will be given to confirm removal. You can override
-the prompt with \fB\-f\fP.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.BR \-f ", " \-\-force
-Force the removal of any logical volumes on the volume group
-without confirmation.
-To remove also damaged pool volumes use \-ff.
-.TP
-.BR \-\-noudevsync
-Disable udev synchronisation. The
-process will not wait for notification from udev.
-It will continue irrespective of any possible udev processing
-in the background. You should only use this if udev is not running
-or has rules that ignore the devices LVM2 creates.
-.SH SEE ALSO
-.BR lvm (8),
-.BR lvremove (8),
-.BR vgcreate (8),
-.BR vgreduce (8)
diff --git a/man/vgrename.8.des b/man/vgrename.8.des
new file mode 100644
index 0000000..2384b6b
--- /dev/null
+++ b/man/vgrename.8.des
@@ -0,0 +1,9 @@
+vgrename renames a VG.
+
+All VGs visible to a system need to have different names, otherwise many
+LVM commands will refuse to run or give warning messages. VGs with the
+same name can occur when disks are moved between machines, or filters are
+changed. If a newly connected disk has a VG with the same name as the VG
+containing the root filesystem, the machine may not boot correctly. When
+two VGs have the same name, the VG UUID can be used in place of the source
+VG name.
diff --git a/man/vgrename.8.end b/man/vgrename.8.end
new file mode 100644
index 0000000..98eeb53
--- /dev/null
+++ b/man/vgrename.8.end
@@ -0,0 +1,10 @@
+.SH EXAMPLES
+
+Rename VG "vg02" to "myvg":
+.br
+.B vgrename "vg02" "myvg"
+
+Rename the VG with the specified UUID to "myvg".
+.br
+.B vgrename Zvlifi\-Ep3t\-e0Ng\-U42h\-o0ye\-KHu1\-nl7Ns4 myvg
+
diff --git a/man/vgrename.8.in b/man/vgrename.8.in
deleted file mode 100644
index 322d740..0000000
--- a/man/vgrename.8.in
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH VGRENAME 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgrename \(em rename a volume group
-.SH SYNOPSIS
-.B vgrename
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.IR OldVolumeGroup { Path | Name | UUID }
-.IR NewVolumeGroup { Path | Name }
-.SH DESCRIPTION
-vgrename renames an existing (see
-.BR vgcreate (8))
-volume group from
-.IR OldVolumeGroup { Name | Path | UUID }
-to
-.IR NewVolumeGroup { Name | Path }.
-
-All the Volume Groups visible to a system need to have different
-names. Otherwise many LVM2 commands will refuse to run or give
-warning messages.
-
-This situation could arise when disks are moved between machines. If
-a disk is connected and it contains a Volume Group with the same name
-as the Volume Group containing your root filesystem the machine might
-not even boot correctly. However, the two Volume Groups should have
-different UUIDs (unless the disk was cloned) so you can rename
-one of the conflicting Volume Groups with
-\fBvgrename\fP.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.SH Examples
-Renames existing volume group vg02 to my_volume_group:
-.sp
-.B vgrename /dev/vg02 /dev/my_volume_group
-
-or
-.sp
-.B vgrename vg02 my_volume_group
-
-Changes the name of the Volume Group with UUID
-.br
-Zvlifi-Ep3t-e0Ng-U42h-o0ye-KHu1-nl7Ns4 to VolGroup00_tmp:
-.sp
-.B vgrename Zvlifi\-Ep3t\-e0Ng\-U42h\-o0ye\-KHu1\-nl7Ns4 VolGroup00_tmp
-
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgchange (8),
-.BR vgcreate (8),
-.BR lvrename (8)
diff --git a/man/vgs.8.des b/man/vgs.8.des
new file mode 100644
index 0000000..15bdb97
--- /dev/null
+++ b/man/vgs.8.des
@@ -0,0 +1 @@
+vgs produces formatted output about VGs.
diff --git a/man/vgs.8.end b/man/vgs.8.end
new file mode 100644
index 0000000..b8cda26
--- /dev/null
+++ b/man/vgs.8.end
@@ -0,0 +1,17 @@
+.SH NOTES
+.
+The vg_attr bits are:
+.IP 1 3
+Permissions: (w)riteable, (r)ead-only
+.IP 2 3
+Resi(z)eable
+.IP 3 3
+E(x)ported
+.IP 4 3
+(p)artial: one or more physical volumes belonging to the volume group
+are missing from the system
+.IP 5 3
+Allocation policy: (c)ontiguous, c(l)ing, (n)ormal, (a)nywhere
+.IP 6 3
+(c)lustered, (s)hared
+
diff --git a/man/vgs.8.in b/man/vgs.8.in
deleted file mode 100644
index 080086c..0000000
--- a/man/vgs.8.in
+++ /dev/null
@@ -1,161 +0,0 @@
-.TH VGS 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgs \(em report information about volume groups
-.SH SYNOPSIS
-.B vgs
-.RB [ \-a | \-\-all ]
-.RB [ \-\-aligned ]
-.RB [ \-\-binary ]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [[ \-\-configreport
-.IR ReportName ]
-.RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field1 [, Field2 ...]
-.RB [ \-O | \-\-sort
-.RI [ + | \- ] Key1 [, Key2 ...]]
-.RB [ \-S | \-\-select
-.IR Selection ]
-.RB ...]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-ignoreskippedcluster ]
-.RB [ \-\-logonly ]
-.RB [ \-\-nameprefixes ]
-.RB [ \-\-noheadings ]
-.RB [ \-\-nosuffix ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-\-rows ]
-.RB [ \-\-separator
-.IR Separator ]
-.RB [ \-\-unbuffered ]
-.RB [ \-\-units
-.IR hHbBsSkKmMgGtTpPeE ]
-.RB [ \-\-unquoted ]
-.RB [ \-v | \-\-verbose ]
-.RB [ \-\-version ]
-.RI [ VolumeGroupName
-.RI [ VolumeGroupName ...]]
-.SH DESCRIPTION
-vgs produces formatted output about volume groups.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.B \-\-all
-List all volume groups. Equivalent to not specifying any volume groups.
-.TP
-.B \-\-aligned
-Use with \fB\-\-separator\fP to align the output columns.
-.TP
-.B \-\-binary
-Use binary values "0" or "1" instead of descriptive literal values
-for columns that have exactly two valid values to report (not counting
-the "unknown" value which denotes that the value could not be determined).
-.TP
-.B \-\-configreport \fI ReportName
-Make any subsequent \fB\-o, \-\-options\fP, \fB\-O, \-\-sort\fP or
-\fB\-S, \-\-select\fP to apply for \fIReportName\fP where \fIReportName\fP
-is either 'vg' for command's main report or 'log' for log report.
-If \fB\-\-configreport\fP option is not used to identify a report, then
-command's main report is assumed. The log report is available only if
-enabled by \fBlog/report_command_log\fP \fBlvm.conf\fP(5) setting or
-if \fB\-\-logonly\fP option is used.
-.TP
-.B \-\-logonly
-Suppress the vgs report itself and display only log report on output.
-.TP
-.B \-\-nameprefixes
-Add an "LVM2_" prefix plus the field name to the output. Useful
-with \fB\-\-noheadings\fP to produce a list of field=value pairs that can
-be used to set environment variables (for example, in \fBudev\fP(7) rules).
-.TP
-.B \-\-noheadings
-Suppress the headings line that is normally the first line of output.
-Useful if grepping the output.
-.TP
-.B \-\-nosuffix
-Suppress the suffix on output sizes. Use with \fB\-\-units\fP
-(except h and H) if processing the output.
-.TP
-.BR \-o ", " \-\-options
-Comma-separated ordered list of columns.
-.IP
-Precede the list with '\fI+\fP' to append to the current list
-of columns, '\fI-\fP' to remove from the current list of columns
-or '\fI#\fP' to compact given columns. The \fI\-o\fP option can
-be repeated, providing several lists. These lists are evaluated
-from left to right.
-.IP
-Use \fB\-o vg_all\fP to select all volume group columns.
-.IP
-Use \fB\-o help\fP to view the full list of columns available.
-.IP
-Column names include: vg_fmt, vg_uuid, vg_name, vg_attr, vg_size, vg_free,
-vg_sysid, vg_extent_size, vg_extent_count, vg_free_count, vg_profile, max_lv,
-max_pv, pv_count, lv_count, snap_count, vg_seqno, vg_tags, vg_mda_count,
-vg_mda_free, and vg_mda_size, vg_mda_used_count.
-.IP
-Any "vg_" prefixes are optional. Columns mentioned in either \fBpvs\fP(8)
-or \fBlvs\fP(8) can also be chosen, but columns cannot be taken from both
-at the same time.
-.IP
-The vg_attr bits are:
-.RS
-.IP 1 3
-Permissions: (w)riteable, (r)ead-only
-.IP 2 3
-Resi(z)eable
-.IP 3 3
-E(x)ported
-.IP 4 3
-(p)artial: one or more physical volumes belonging to the volume group
-are missing from the system
-.IP 5 3
-Allocation policy: (c)ontiguous, c(l)ing, (n)ormal, (a)nywhere
-.IP 6 3
-(c)lustered, (s)hared
-.RE
-.TP
-.BR \-O ", " \-\-sort
-Comma-separated ordered list of columns to sort by. Replaces the default
-selection. Precede any column with '\fI\-\fP' for a reverse sort on that
-column.
-.TP
-.B \-\-rows
-Output columns as rows.
-.TP
-.BR \-S ", " \-\-select " " \fISelection
-Display only rows that match Selection criteria. All rows are displayed with
-the additional "selected" column (\fB-o selected\fP) showing 1 if the row
-matches the Selection and 0 otherwise. The Selection criteria are defined
-by specifying column names and their valid values (that can include reserved
-values) while making use of supported comparison operators. See \fBlvm\fP(8)
-and \fB\-S\fP, \fB\-\-select\fP description for more detailed information
-about constructing the Selection criteria. As a quick help and to see full
-list of column names that can be used in Selection including the list of
-reserved values and the set of supported selection operators, check the
-output of \fBvgs -S help\fP command.
-.TP
-.B \-\-separator \fISeparator
-String to use to separate each column. Useful if grepping the output.
-.TP
-.B \-\-unbuffered
-Produce output immediately without sorting or aligning the columns properly.
-.TP
-.B \-\-units \fIhHbBsSkKmMgGtTpPeE
-All sizes are output in these units: (h)uman-readable, (b)ytes, (s)ectors,
-(k)ilobytes, (m)egabytes, (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.
-Capitalise to use multiples of 1000 (S.I.) instead of 1024. Can also specify
-custom units e.g. \-\-units 3M
-.TP
-.B \-\-unquoted
-When used with \fB\-\-nameprefixes\fP, output values in the field=value
-pairs are not quoted.
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgdisplay (8),
-.BR pvs (8),
-.BR lvs (8)
diff --git a/man/vgscan.8.des b/man/vgscan.8.des
new file mode 100644
index 0000000..e8041ed
--- /dev/null
+++ b/man/vgscan.8.des
@@ -0,0 +1 @@
+vgscan scans all supported LVM block devices in the system for VGs.
diff --git a/man/vgscan.8.in b/man/vgscan.8.in
deleted file mode 100644
index e85d817..0000000
--- a/man/vgscan.8.in
+++ /dev/null
@@ -1,43 +0,0 @@
-.TH VGSCAN 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgscan \(em scan all disks for volume groups and rebuild caches
-.SH SYNOPSIS
-.B vgscan
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-? | \-\-help ]
-.RB [ \-\-ignorelockingfailure ]
-.RB [ \-\-mknodes ]
-.RB [ \-\-notifydbus ]
-.RB [ \-P | \-\-partial ]
-.RB [ \-\-reportformat
-.RB { basic | json }]
-.RB [ \-v | \-\-verbose ]
-.SH DESCRIPTION
-vgscan scans all SCSI, (E)IDE disks, multiple devices and a bunch
-of other disk devices in the system looking for LVM physical volumes
-and volume groups. Define a filter in \fBlvm.conf\fP(5) to restrict
-the scan to avoid a CD ROM, for example.
-.LP
-In LVM2, vgscans take place automatically; but you might still need to
-run one explicitly after changing hardware.
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.TP
-.B \-\-mknodes
-Also checks the LVM special files in /dev that are needed for active
-logical volumes and creates any missing ones and removes unused ones.
-.TP
-.B \-\-notifydbus
-Send a notification to D-Bus. The command will exit with an error
-if LVM is not built with support for D-Bus notification, or if the
-notify_dbus config setting is disabled.
-.TP
-.B \-\-cache
-Scan devices for LVM physical volumes and volume groups and instruct
-the lvmetad daemon to update its cached state accordingly.
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgcreate (8),
-.BR vgchange (8)
diff --git a/man/vgsplit.8.des b/man/vgsplit.8.des
new file mode 100644
index 0000000..29eb5c5
--- /dev/null
+++ b/man/vgsplit.8.des
@@ -0,0 +1,13 @@
+vgsplit moves one or more PVs from a source VG to a destination VG. The
+PVs can be specified explicitly or implicitly by naming an LV, in which
+case on PVs underlying the LV are moved.
+
+If the destination VG does not exist, a new VG is created (command options
+can be used to specify properties of the new VG, also see
+\fBvgcreate\fP(8).)
+
+LVs cannot be split between VGs; each LV must be entirely on the PVs in
+the source or destination VG.
+
+vgsplit can only move complete PVs. (See \fBpvmove\fP(8) for moving part
+of a PV.)
diff --git a/man/vgsplit.8.in b/man/vgsplit.8.in
deleted file mode 100644
index 5939ed5..0000000
--- a/man/vgsplit.8.in
+++ /dev/null
@@ -1,80 +0,0 @@
-.TH VGSPLIT 8 "LVM TOOLS #VERSION#" "Sistina Software UK" \" -*- nroff -*-
-.SH NAME
-vgsplit \(em split a volume group into two
-.SH SYNOPSIS
-.B vgsplit
-.RB [ \-\-alloc
-.IR AllocationPolicy ]
-.RB [ \-A | \-\-autobackup
-.RI { y | n }]
-.RB [ \-c | \-\-clustered
-.RI { y | n }]
-.RB [ \-\-commandprofile
-.IR ProfileName ]
-.RB [ \-d | \-\-debug ]
-.RB [ \-h | \-\-help ]
-.RB [ \-l | \-\-maxlogicalvolumes
-.IR MaxLogicalVolumes ]
-.RB [ \-M | \-\-metadatatype
-.IR type ]
-.RB [ \-p | \-\-maxphysicalvolumes
-.IR MaxPhysicalVolumes ]
-.RB [ \-\- [ vg ] metadatacopies
-.IR NumberOfCopies | unmanaged | all ]
-.RB [ \-n | \-\-name
-.IR LogicalVolumeName ]
-.RB [ \-t | \-\-test ]
-.RB [ \-v | \-\-verbose ]
-.I SourceVolumeGroupName DestinationVolumeGroupName
-.RI [ PhysicalVolumePath ...]
-.SH DESCRIPTION
-vgsplit moves one or more physical volumes from
-\fISourceVolumeGroupName\fP into \fIDestinationVolumeGroupName\fP.
-The physical volumes moved can be specified either explicitly via
-\fIPhysicalVolumePath\fP, or implicitly by \fB\-n\fP
-\fILogicalVolumeName\fP, in which case only physical volumes
-underlying the specified logical volume will be moved.
-
-If \fIDestinationVolumeGroupName\fP does not exist, a new volume
-group will be created. The default attributes
-for the new volume group can be specified with
-.BR \-\-alloc ,
-.BR \-\-clustered ,
-.BR \-\-maxlogicalvolumes ,
-.BR \-\-metadatatype ,
-.B \-\-maxphysicalvolumes \fRand
-.BR \-\- [ vg ] metadatacopies
-(see \fBvgcreate\fP(8) for a description of these options). If any
-of these options are not given, default attribute(s) are taken from
-\fISourceVolumeGroupName\fP. If a non-LVM2 metadata type (e.g. lvm1) is
-being used, you should use the \fB\-M\fP option to specify the metadata
-type directly.
-
-If
-.I DestinationVolumeGroupName
-does exist, it will be checked for compatibility with
-.I SourceVolumeGroupName
-before the physical volumes are moved. Specifying any of the above default
-volume group attributes with an existing destination volume group is an error,
-and no split will occur.
-
-Logical volumes cannot be split between volume groups. \fBvgsplit\fP(8) only
-moves complete physical volumes: To move part of a physical volume, use
-\fBpvmove\fP(8). Each existing logical volume must be entirely on the physical
-volumes forming either the source or the destination volume group. For this
-reason, \fBvgsplit\fP(8) may fail with an error if a split would result in a
-logical volume being split across volume groups.
-
-A vgsplit into an existing volume group retains the existing volume group's
-value of \fPvgmetadatacopies\fP (see \fBvgcreate\fP(8) and \fBlvm.conf\fP(5) for further
-explanation of \fPvgmetadatacopies\fP). To change the value of
-\fBvgmetadatacopies\fP, use \fBvgchange\fP(8).
-
-.SH OPTIONS
-See \fBlvm\fP(8) for common options.
-.SH SEE ALSO
-.BR lvm (8),
-.BR vgcreate (8),
-.BR vgextend (8),
-.BR vgreduce (8),
-.BR vgmerge (8)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 1761be4..5aaba2f 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,3 @@
-
#
# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
# Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved.
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=13a6368522894e9d…
Commit: 13a6368522894e9d32544d8fb3d6360bbe9018d1
Parent: a1386dcca024b51019c1f3be6b153249df06dbac
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 7 15:12:24 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:21:58 2017 -0600
args: use arg parsing function for region size
Consolidate the validation of the region size arg
in a new arg parsing function.
---
lib/config/config_settings.h | 9 ++++---
lib/metadata/lv_manip.c | 7 ++++++
tools/args.h | 6 +---
tools/command-lines.in | 8 +++---
tools/command.c | 1 +
tools/lvconvert.c | 43 ++---------------------------------------
tools/lvcreate.c | 14 -------------
tools/lvmcmdline.c | 39 ++++++++++++++++++++++++++++++++++++++
tools/tools.h | 1 +
tools/vals.h | 5 ++++
10 files changed, 67 insertions(+), 66 deletions(-)
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index 1d9603f..2b76526 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -1221,14 +1221,15 @@ cfg_array(activation_read_only_volume_list_CFG, "read_only_volume_list", activat
"read_only_volume_list = [ \"vg1\", \"vg2/lvol1\", \"@tag1\", \"@*\" ]\n"
"#\n")
-cfg(activation_mirror_region_size_CFG, "mirror_region_size", activation_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_RAID_REGION_SIZE, vsn(1, 0, 0), NULL, vsn(2, 2, 99),
+ cfg(activation_mirror_region_size_CFG, "mirror_region_size", activation_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_RAID_REGION_SIZE, vsn(1, 0, 0), NULL, vsn(2, 2, 99),
"This has been replaced by the activation/raid_region_size setting.\n",
- "Size in KiB of each copy operation when mirroring.\n")
+ "Size in KiB of each raid or mirror synchronization region.\n")
cfg(activation_raid_region_size_CFG, "raid_region_size", activation_CFG_SECTION, 0, CFG_TYPE_INT, DEFAULT_RAID_REGION_SIZE, vsn(2, 2, 99), NULL, 0, NULL,
"Size in KiB of each raid or mirror synchronization region.\n"
- "For raid or mirror segment types, this is the amount of data that is\n"
- "copied at once when initializing, or moved at once by pvmove.\n")
+ "The clean/dirty state of data is tracked for each region.\n"
+ "The value is rounded down to a power of two if necessary, and\n"
+ "is ignored if it is not a multiple of the machine memory page size.\n")
cfg(activation_error_when_full_CFG, "error_when_full", activation_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_ERROR_WHEN_FULL, vsn(2, 2, 115), NULL, 0, NULL,
"Return errors if a thin pool runs out of space.\n"
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index bc599de..d8f869d 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -712,6 +712,7 @@ static int _round_down_pow2(int r)
int get_default_region_size(struct cmd_context *cmd)
{
+ int pagesize = lvm_getpagesize();
int region_size = _get_default_region_size(cmd);
if (!is_power_of_2(region_size)) {
@@ -720,6 +721,12 @@ int get_default_region_size(struct cmd_context *cmd)
region_size / 2);
}
+ if (region_size % (pagesize >> SECTOR_SHIFT)) {
+ region_size = DEFAULT_RAID_REGION_SIZE * 2;
+ log_verbose("Using default region size %u kiB (multiple of page size).",
+ region_size / 2);
+ }
+
return region_size;
}
diff --git a/tools/args.h b/tools/args.h
index a481bc5..b33df9a 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -1212,10 +1212,8 @@ arg(resizefs_ARG, 'r', "resizefs", 0, 0, 0,
/* Not used */
arg(reset_ARG, 'R', "reset", 0, 0, 0, NULL)
-arg(regionsize_ARG, 'R', "regionsize", sizemb_VAL, 0, 0,
- "A mirror is divided into regions of this size, and the mirror log\n"
- "uses this granularity to track which regions are in sync.\n"
- "(This can be used with the \"mirror\" type, not the \"raid1\" type.)\n")
+arg(regionsize_ARG, 'R', "regionsize", regionsize_VAL, 0, 0,
+ "Size of each raid or mirror synchronization region.\n")
arg(physicalextentsize_ARG, 's', "physicalextentsize", sizemb_VAL, 0, 0,
"#vgcreate\n"
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 6743b79..1a9a796 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -317,7 +317,7 @@ RULE: all not LV_thinpool LV_cachepool
---
OO_LVCONVERT_RAID: --mirrors SNumber, --stripes_long Number,
---stripesize SizeKB, --regionsize SizeMB, --interval Number
+--stripesize SizeKB, --regionsize RegionSize, --interval Number
OO_LVCONVERT_POOL: --poolmetadata LV, --poolmetadatasize SizeMB,
--poolmetadataspare Bool, --readahead Readahead, --chunksize SizeKB
@@ -364,7 +364,7 @@ ID: lvconvert_raid_types
DESC: Convert LV to raid1 or mirror, or change number of mirror images.
RULE: all not lv_is_locked lv_is_pvmove
-lvconvert --regionsize SizeMB LV_raid
+lvconvert --regionsize RegionSize LV_raid
OO: OO_LVCONVERT
ID: lvconvert_change_region_size
DESC: Change the region size of an LV.
@@ -655,7 +655,7 @@ OO_LVCREATE_POOL: --poolmetadatasize SizeMB, --poolmetadataspare Bool, --chunksi
OO_LVCREATE_THIN: --discards Discards, --errorwhenfull Bool
OO_LVCREATE_RAID: --mirrors SNumber, --stripes Number, --stripesize SizeKB,
---regionsize SizeMB, --minrecoveryrate SizeKB, --maxrecoveryrate SizeKB
+--regionsize RegionSize, --minrecoveryrate SizeKB, --maxrecoveryrate SizeKB
---
@@ -712,7 +712,7 @@ DESC: Create a striped LV (infers --type striped).
---
lvcreate --type mirror --size SizeMB VG
-OO: --mirrors SNumber, --mirrorlog MirrorLog, --regionsize SizeMB, --stripes Number, OO_LVCREATE
+OO: --mirrors SNumber, --mirrorlog MirrorLog, --regionsize RegionSize, --stripes Number, OO_LVCREATE
OP: PV ...
ID: lvcreate_mirror
DESC: Create a mirror LV (also see --type raid1).
diff --git a/tools/command.c b/tools/command.c
index 59c9ea0..68566fa 100644
--- a/tools/command.c
+++ b/tools/command.c
@@ -75,6 +75,7 @@ static inline int segtype_arg(struct cmd_context *cmd, struct arg_values *av) {
static inline int alloc_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
static inline int locktype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
static inline int readahead_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int regionsize_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
static inline int vgmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
static inline int pvmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
static inline int metadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 4d6b1c9..502d614 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -146,8 +146,6 @@ static int _read_conversion_type(struct cmd_context *cmd,
static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp)
{
const char *vg_name = NULL;
- int region_size;
- int pagesize = lvm_getpagesize();
if (!_read_conversion_type(cmd, lp))
return_0;
@@ -249,45 +247,10 @@ static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp)
return 0;
}
- /*
- * --regionsize is only valid if converting an LV into a mirror.
- * Checked when we know the state of the LV being converted.
- */
- if (arg_is_set(cmd, regionsize_ARG)) {
- if (arg_sign_value(cmd, regionsize_ARG, SIGN_NONE) ==
- SIGN_MINUS) {
- log_error("Negative regionsize is invalid.");
- return 0;
- }
+ if (arg_is_set(cmd, regionsize_ARG))
lp->region_size = arg_uint_value(cmd, regionsize_ARG, 0);
- } else {
- region_size = get_default_region_size(cmd);
- if (region_size < 0) {
- log_error("Negative regionsize in "
- "configuration file is invalid.");
- return 0;
- }
- lp->region_size = region_size;
- }
-
- if (lp->region_size % (pagesize >> SECTOR_SHIFT)) {
- log_error("Region size (%" PRIu32 ") must be "
- "a multiple of machine memory "
- "page size (%d).",
- lp->region_size, pagesize >> SECTOR_SHIFT);
- return 0;
- }
-
- if (!is_power_of_2(lp->region_size)) {
- log_error("Region size (%" PRIu32
- ") must be a power of 2.", lp->region_size);
- return 0;
- }
-
- if (!lp->region_size) {
- log_error("Non-zero region size must be supplied.");
- return 0;
- }
+ else
+ lp->region_size = get_default_region_size(cmd);
/* FIXME man page says in one place that --type and --mirrors can't be mixed */
if (lp->mirrors_supplied && !lp->mirrors)
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index 0512585..cd31c99 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -545,7 +545,6 @@ static int _read_raid_params(struct cmd_context *cmd,
static int _read_mirror_and_raid_params(struct cmd_context *cmd,
struct lvcreate_params *lp)
{
- int pagesize = lvm_getpagesize();
unsigned max_images;
if (seg_is_raid(lp)) {
@@ -616,19 +615,6 @@ static int _read_mirror_and_raid_params(struct cmd_context *cmd,
return 0;
}
- if (!is_power_of_2(lp->region_size)) {
- log_error("Region size (%" PRIu32 ") must be a power of 2",
- lp->region_size);
- return 0;
- }
-
- if (lp->region_size % (pagesize >> SECTOR_SHIFT)) {
- log_error("Region size (%" PRIu32 ") must be a multiple of "
- "machine memory page size (%d)",
- lp->region_size, pagesize >> SECTOR_SHIFT);
- return 0;
- }
-
if (seg_is_mirror(lp) && !_read_mirror_params(cmd, lp))
return_0;
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 4fda356..58d1a44 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -797,6 +797,45 @@ int readahead_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_va
return 1;
}
+int regionsize_arg(struct cmd_context *cmd, struct arg_values *av)
+{
+ int pagesize = lvm_getpagesize();
+ uint32_t num;
+
+ if (!_size_arg(cmd, av, 2048, 0))
+ return 0;
+
+ if (av->sign == SIGN_MINUS) {
+ log_error("Region size may not be negative.");
+ return 0;
+ }
+
+ if (av->ui64_value > UINT32_MAX) {
+ log_error("Region size is too big (max %u).", UINT32_MAX);
+ return 0;
+ }
+
+ num = av->ui_value;
+
+ if (!num) {
+ log_error("Region size may not be zero.");
+ return 0;
+ }
+
+ if (num % (pagesize >> SECTOR_SHIFT)) {
+ log_error("Region size must be a multiple of machine memory page size (%d bytes).",
+ pagesize);
+ return 0;
+ }
+
+ if (!is_power_of_2(num)) {
+ log_error("Region size must be a power of 2.");
+ return 0;
+ }
+
+ return 1;
+}
+
/*
* Non-zero, positive integer, "all", or "unmanaged"
*/
diff --git a/tools/tools.h b/tools/tools.h
index 00476d1..b3858a0 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -200,6 +200,7 @@ int segtype_arg(struct cmd_context *cmd, struct arg_values *av);
int alloc_arg(struct cmd_context *cmd, struct arg_values *av);
int locktype_arg(struct cmd_context *cmd, struct arg_values *av);
int readahead_arg(struct cmd_context *cmd, struct arg_values *av);
+int regionsize_arg(struct cmd_context *cmd, struct arg_values *av);
int vgmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
int pvmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
int metadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
diff --git a/tools/vals.h b/tools/vals.h
index 12d315f..38029aa 100644
--- a/tools/vals.h
+++ b/tools/vals.h
@@ -92,6 +92,10 @@
* --size and other option args treat upper/lower letters
* the same, all as 1024 SI base. For this reason, we
* should avoid suggesting the upper case letters.
+ *
+ * FIXME: negative numbers should be automatically rejected
+ * for anything but int_arg_with_sign(), e.g.
+ * size_mb_arg() should reject a negative number.
*/
val(none_VAL, NULL, "None", "ERR") /* unused, for enum value 0 */
@@ -113,6 +117,7 @@ val(discards_VAL, discards_arg, "Discards", "passdown|nopassdown|ignore")
val(mirrorlog_VAL, mirrorlog_arg, "MirrorLog", "core|disk")
val(sizekb_VAL, size_kb_arg, "SizeKB", "Number[k|unit]")
val(sizemb_VAL, size_mb_arg, "SizeMB", "Number[m|unit]")
+val(regionsize_VAL, regionsize_arg, "RegionSize", "Number[m|unit]")
val(numsigned_VAL, int_arg_with_sign, "SNumber", "[+|-]Number")
val(numsignedper_VAL, int_arg_with_sign_and_percent, "SNumberP", "[+|-]Number[%VG|%PVS|%FREE]")
val(permission_VAL, permission_arg, "Permission", "rw|r")
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a1386dcca024b510…
Commit: a1386dcca024b51019c1f3be6b153249df06dbac
Parent: 46abc28a480069b3e8b2c5c7c3448ffa25ec17ba
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 7 15:01:30 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:21:58 2017 -0600
lvconvert: remove code for changing region size
from the generic raid type conversion code.
---
tools/lvconvert.c | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 4e86698..4d6b1c9 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1402,13 +1402,13 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
return 1;
}
goto try_new_takeover_or_reshape;
- } else if (!arg_is_set(cmd, regionsize_ARG) && (!*lp->type_str || seg->segtype == lp->segtype)) {
+ } else if (!*lp->type_str || seg->segtype == lp->segtype) {
log_error("Conversion operation not yet supported.");
return 0;
}
if ((seg_is_linear(seg) || seg_is_striped(seg) || seg_is_mirrored(seg) || lv_is_raid(lv)) &&
- ((lp->type_str && lp->type_str[0]) || arg_is_set(cmd, regionsize_ARG))) {
+ (lp->type_str && lp->type_str[0])) {
/* Activation is required later which precludes existing supported raid0 segment */
if ((seg_is_any_raid0(seg) || segtype_is_any_raid0(lp->segtype)) &&
!(lp->target_attr & RAID_FEATURE_RAID0)) {
@@ -1430,12 +1430,8 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
if (!arg_is_set(cmd, stripes_long_ARG))
lp->stripes = 0;
- /*
- * FIXME: arg_is_set() workaround for region size until the cli validation patches got merged;
- * i needs "--type raid*", because lp->region_size isn't set w/o it
- */
if (!lv_raid_convert(lv, lp->segtype, lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size,
- arg_is_set(cmd, regionsize_ARG) ? lp->region_size : 0, lp->pvh))
+ lp->region_size, lp->pvh))
return_0;
log_print_unless_silent("Logical volume %s successfully converted.",
@@ -1456,12 +1452,8 @@ try_new_takeover_or_reshape:
if (lp->type_str && lp->type_str[0] && lp->segtype != seg->segtype &&
((seg_is_raid4(seg) && seg_is_striped(lp) && lp->stripes > 1) ||
(seg_is_striped(seg) && seg->area_count > 1 && seg_is_raid4(lp)))) {
- /*
- * FIXME: arg_is_set() workaround for region size until the cli validation patches got merged;
- * i needs "--type raid*", because lp->region_size isn't set w/o it
- */
if (!lv_raid_convert(lv, lp->segtype, lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size,
- arg_is_set(cmd, regionsize_ARG) ? lp->region_size : 0, lp->pvh))
+ lp->region_size, lp->pvh))
return_0;
log_print_unless_silent("Logical volume %s successfully converted.",
1
0
13 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=46abc28a480069b3…
Commit: 46abc28a480069b3e8b2c5c7c3448ffa25ec17ba
Parent: 8152e4a99ee075c84fab9ec46485b798a1a6525d
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Feb 7 11:52:13 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:21:58 2017 -0600
lvconvert: add command to change region size of a raid LV
---
lib/metadata/metadata-exported.h | 2 ++
lib/metadata/raid_manip.c | 6 ++++++
test/shell/lvconvert-raid-regionsize.sh | 2 +-
tools/command-lines.in | 7 +++++++
tools/lvconvert.c | 15 +++++++++++++++
tools/lvmcmdline.c | 1 +
tools/tools.h | 1 +
7 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 420893c..573c09d 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -1230,6 +1230,8 @@ uint32_t raid_rmeta_extents_delta(struct cmd_context *cmd,
uint32_t raid_rimage_extents(const struct segment_type *segtype,
uint32_t extents, uint32_t stripes, uint32_t data_copies);
uint32_t raid_ensure_min_region_size(const struct logical_volume *lv, uint64_t raid_size, uint32_t region_size);
+int lv_raid_change_region_size(struct logical_volume *lv,
+ int yes, int force, uint32_t new_region_size);
/* -- metadata/raid_manip.c */
/* ++ metadata/cache_manip.c */
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index eaafd65..cdd7af8 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -4338,6 +4338,12 @@ int lv_raid_convert(struct logical_volume *lv,
region_size, allocate_pvs);
}
+int lv_raid_change_region_size(struct logical_volume *lv,
+ int yes, int force, uint32_t new_region_size)
+{
+ return _region_size_change_requested(lv, yes, new_region_size);
+}
+
static int _remove_partial_multi_segment_image(struct logical_volume *lv,
struct dm_list *remove_pvs)
{
diff --git a/test/shell/lvconvert-raid-regionsize.sh b/test/shell/lvconvert-raid-regionsize.sh
index 7a6c7f0..9baa99a 100644
--- a/test/shell/lvconvert-raid-regionsize.sh
+++ b/test/shell/lvconvert-raid-regionsize.sh
@@ -27,7 +27,7 @@ function _test_regionsize
local vg=$4
local lv=$5
- lvconvert --type $type --yes -R $regionsize $vg/$lv
+ lvconvert --yes -R $regionsize $vg/$lv
[ $? -ne 0 ] && return 1
check lv_field $vg/$lv regionsize "$regionsize_str"
fsck -fn "$DM_DEV_DIR/$vg/$lv"
diff --git a/tools/command-lines.in b/tools/command-lines.in
index ca5259f..6743b79 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -364,6 +364,13 @@ ID: lvconvert_raid_types
DESC: Convert LV to raid1 or mirror, or change number of mirror images.
RULE: all not lv_is_locked lv_is_pvmove
+lvconvert --regionsize SizeMB LV_raid
+OO: OO_LVCONVERT
+ID: lvconvert_change_region_size
+DESC: Change the region size of an LV.
+RULE: all not lv_is_locked lv_is_pvmove
+RULE: all not LV_raid0
+
---
# lvconvert raid-related utilities
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 75bdcb9..4e86698 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -4397,6 +4397,21 @@ out:
return ret;
}
+static int _lvconvert_change_region_size_single(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ if (!lv_raid_change_region_size(lv, arg_is_set(cmd, yes_ARG), arg_count(cmd, force_ARG),
+ arg_int_value(cmd, regionsize_ARG, 0)))
+ return ECMD_FAILED;
+ return ECMD_PROCESSED;
+}
+
+int lvconvert_change_region_size_cmd(struct cmd_context * cmd, int argc, char **argv)
+{
+ return process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, &_lvconvert_visible_check, &_lvconvert_change_region_size_single);
+}
+
/*
* split mirror images
*/
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 121a9dd..4fda356 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -152,6 +152,7 @@ struct command_function command_functions[CMD_COUNT] = {
{ lvconvert_split_mirror_images_CMD, lvconvert_split_mirror_images_cmd},
{ lvconvert_change_mirrorlog_CMD, lvconvert_change_mirrorlog_cmd },
{ lvconvert_merge_mirror_images_CMD, lvconvert_merge_mirror_images_cmd },
+ { lvconvert_change_region_size_CMD, lvconvert_change_region_size_cmd },
/* redirected to merge_snapshot/merge_thin/merge_mirrors */
{ lvconvert_merge_CMD, lvconvert_merge_cmd },
diff --git a/tools/tools.h b/tools/tools.h
index 4e1d87f..00476d1 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -284,6 +284,7 @@ int lvconvert_raid_types_cmd(struct cmd_context * cmd, int argc, char **argv);
int lvconvert_split_mirror_images_cmd(struct cmd_context * cmd, int argc, char **argv);
int lvconvert_merge_mirror_images_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_change_mirrorlog_cmd(struct cmd_context * cmd, int argc, char **argv);
+int lvconvert_change_region_size_cmd(struct cmd_context * cmd, int argc, char **argv);
int lvconvert_merge_cmd(struct cmd_context *cmd, int argc, char **argv);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8152e4a99ee075c8…
Commit: 8152e4a99ee075c84fab9ec46485b798a1a6525d
Parent: 2224b6a70158a820de2a9f1fd961a36b0188da51
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 6 16:10:09 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
vgchange: fix uint32 parsing of logicalvolume arg
---
tools/args.h | 4 ++--
tools/command-lines.in | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index 1d7d6f7..a481bc5 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -964,10 +964,10 @@ arg(stripesize_ARG, 'I', "stripesize", sizekb_VAL, 0, 0,
"The amount of data that is written to one device before\n"
"moving to the next in a striped LV.\n")
-arg(logicalvolume_ARG, 'l', "logicalvolume", number_VAL, 0, 0,
+arg(logicalvolume_ARG, 'l', "logicalvolume", uint32_VAL, 0, 0,
"Sets the maximum number of LVs allowed in a VG.\n")
-arg(maxlogicalvolumes_ARG, 'l', "maxlogicalvolumes", number_VAL, 0, 0,
+arg(maxlogicalvolumes_ARG, 'l', "maxlogicalvolumes", uint32_VAL, 0, 0,
"Sets the maximum number of LVs allowed in a VG.\n")
arg(extents_ARG, 'l', "extents", numsignedper_VAL, 0, 0,
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 30573f4..ca5259f 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -1339,7 +1339,7 @@ OO_VGCHANGE: --autobackup Bool, --ignoremonitoring, --ignoreskippedcluster,
# because it can function as a required opt.
OO_VGCHANGE_META: --addtag Tag, --deltag Tag,
---logicalvolume Number, --maxphysicalvolumes Uint32, --alloc Alloc, --uuid,
+--logicalvolume Uint32, --maxphysicalvolumes Uint32, --alloc Alloc, --uuid,
--clustered Bool, --pvmetadatacopies MetadataCopiesPV, --vgmetadatacopies MetadataCopiesVG,
--physicalextentsize SizeMB, --resizeable Bool, --systemid String, --locktype LockType,
--profile String, --detachprofile, --metadataprofile String
@@ -1405,7 +1405,7 @@ ID: vgconvert_general
---
vgcreate VG_new PV ...
-OO: --addtag Tag, --alloc Alloc, --autobackup Bool, --clustered Bool, --maxlogicalvolumes Number,
+OO: --addtag Tag, --alloc Alloc, --autobackup Bool, --clustered Bool, --maxlogicalvolumes Uint32,
--maxphysicalvolumes Uint32, --metadataprofile String, --metadatatype MetadataType,
--physicalextentsize SizeMB, --force, --zero Bool, --labelsector Number,
--metadatasize SizeMB, --pvmetadatacopies MetadataCopiesPV, --vgmetadatacopies MetadataCopiesVG,
@@ -1539,7 +1539,7 @@ OO_VGSPLIT: --autobackup Bool
# used only when the destination VG is new
OO_VGSPLIT_NEW: --alloc Alloc, --clustered Bool,
---maxlogicalvolumes Number, --maxphysicalvolumes Uint32,
+--maxlogicalvolumes Uint32, --maxphysicalvolumes Uint32,
--metadatatype MetadataType, --vgmetadatacopies MetadataCopiesVG
vgsplit VG VG PV ...
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2224b6a70158a820…
Commit: 2224b6a70158a820de2a9f1fd961a36b0188da51
Parent: c3faa5816d223b0a77a248aed9a88e73461268ce
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Feb 6 11:51:06 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
commands: recognize raid variations
---
tools/lv_types.h | 2 +-
tools/toollib.c | 16 ++++++----------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/tools/lv_types.h b/tools/lv_types.h
index 22d0522..bd4666e 100644
--- a/tools/lv_types.h
+++ b/tools/lv_types.h
@@ -21,7 +21,7 @@ lvt(thinpool_LVT, "thinpool", NULL)
lvt(cache_LVT, "cache", NULL)
lvt(cachepool_LVT, "cachepool", NULL)
lvt(mirror_LVT, "mirror", NULL)
-lvt(raid_LVT, "raid", NULL)
+lvt(raid_LVT, "raid", NULL) /* any raid type */
lvt(raid0_LVT, "raid0", NULL)
lvt(raid1_LVT, "raid1", NULL)
lvt(raid4_LVT, "raid4", NULL)
diff --git a/tools/toollib.c b/tools/toollib.c
index 3b47989..a539878 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -2515,17 +2515,15 @@ static int _lv_is_type(struct cmd_context *cmd, struct logical_volume *lv, int l
case raid_LVT:
return lv_is_raid(lv);
case raid0_LVT:
- return seg_is_raid0(seg);
+ return seg_is_any_raid0(seg);
case raid1_LVT:
return seg_is_raid1(seg);
case raid4_LVT:
return seg_is_raid4(seg);
-#if 0
case raid5_LVT:
- return seg_is_raid5(seg);
+ return seg_is_any_raid5(seg);
case raid6_LVT:
- return seg_is_raid6(seg);
-#endif
+ return seg_is_any_raid6(seg);
case raid10_LVT:
return seg_is_raid10(seg);
case error_LVT:
@@ -2566,18 +2564,16 @@ int get_lvt_enum(struct logical_volume *lv)
return mirror_LVT;
if (lv_is_raid(lv))
return raid_LVT;
- if (seg_is_raid0(seg))
+ if (seg_is_any_raid0(seg))
return raid0_LVT;
if (seg_is_raid1(seg))
return raid1_LVT;
if (seg_is_raid4(seg))
return raid4_LVT;
-#if 0
- if (seg_is_raid5(seg))
+ if (seg_is_any_raid5(seg))
return raid5_LVT;
- if (seg_is_raid6(seg))
+ if (seg_is_any_raid6(seg))
return raid6_LVT;
-#endif
if (seg_is_raid10(seg))
return raid10_LVT;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c3faa5816d223b0a…
Commit: c3faa5816d223b0a77a248aed9a88e73461268ce
Parent: 942dc07402747d00946c5e80d890d535c0cbd125
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 10 11:36:11 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
commands: move command def parsing into lvm binary
It was previously done at build time by the ccmd binary.
---
tools/Makefile.in | 47 +-
tools/ccmd-main.c | 1130 --------------------
tools/ccmd-man.c | 997 ------------------
tools/ccmd-util.c | 936 -----------------
tools/ccmd.h | 144 ---
tools/command-lines.in | 17 +-
tools/command.c | 2694 ++++++++++++++++++++++++++++++++++++++++++++++++
tools/command.h | 36 +-
tools/lvchange.c | 20 +-
tools/lvconvert.c | 38 +-
tools/lvmcmdline.c | 303 +-----
tools/toollib.c | 12 +-
tools/tools.h | 8 +
13 files changed, 2847 insertions(+), 3535 deletions(-)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 8f53851..1761be4 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -18,6 +18,7 @@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
SOURCES =\
+ command.c \
dumpconfig.c \
formats.c \
lvchange.c \
@@ -77,7 +78,6 @@ SOURCES2 =\
TARGETS =\
.commands \
- command-lines.h \
liblvm2cmd.a \
lvm
@@ -102,7 +102,7 @@ CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) $(TARGETS_DM) \
liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) lvm-static.o \
liblvm2cmd-static.a dmsetup.static lvm.static \
$(LDDEPS) .exported_symbols_generated \
- ccmd command-lines.h command-lines-count.h
+ cmds.h command-lines-input.h command-count.h
ifeq ("@CMDLIB@", "yes")
TARGETS += liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
@@ -176,35 +176,40 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
$(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
egrep -v '^ *(|#.*|config|devtypes|dumpconfig|formats|fullreport|help|lastlog|lvpoll|pvdata|segtypes|systemid|tags|version) *$$' > .commands
-ccmd: $(srcdir)/ccmd-main.c $(srcdir)/ccmd-util.c $(srcdir)/ccmd-man.c
- $(CC) $(srcdir)/ccmd-main.c $(srcdir)/ccmd-util.c $(srcdir)/ccmd-man.c -o ccmd
-
.DELETE_ON_ERROR:
-command-lines.h: $(srcdir)/command-lines.in ccmd
- $(top_builddir)/tools/ccmd --output struct $(srcdir)/command-lines.in > $@
-
-command-lines-count.h: $(srcdir)/command-lines.in ccmd
- $(top_builddir)/tools/ccmd --output count $(srcdir)/command-lines.in > $@
-
# move properly to configure
WC = /usr/bin/wc
GREP = /bin/grep
SORT = /bin/sort
-CUT = /bin/cut
-SED = /bin/sed
-# FIXME Add licence text from template file
-command-lines-count-new.h: $(srcdir)/command-lines.in ccmd Makefile
+command-count.h: $(srcdir)/command-lines.in Makefile
+ set -o pipefail && \
+ ( cat $(top_srcdir)/doc/license.txt && \
+ echo "/* Do not edit. This file is generated by the Makefile. */" && \
+ echo -n "#define COMMAND_COUNT " && \
+ $(GREP) '^ID:' $(srcdir)/command-lines.in | $(WC) -l \
+ ) > $@
+
+cmds.h: $(srcdir)/command-lines.in Makefile
+ set -o pipefail && \
+ ( cat $(top_srcdir)/doc/license.txt && \
+ echo "/* Do not edit. This file is generated by the Makefile. */" && \
+ echo "cmd(CMD_NONE, none)" && \
+ $(GREP) '^ID:' $(srcdir)/command-lines.in | $(SORT) -u | $(AWK) '{print "cmd(" $$2 "_CMD, " $$2 ")"}' && \
+ echo "cmd(CMD_COUNT, count)" \
+ ) > $@
+
+command-lines-input.h: $(srcdir)/command-lines.in Makefile
set -o pipefail && \
- (echo -n "#define COMMAND_COUNT " && \
- $(GREP) '^ID:' $(srcdir)/command-lines.in | $(WC) -l && \
- echo -e "enum {\n\tno_CMD," && \
- $(GREP) '^ID:' $(srcdir)/command-lines.in | $(CUT) -d\ -f2 | $(SORT) -u | $(SED) 's/\(.*\)/\t&_CMD,/' && \
- echo -e "\tCOMMAND_ID_COUNT,\n};" \
+ ( cat $(top_srcdir)/doc/license.txt && \
+ echo "/* Do not edit. This file is generated by the Makefile. */" && \
+ echo -en "const char _command_input[] =\n\n\"" && \
+ $(GREP) -Ev '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 'BEGIN {ORS = "\\n\"\n\""} //' && \
+ echo "\\n\";" \
) > $@
-$(SOURCES:%.c=%.d): command-lines.h command-lines-count.h
+$(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d): command-lines-input.h command-count.h cmds.h
ifneq ("$(CFLOW_CMD)", "")
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
diff --git a/tools/ccmd-main.c b/tools/ccmd-main.c
deleted file mode 100644
index 85d5656..0000000
--- a/tools/ccmd-main.c
+++ /dev/null
@@ -1,1130 +0,0 @@
-#include <asm/types.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <limits.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <sched.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <getopt.h>
-
-#include "ccmd.h"
-
-
-/* input util functions (in ccmd-util.c) */
-char *split_line(char *buf, int *argc, char **argv, char sep);
-int val_str_to_num(char *str);
-int opt_str_to_num(char *str);
-int lvp_name_to_enum(char *str);
-int lv_to_enum(char *name);
-uint64_t lv_to_bits(char *name);
-
-/* header output functions (in ccmd-util.c) */
-void print_header_struct(void);
-void print_header_count(void);
-void print_ambiguous(void);
-
-/* man page output (in ccmd-main.c) */
-void print_man(char *man_command_name, int include_primary, int include_secondary);
-
-
-/* create table of value names, e.g. String, and corresponding enum from vals.h */
-
-struct val_name val_names[VAL_COUNT + 1] = {
-#define val(a, b, c, d) { # a, a, b, c, d },
-#include "vals.h"
-#undef val
-};
-
-/* create table of option names, e.g. --foo, and corresponding enum from args.h */
-
-struct opt_name opt_names[ARG_COUNT + 1] = {
-#define arg(a, b, c, d, e, f, g) { # a, a, b, "", "--" c, d, e, f, g },
-#include "args.h"
-#undef arg
-};
-
-/* create table of lv property names, e.g. lv_is_foo, and corresponding enum from lv_props.h */
-
-struct lvp_name lvp_names[LVP_COUNT + 1] = {
-#define lvp(a, b, c) { # a, a, b },
-#include "lv_props.h"
-#undef lvp
-};
-
-/* create table of lv type names, e.g. linear and corresponding enum from lv_types.h */
-
-struct lvt_name lvt_names[LVT_COUNT + 1] = {
-#define lvt(a, b, c) { # a, a, b },
-#include "lv_types.h"
-#undef lvt
-};
-
-/* create table of command names, e.g. vgcreate */
-
-struct cmd_name cmd_names[MAX_CMD_NAMES] = {
-#define xx(a, b, c) { # a , b } ,
-#include "commands.h"
-#undef xx
-};
-
-/* array of pointers into opt_names[] that is sorted alphabetically (by long opt name) */
-
-struct opt_name *opt_names_alpha[ARG_COUNT + 1];
-
-/* lvm_all is for recording options that are common for all lvm commands */
-
-struct command lvm_all;
-
-/* saves OO_FOO lines (groups of optional options) to include in multiple defs */
-
-static int oo_line_count;
-#define MAX_OO_LINES 256
-
-struct oo_line {
- char *name;
- char *line;
-};
-static struct oo_line oo_lines[MAX_OO_LINES];
-
-#define REQUIRED 1 /* required option */
-#define OPTIONAL 0 /* optional option */
-#define IGNORE -1 /* ignore option */
-
-/* control man page output */
-
-static int include_man_secondary = 1; /* include SECONDARY forms in man output */
-static int include_man_primary = 1; /* include primary forms in man output */
-static char *man_command_name = NULL; /* print man page for a single command name */
-
-
-static void add_optional_opt_line(struct command *cmd, int argc, char *argv[]);
-
-/*
- * Parse command-lines.in and record those definitions
- * in an array of struct command: cmd_array[].
- */
-
-static const char *is_command_name(char *str)
-{
- int i;
-
- for (i = 0; i < MAX_CMD_NAMES; i++) {
- if (!cmd_names[i].name)
- break;
- if (!strcmp(cmd_names[i].name, str))
- return cmd_names[i].name;
- }
- return NULL;
-}
-
-struct cmd_name *find_command_name(const char *str)
-{
- int i;
-
- for (i = 0; i < MAX_CMD_NAMES; i++) {
- if (!cmd_names[i].name)
- break;
- if (!strcmp(cmd_names[i].name, str))
- return &cmd_names[i];
- }
- return NULL;
-}
-
-static int is_opt_name(char *str)
-{
- if (!strncmp(str, "--", 2))
- return 1;
-
- if ((str[0] == '-') && (str[1] != '-')) {
- printf("Options must be specified in long form: %s\n", str);
- exit(1);
- }
-
- return 0;
-}
-
-/*
- * "Select" as a pos name means that the position
- * can be empty if the --select option is used.
- */
-
-static int is_pos_name(char *str)
-{
- if (!strncmp(str, "VG", 2))
- return 1;
- if (!strncmp(str, "LV", 2))
- return 1;
- if (!strncmp(str, "PV", 2))
- return 1;
- if (!strncmp(str, "Tag", 3))
- return 1;
- if (!strncmp(str, "String", 6))
- return 1;
- if (!strncmp(str, "Select", 6))
- return 1;
- return 0;
-}
-
-static int is_oo_definition(char *str)
-{
- if (!strncmp(str, "OO_", 3) && strstr(str, ":"))
- return 1;
- return 0;
-}
-
-static int is_oo_line(char *str)
-{
- if (!strncmp(str, "OO:", 3))
- return 1;
- return 0;
-}
-
-static int is_io_line(char *str)
-{
- if (!strncmp(str, "IO:", 3))
- return 1;
- return 0;
-}
-
-static int is_op_line(char *str)
-{
- if (!strncmp(str, "OP:", 3))
- return 1;
- return 0;
-}
-
-static int is_desc_line(char *str)
-{
- if (!strncmp(str, "DESC:", 5))
- return 1;
- return 0;
-}
-
-static int is_flags_line(char *str)
-{
- if (!strncmp(str, "FLAGS:", 6))
- return 1;
- return 0;
-}
-
-static int is_rule_line(char *str)
-{
- if (!strncmp(str, "RULE:", 5))
- return 1;
- return 0;
-}
-
-static int is_id_line(char *str)
-{
- if (!strncmp(str, "ID:", 3))
- return 1;
- return 0;
-}
-
-/*
- * Save a positional arg in a struct arg_def.
- * Parse str for anything that can appear in a position,
- * like VG, VG|LV, VG|LV_linear|LV_striped, etc.
- */
-
-static void set_pos_def(struct command *cmd, char *str, struct arg_def *def)
-{
- char *argv[MAX_LINE_ARGC];
- int argc;
- char *name;
- int val_enum;
- int i;
-
- split_line(str, &argc, argv, '|');
-
- for (i = 0; i < argc; i++) {
- name = argv[i];
-
- val_enum = val_str_to_num(name);
-
- if (!val_enum) {
- printf("Unknown pos arg: %s\n", name);
- exit(1);
- }
-
- def->val_bits |= val_enum_to_bit(val_enum);
-
- if ((val_enum == lv_VAL) && strstr(name, "_"))
- def->lvt_bits = lv_to_bits(name);
-
- if (strstr(name, "_new")) {
- if (val_enum == lv_VAL)
- def->flags |= ARG_DEF_FLAG_NEW_LV;
- else if (val_enum == vg_VAL)
- def->flags |= ARG_DEF_FLAG_NEW_VG;
- }
- }
-}
-
-/*
- * Save an option arg in a struct arg_def.
- * Parse str for anything that can follow --option.
- */
-
-static void set_opt_def(struct command *cmd, char *str, struct arg_def *def)
-{
- char *argv[MAX_LINE_ARGC];
- int argc;
- char *name;
- int val_enum;
- int i, j;
-
- split_line(str, &argc, argv, '|');
-
- for (i = 0; i < argc; i++) {
- name = argv[i];
-
- val_enum = val_str_to_num(name);
-
- if (!val_enum) {
- /* a literal number or string */
-
- if (isdigit(name[0]))
- val_enum = constnum_VAL;
-
- else if (isalpha(name[0]))
- val_enum = conststr_VAL;
-
- else {
- printf("Unknown opt arg: %s\n", name);
- exit(0);
- }
- }
-
-
- def->val_bits |= val_enum_to_bit(val_enum);
-
- if (val_enum == constnum_VAL)
- def->num = (uint64_t)atoi(name);
-
- if (val_enum == conststr_VAL)
- def->str = strdup(name);
-
- if (val_enum == lv_VAL) {
- if (strstr(name, "_"))
- def->lvt_bits = lv_to_bits(name);
- }
-
- if (strstr(name, "_new")) {
- if (val_enum == lv_VAL)
- def->flags |= ARG_DEF_FLAG_NEW_LV;
- else if (val_enum == vg_VAL)
- def->flags |= ARG_DEF_FLAG_NEW_VG;
-
- }
- }
-}
-
-/*
- * Save a set of common options so they can be included in
- * multiple command defs.
- *
- * OO_FOO: --opt1 ...
- *
- * oo->name = "OO_FOO";
- * oo->line = "--opt1 ...";
- */
-
-static void add_oo_definition_line(const char *name, const char *line)
-{
- struct oo_line *oo;
- char *colon;
- char *start;
-
- oo = &oo_lines[oo_line_count++];
- oo->name = strdup(name);
-
- if ((colon = strstr(oo->name, ":")))
- *colon = '\0';
- else {
- printf("invalid OO definition\n");
- exit(1);
- }
-
- start = strstr(line, ":") + 2;
- oo->line = strdup(start);
-}
-
-/* Support OO_FOO: continuing on multiple lines. */
-
-static void append_oo_definition_line(const char *new_line)
-{
- struct oo_line *oo;
- char *old_line;
- char *line;
- int len;
-
- oo = &oo_lines[oo_line_count-1];
-
- old_line = oo->line;
-
- /* +2 = 1 space between old and new + 1 terminating \0 */
- len = strlen(old_line) + strlen(new_line) + 2;
- line = malloc(len);
- memset(line, 0, len);
-
- strcat(line, old_line);
- strcat(line, " ");
- strcat(line, new_line);
-
- free(oo->line);
- oo->line = line;
-}
-
-/* Find a saved OO_FOO definition. */
-
-char *get_oo_line(char *str)
-{
- char *name;
- char *end;
- char str2[64];
- int i;
-
- strcpy(str2, str);
- if ((end = strstr(str2, ":")))
- *end = '\0';
- if ((end = strstr(str2, ",")))
- *end = '\0';
-
- for (i = 0; i < oo_line_count; i++) {
- name = oo_lines[i].name;
- if (!strcmp(name, str2))
- return oo_lines[i].line;
- }
- return NULL;
-}
-
-/*
- * Add optional_opt_args entries when OO_FOO appears on OO: line,
- * i.e. include common options from an OO_FOO definition.
- */
-
-static void include_optional_opt_args(struct command *cmd, char *str)
-{
- char *oo_line;
- char *line;
- char *line_argv[MAX_LINE_ARGC];
- int line_argc;
-
- if (!(oo_line = get_oo_line(str))) {
- printf("No OO line found for %s\n", str);
- exit(1);
- }
-
- if (!(line = strdup(oo_line)))
- exit(1);
-
- split_line(line, &line_argc, line_argv, ' ');
- add_optional_opt_line(cmd, line_argc, line_argv);
- free(line);
-}
-
-/*
- * When an --option is seen, add a new opt_args entry for it.
- * This function sets the opt_args.opt value for it.
- */
-
-static void add_opt_arg(struct command *cmd, char *str, int *takes_arg, int required)
-{
- char *comma;
- int opt;
-
- /* opt_arg.opt set here */
- /* opt_arg.def will be set in update_prev_opt_arg() if needed */
-
- if ((comma = strstr(str, ",")))
- *comma = '\0';
-
- /*
- * Work around nasty hack where --uuid is used for both uuid_ARG
- * and uuidstr_ARG. The input uses --uuidstr, where an actual
- * command uses --uuid string.
- */
- if (!strcmp(str, "--uuidstr")) {
- opt = uuidstr_ARG;
- goto skip;
- }
-
- opt = opt_str_to_num(str);
-skip:
- if (required > 0)
- cmd->required_opt_args[cmd->ro_count++].opt = opt;
- else if (!required)
- cmd->optional_opt_args[cmd->oo_count++].opt = opt;
- else if (required < 0)
- cmd->ignore_opt_args[cmd->io_count++].opt = opt;
- else
- exit(1);
-
- *takes_arg = opt_names[opt].val_enum ? 1 : 0;
-}
-
-/*
- * After --option has been seen, this function sets opt_args.def value
- * for the value that appears after --option.
- */
-
-static void update_prev_opt_arg(struct command *cmd, char *str, int required)
-{
- struct arg_def def = { 0 };
- char *comma;
-
- if (str[0] == '-') {
- printf("Option %s must be followed by an arg.\n", str);
- exit(1);
- }
-
- /* opt_arg.def set here */
- /* opt_arg.opt was previously set in add_opt_arg() when --foo was read */
-
- if ((comma = strstr(str, ",")))
- *comma = '\0';
-
- set_opt_def(cmd, str, &def);
-
- if (required > 0)
- cmd->required_opt_args[cmd->ro_count-1].def = def;
- else if (!required)
- cmd->optional_opt_args[cmd->oo_count-1].def = def;
- else if (required < 0)
- cmd->ignore_opt_args[cmd->io_count-1].def = def;
- else
- exit(1);
-}
-
-/*
- * When an position arg is seen, add a new pos_args entry for it.
- * This function sets the pos_args.pos and pos_args.def.
- */
-
-static void add_pos_arg(struct command *cmd, char *str, int required)
-{
- struct arg_def def = { 0 };
-
- /* pos_arg.pos and pos_arg.def are set here */
-
- set_pos_def(cmd, str, &def);
-
- if (required) {
- cmd->required_pos_args[cmd->rp_count].pos = cmd->pos_count++;
- cmd->required_pos_args[cmd->rp_count].def = def;
- cmd->rp_count++;
- } else {
- cmd->optional_pos_args[cmd->op_count].pos = cmd->pos_count++;;
- cmd->optional_pos_args[cmd->op_count].def = def;
- cmd->op_count++;
- }
-}
-
-/* Process something that follows a pos arg, which is not a new pos arg. */
-
-static void update_prev_pos_arg(struct command *cmd, char *str, int required)
-{
- struct arg_def *def;
-
- /* a previous pos_arg.def is modified here */
-
- if (required)
- def = &cmd->required_pos_args[cmd->rp_count-1].def;
- else
- def = &cmd->optional_pos_args[cmd->op_count-1].def;
-
- if (!strcmp(str, "..."))
- def->flags |= ARG_DEF_FLAG_MAY_REPEAT;
- else {
- printf("Unknown pos arg: %s\n", str);
- exit(1);
- }
-}
-
-/* Process what follows OO:, which are the optional opt args for the cmd def. */
-
-static void add_optional_opt_line(struct command *cmd, int argc, char *argv[])
-{
- int takes_arg;
- int i;
-
- for (i = 0; i < argc; i++) {
- if (!i && !strncmp(argv[i], "OO:", 3))
- continue;
- if (is_opt_name(argv[i]))
- add_opt_arg(cmd, argv[i], &takes_arg, OPTIONAL);
- else if (!strncmp(argv[i], "OO_", 3))
- include_optional_opt_args(cmd, argv[i]);
- else if (takes_arg)
- update_prev_opt_arg(cmd, argv[i], OPTIONAL);
- else
- printf("Can't parse argc %d argv %s prev %s\n",
- i, argv[i], argv[i-1]);
- }
-}
-
-/* Process what follows IO:, which are the ignore options for the cmd def. */
-
-static void add_ignore_opt_line(struct command *cmd, int argc, char *argv[])
-{
- int takes_arg;
- int i;
-
- for (i = 0; i < argc; i++) {
- if (!i && !strncmp(argv[i], "IO:", 3))
- continue;
- if (is_opt_name(argv[i]))
- add_opt_arg(cmd, argv[i], &takes_arg, IGNORE);
- else if (takes_arg)
- update_prev_opt_arg(cmd, argv[i], IGNORE);
- else
- printf("Can't parse argc %d argv %s prev %s\n",
- i, argv[i], argv[i-1]);
- }
-}
-
-/* Process what follows OP:, which are optional pos args for the cmd def. */
-
-static void add_optional_pos_line(struct command *cmd, int argc, char *argv[])
-{
- int i;
-
- for (i = 0; i < argc; i++) {
- if (!i && !strncmp(argv[i], "OP:", 3))
- continue;
- if (is_pos_name(argv[i]))
- add_pos_arg(cmd, argv[i], OPTIONAL);
- else
- update_prev_pos_arg(cmd, argv[i], OPTIONAL);
- }
-}
-
-static void add_required_opt_line(struct command *cmd, int argc, char *argv[])
-{
- int takes_arg;
- int i;
-
- for (i = 0; i < argc; i++) {
- if (is_opt_name(argv[i]))
- add_opt_arg(cmd, argv[i], &takes_arg, REQUIRED);
- else if (takes_arg)
- update_prev_opt_arg(cmd, argv[i], REQUIRED);
- else
- printf("Can't parse argc %d argv %s prev %s\n",
- i, argv[i], argv[i-1]);
- }
-}
-
-/*
- * Add to required_opt_args from an OO_FOO definition.
- * (This is the special case of vgchange/lvchange where one
- * optional option is required, and others are then optional.)
- * The set of options from OO_FOO are saved in required_opt_args,
- * and flag CMD_FLAG_ONE_REQUIRED_OPT is set on the cmd indicating
- * this special case.
- */
-
-static void include_required_opt_args(struct command *cmd, char *str)
-{
- char *oo_line;
- char *line;
- char *line_argv[MAX_LINE_ARGC];
- int line_argc;
-
- if (!(oo_line = get_oo_line(str))) {
- printf("No OO line found for %s\n", str);
- exit(1);
- }
-
- if (!(line = strdup(oo_line)))
- exit(1);
-
- split_line(line, &line_argc, line_argv, ' ');
- add_required_opt_line(cmd, line_argc, line_argv);
- free(line);
-}
-
-/* Process what follows command_name, which are required opt/pos args. */
-
-static void add_required_line(struct command *cmd, int argc, char *argv[])
-{
- int i;
- int takes_arg;
- int prev_was_opt = 0, prev_was_pos = 0;
-
- /* argv[0] is command name */
-
- for (i = 1; i < argc; i++) {
-
- if (is_opt_name(argv[i])) {
- /* add new required_opt_arg */
- add_opt_arg(cmd, argv[i], &takes_arg, REQUIRED);
- prev_was_opt = 1;
- prev_was_pos = 0;
-
- } else if (prev_was_opt && takes_arg) {
- /* set value for previous required_opt_arg */
- update_prev_opt_arg(cmd, argv[i], REQUIRED);
- prev_was_opt = 0;
- prev_was_pos = 0;
-
- } else if (is_pos_name(argv[i])) {
- /* add new required_pos_arg */
- add_pos_arg(cmd, argv[i], REQUIRED);
- prev_was_opt = 0;
- prev_was_pos = 1;
-
- } else if (!strncmp(argv[i], "OO_", 3)) {
- /* one required_opt_arg is required, special case lv/vgchange */
- cmd->cmd_flags |= CMD_FLAG_ONE_REQUIRED_OPT;
- include_required_opt_args(cmd, argv[i]);
-
- } else if (prev_was_pos) {
- /* set property for previous required_pos_arg */
- update_prev_pos_arg(cmd, argv[i], REQUIRED);
- } else
- printf("Can't parse argc %d argv %s prev %s\n",
- i, argv[i], argv[i-1]);
-
- }
-}
-
-static void add_flags(struct command *cmd, char *line)
-{
- if (strstr(line, "SECONDARY_SYNTAX"))
- cmd->cmd_flags |= CMD_FLAG_SECONDARY_SYNTAX;
-}
-
-#define MAX_RULE_OPTS 64
-
-static void add_rule(struct command *cmd, char *line)
-{
- struct cmd_rule *rule;
- char *line_argv[MAX_LINE_ARGC];
- char *arg;
- int line_argc;
- int i, lvt_enum, lvp_enum;
- int check = 0;
-
- if (cmd->rule_count == CMD_MAX_RULES) {
- printf("too many rules for cmd\n");
- exit(1);
- }
-
- rule = &cmd->rules[cmd->rule_count++];
-
- split_line(line, &line_argc, line_argv, ' ');
-
- for (i = 0; i < line_argc; i++) {
- arg = line_argv[i];
-
- if (!strcmp(arg, "not")) {
- rule->rule = RULE_INVALID;
- check = 1;
- }
-
- else if (!strcmp(arg, "and")) {
- rule->rule = RULE_REQUIRE;
- check = 1;
- }
-
- else if (!strncmp(arg, "all", 3)) {
- /* opt/lvt_bits/lvp_bits all remain 0 to mean all */
- continue;
- }
-
- else if (!strncmp(arg, "--", 2)) {
- if (!rule->opts) {
- if (!(rule->opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
- printf("no mem\n");
- exit(1);
- }
- memset(rule->opts, 0, MAX_RULE_OPTS * sizeof(int));
- }
-
- if (!rule->check_opts) {
- if (!(rule->check_opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
- printf("no mem\n");
- exit(1);
- }
- memset(rule->check_opts, 0, MAX_RULE_OPTS * sizeof(int));
- }
-
- if (check)
- rule->check_opts[rule->check_opts_count++] = opt_str_to_num(arg);
- else
- rule->opts[rule->opts_count++] = opt_str_to_num(arg);
- }
-
- else if (!strncmp(arg, "LV_", 3)) {
- lvt_enum = lv_to_enum(arg);
-
- if (check)
- rule->check_lvt_bits |= lvt_enum_to_bit(lvt_enum);
- else
- rule->lvt_bits |= lvt_enum_to_bit(lvt_enum);
- }
-
- else if (!strncmp(arg, "lv_is_", 6)) {
- lvp_enum = lvp_name_to_enum(arg);
-
- if (check)
- rule->check_lvp_bits |= lvp_enum_to_bit(lvp_enum);
- else
- rule->lvp_bits |= lvp_enum_to_bit(lvp_enum);
- }
- }
-}
-
-/* The given option is common to all lvm commands (set in lvm_all). */
-
-int is_lvm_all_opt(int opt)
-{
- int oo;
-
- for (oo = 0; oo < lvm_all.oo_count; oo++) {
- if (lvm_all.optional_opt_args[oo].opt == opt)
- return 1;
- }
- return 0;
-}
-
-/* Find common options for all variants of each command name. */
-
-static void factor_common_options(void)
-{
- int cn, opt_enum, ci, oo, ro, found;
- struct command *cmd;
-
- for (cn = 0; cn < MAX_CMD_NAMES; cn++) {
- if (!cmd_names[cn].name)
- break;
-
- for (ci = 0; ci < cmd_count; ci++) {
- cmd = &cmd_array[ci];
-
- if (strcmp(cmd->name, cmd_names[cn].name))
- continue;
-
- cmd_names[cn].variants++;
- }
-
- for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
-
- for (ci = 0; ci < cmd_count; ci++) {
- cmd = &cmd_array[ci];
-
- if (strcmp(cmd->name, cmd_names[cn].name))
- continue;
-
- if (cmd->ro_count)
- cmd_names[cn].variant_has_ro = 1;
- if (cmd->rp_count)
- cmd_names[cn].variant_has_rp = 1;
- if (cmd->oo_count)
- cmd_names[cn].variant_has_oo = 1;
- if (cmd->op_count)
- cmd_names[cn].variant_has_op = 1;
-
- for (ro = 0; ro < cmd->ro_count; ro++) {
- cmd_names[cn].all_options[cmd->required_opt_args[ro].opt] = 1;
-
- if ((cmd->required_opt_args[ro].opt == size_ARG) && !strncmp(cmd->name, "lv", 2))
- cmd_names[cn].all_options[extents_ARG] = 1;
- }
- for (oo = 0; oo < cmd->oo_count; oo++)
- cmd_names[cn].all_options[cmd->optional_opt_args[oo].opt] = 1;
-
- found = 0;
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- if (cmd->optional_opt_args[oo].opt == opt_enum) {
- found = 1;
- break;
- }
- }
-
- if (!found)
- goto next_opt;
- }
-
- /* all commands starting with this name use this option */
- cmd_names[cn].common_options[opt_enum] = 1;
- next_opt:
- ;
- }
- }
-}
-
-static int long_name_compare(const void *on1, const void *on2)
-{
- struct opt_name **optname1 = (void *)on1;
- struct opt_name **optname2 = (void *)on2;
- return strcmp((*optname1)->long_opt + 2, (*optname2)->long_opt + 2);
-}
-
-/* Create list of option names for printing alphabetically. */
-
-static void create_opt_names_alpha(void)
-{
- int i;
-
- for (i = 0; i < ARG_COUNT; i++)
- opt_names_alpha[i] = &opt_names[i];
-
- qsort(opt_names_alpha, ARG_COUNT, sizeof(long), long_name_compare);
-}
-
-static void print_help(int argc, char *argv[])
-{
- printf("%s [options] --output <format> <filename>\n", argv[0]);
- printf("\n");
- printf("output formats:\n");
- printf("struct: print C structures for command-lines.h\n");
- printf("count: print defines and enums for command-lines-count.h\n");
- printf("ambiguous: print commands differing only by LV types\n");
- printf("man: print man page format.\n");
- printf("\n");
- printf("options:\n");
- printf("-c|--man-command <commandname> man output for one command name\n");
-}
-
-int main(int argc, char *argv[])
-{
- char *outputformat = NULL;
- char *inputfile = NULL;
- FILE *file;
- struct command *cmd;
- char line[MAX_LINE];
- char line_orig[MAX_LINE];
- const char *name;
- char *line_argv[MAX_LINE_ARGC];
- char *n;
- int line_argc;
- int prev_was_oo_def = 0;
- int prev_was_oo = 0;
- int prev_was_op = 0;
-
- if (argc < 2) {
- print_help(argc, argv);
- exit(EXIT_FAILURE);
- }
-
- create_opt_names_alpha();
-
- static struct option long_options[] = {
- {"help", no_argument, 0, 'h' },
- {"output", required_argument, 0, 'o' },
- {"man-primary", required_argument, 0, 'p' },
- {"man-secondary", required_argument, 0, 's' },
- {"man-command", required_argument, 0, 'c' },
- {0, 0, 0, 0 }
- };
-
- while (1) {
- int c;
- int option_index = 0;
-
- c = getopt_long(argc, argv, "ho:p:s:c:",
- long_options, &option_index);
- if (c == -1)
- break;
-
- switch (c) {
- case '0':
- break;
- case 'h':
- print_help(argc, argv);
- exit(EXIT_SUCCESS);
- case 'o':
- outputformat = strdup(optarg);
- break;
- case 'p':
- include_man_primary = atoi(optarg);
- break;
- case 's':
- include_man_secondary = atoi(optarg);
- break;
- case 'c':
- man_command_name = strdup(optarg);
- break;
- }
- }
-
- if (optind < argc)
- inputfile = argv[optind];
- else {
- printf("Missing filename.\n");
- return 0;
- }
-
- if (!(file = fopen(inputfile, "r"))) {
- printf("Cannot open %s\n", argv[1]);
- return -1;
- }
-
- /* Process each line of input file. */
-
- while (fgets(line, MAX_LINE, file)) {
- if (line[0] == '#')
- continue;
- if (line[0] == '\n')
- continue;
- if (line[0] == '-' && line[1] == '-' && line[2] == '-')
- continue;
-
- if ((n = strchr(line, '\n')))
- *n = '\0';
-
- memcpy(line_orig, line, sizeof(line));
- split_line(line, &line_argc, line_argv, ' ');
-
- if (!line_argc)
- continue;
-
- /* command ... */
- if ((name = is_command_name(line_argv[0]))) {
- if (cmd_count >= MAX_CMDS) {
- printf("MAX_CMDS too small\n");
- return -1;
- }
- cmd = &cmd_array[cmd_count++];
- cmd->name = name;
- cmd->pos_count = 1;
- add_required_line(cmd, line_argc, line_argv);
-
- /* Every cmd gets the OO_ALL options */
- include_optional_opt_args(cmd, "OO_ALL:");
- continue;
- }
-
- if (is_desc_line(line_argv[0])) {
- char *desc = strdup(line_orig);
- if (cmd->desc) {
- int newlen = strlen(cmd->desc) + strlen(desc) + 2;
- char *newdesc = malloc(newlen);
- memset(newdesc, 0, newlen);
- snprintf(newdesc, newlen, "%s %s", cmd->desc, desc);
- cmd->desc = newdesc;
- free(desc);
- } else
- cmd->desc = desc;
- continue;
- }
-
- if (is_flags_line(line_argv[0])) {
- add_flags(cmd, line_orig);
- continue;
- }
-
- if (is_rule_line(line_argv[0])) {
- add_rule(cmd, line_orig);
- continue;
- }
-
- if (is_id_line(line_argv[0])) {
- cmd->command_line_id = strdup(line_argv[1]);
- continue;
- }
-
- /* OO_FOO: ... */
- if (is_oo_definition(line_argv[0])) {
- add_oo_definition_line(line_argv[0], line_orig);
- prev_was_oo_def = 1;
- prev_was_oo = 0;
- prev_was_op = 0;
- continue;
- }
-
- /* OO: ... */
- if (is_oo_line(line_argv[0])) {
- add_optional_opt_line(cmd, line_argc, line_argv);
- prev_was_oo_def = 0;
- prev_was_oo = 1;
- prev_was_op = 0;
- continue;
- }
-
- /* OP: ... */
- if (is_op_line(line_argv[0])) {
- add_optional_pos_line(cmd, line_argc, line_argv);
- prev_was_oo_def = 0;
- prev_was_oo = 0;
- prev_was_op = 1;
- continue;
- }
-
- /* IO: ... */
- if (is_io_line(line_argv[0])) {
- add_ignore_opt_line(cmd, line_argc, line_argv);
- prev_was_oo = 0;
- prev_was_op = 0;
- continue;
- }
-
- /* handle OO_FOO:, OO:, OP: continuing on multiple lines */
-
- if (prev_was_oo_def) {
- append_oo_definition_line(line_orig);
- continue;
- }
-
- if (prev_was_oo) {
- add_optional_opt_line(cmd, line_argc, line_argv);
- continue;
- }
-
- if (prev_was_op) {
- add_optional_pos_line(cmd, line_argc, line_argv);
- continue;
- }
- }
-
- fclose(file);
-
- /*
- * Looks at all variants of each command name and figures out
- * which options are common to all variants (for compact output)
- */
- factor_common_options();
-
- /*
- * Predefined string of options common to all commands
- * (for compact output)
- */
- include_optional_opt_args(&lvm_all, "OO_USAGE_COMMON");
-
- /*
- * Print output.
- */
-
- if (!strcmp(outputformat, "struct"))
- print_header_struct();
-
- else if (!strcmp(outputformat, "count"))
- print_header_count();
-
- else if (!strcmp(outputformat, "ambiguous"))
- print_ambiguous();
-
- else if (!strcmp(outputformat, "man"))
- print_man(man_command_name, include_man_primary, include_man_secondary);
- else
- print_help(argc, argv);
-
- return 0;
-}
-
diff --git a/tools/ccmd-man.c b/tools/ccmd-man.c
deleted file mode 100644
index 34a9c38..0000000
--- a/tools/ccmd-man.c
+++ /dev/null
@@ -1,997 +0,0 @@
-#include <asm/types.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <limits.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <sched.h>
-#include <dirent.h>
-#include <ctype.h>
-
-#include "ccmd.h"
-
-char *split_line(char *buf, int *argc, char **argv, char sep);
-struct cmd_name *find_command_name(const char *str);
-int is_lvm_all_opt(int opt);
-const char *lvt_enum_to_name(int lvt_enum);
-
-extern struct val_name val_names[VAL_COUNT + 1];
-extern struct opt_name opt_names[ARG_COUNT + 1];
-extern struct lvp_name lvp_names[LVP_COUNT + 1];
-extern struct lvt_name lvt_names[LVT_COUNT + 1];
-extern struct cmd_name cmd_names[MAX_CMD_NAMES];
-extern struct opt_name *opt_names_alpha[ARG_COUNT + 1];
-extern struct command lvm_all;
-
-static const char *cmd_name_desc(const char *name)
-{
- int i;
-
- for (i = 0; i < MAX_CMD_NAMES; i++) {
- if (!cmd_names[i].name)
- break;
- if (!strcmp(cmd_names[i].name, name))
- return cmd_names[i].desc;
- }
- return NULL;
-}
-
-static void print_val_man(const char *str)
-{
- char *line;
- char *line_argv[MAX_LINE_ARGC];
- int line_argc;
- int i;
-
- if (!strcmp(str, "Number") ||
- !strcmp(str, "String") ||
- !strncmp(str, "VG", 2) ||
- !strncmp(str, "LV", 2) ||
- !strncmp(str, "PV", 2) ||
- !strcmp(str, "Tag")) {
- printf("\\fI%s\\fP", str);
- return;
- }
-
- if (strstr(str, "Number[") || strstr(str, "]Number")) {
- for (i = 0; i < strlen(str); i++) {
- if (str[i] == 'N')
- printf("\\fI");
- if (str[i] == 'r') {
- printf("%c", str[i]);
- printf("\\fP");
- continue;
- }
- printf("%c", str[i]);
- }
- return;
- }
-
- if (strstr(str, "|")) {
- int len = strlen(str);
- line = strdup(str);
- split_line(line, &line_argc, line_argv, '|');
- for (i = 0; i < line_argc; i++) {
- if (i) {
- printf("|");
-
- /* this is a hack to add a line break for
- a long string of opt values */
- if ((len > 40) && (i >= (line_argc / 2) + 1)) {
- printf("\n");
- printf(" ");
- len = 0;
- }
- }
- if (strstr(line_argv[i], "Number"))
- printf("\\fI%s\\fP", line_argv[i]);
- else
- printf("\\fB%s\\fP", line_argv[i]);
- }
- return;
- }
-
- printf("\\fB%s\\fP", str);
-}
-
-static void print_def_man(struct arg_def *def, int usage)
-{
- int val_enum;
- int lvt_enum;
- int sep = 0;
- int i;
-
- for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
- if (def->val_bits & val_enum_to_bit(val_enum)) {
-
- if (val_enum == conststr_VAL) {
- printf("\\fB");
- printf("%s", def->str);
- printf("\\fP");
- }
-
- else if (val_enum == constnum_VAL) {
- printf("\\fB");
- printf("%llu", (unsigned long long)def->num);
- printf("\\fP");
- }
-
- else {
- if (sep) printf("|");
-
- if (!usage || !val_names[val_enum].usage) {
- printf("\\fI");
- printf("%s", val_names[val_enum].name);
- printf("\\fP");
- } else {
- print_val_man(val_names[val_enum].usage);
- }
-
- sep = 1;
- }
-
- if (val_enum == lv_VAL && def->lvt_bits) {
- printf("\\fI");
- for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
- if (lvt_bit_is_set(def->lvt_bits, lvt_enum))
- printf("_%s", lvt_enum_to_name(lvt_enum));
- }
- printf("\\fP");
- }
-
- if ((val_enum == vg_VAL) && (def->flags & ARG_DEF_FLAG_NEW_VG)) {
- printf("\\fI");
- printf("_new");
- printf("\\fP");
- }
- if ((val_enum == lv_VAL) && (def->flags & ARG_DEF_FLAG_NEW_LV)) {
- printf("\\fI");
- printf("_new");
- printf("\\fP");
- }
- }
- }
-
- if (def->flags & ARG_DEF_FLAG_MAY_REPEAT)
- printf(" ...");
-}
-
-static char *man_long_opt_name(const char *cmdname, int opt_enum)
-{
- static char long_opt_name[64];
-
- memset(&long_opt_name, 0, sizeof(long_opt_name));
-
- switch (opt_enum) {
- case syncaction_ARG:
- strncpy(long_opt_name, "--[raid]syncaction", 63);
- break;
- case writemostly_ARG:
- strncpy(long_opt_name, "--[raid]writemostly", 63);
- break;
- case minrecoveryrate_ARG:
- strncpy(long_opt_name, "--[raid]minrecoveryrate", 63);
- break;
- case maxrecoveryrate_ARG:
- strncpy(long_opt_name, "--[raid]maxrecoveryrate", 63);
- break;
- case writebehind_ARG:
- strncpy(long_opt_name, "--[raid]writebehind", 63);
- break;
- case vgmetadatacopies_ARG:
- if (!strncmp(cmdname, "vg", 2))
- strncpy(long_opt_name, "--[vg]metadatacopies", 63);
- else
- strncpy(long_opt_name, "--vgmetadatacopies", 63);
- break;
- case pvmetadatacopies_ARG:
- if (!strncmp(cmdname, "pv", 2))
- strncpy(long_opt_name, "--[pv]metadatacopies", 63);
- else
- strncpy(long_opt_name, "--pvmetadatacopies", 63);
- break;
- default:
- strncpy(long_opt_name, opt_names[opt_enum].long_opt, 63);
- break;
- }
-
- return long_opt_name;
-}
-
-void print_man_usage(struct command *cmd)
-{
- struct cmd_name *cname;
- int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
- int i, sep, ro, rp, oo, op, opt_enum;
-
- if (!(cname = find_command_name(cmd->name)))
- return;
-
- printf("\\fB%s\\fP", cmd->name);
-
- if (!onereq)
- goto ro_normal;
-
- /*
- * one required option in a set, print as:
- * ( -a|--a,
- * -b|--b,
- * --c,
- * --d )
- *
- * First loop through ro prints those with short opts,
- * and the second loop prints those without short opts.
- */
-
- if (cmd->ro_count) {
- printf("\n");
- printf(".RS 4\n");
- printf("(");
-
- sep = 0;
-
- /* print required options with a short opt */
- for (ro = 0; ro < cmd->ro_count; ro++) {
- opt_enum = cmd->required_opt_args[ro].opt;
-
- if (!opt_names[opt_enum].short_opt)
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- if (opt_names[opt_enum].short_opt) {
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cmd->name, opt_enum));
- } else {
- printf(" ");
- printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
- }
-
- if (cmd->required_opt_args[ro].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->required_opt_args[ro].def, 1);
- }
-
- sep = 1;
- }
-
- /* print required options without a short opt */
- for (ro = 0; ro < cmd->ro_count; ro++) {
- opt_enum = cmd->required_opt_args[ro].opt;
-
- if (opt_names[opt_enum].short_opt)
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- printf(" ");
- printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
-
- if (cmd->required_opt_args[ro].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->required_opt_args[ro].def, 1);
- }
-
- sep = 1;
- }
-
- printf(" )\n");
- printf(".RE\n");
- }
-
- /* print required position args on a new line after the onereq set */
- if (cmd->rp_count) {
- printf(".RS 4\n");
- for (rp = 0; rp < cmd->rp_count; rp++) {
- if (cmd->required_pos_args[rp].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->required_pos_args[rp].def, 1);
- }
- }
-
- printf("\n");
- printf(".RE\n");
- } else {
- /* printf("\n"); */
- }
-
- printf(".br\n");
- goto oo_count;
-
- ro_normal:
-
- /*
- * all are required options, print as:
- * -a|--aaa <val> -b|--bbb <val>
- */
-
- if (cmd->ro_count) {
- for (ro = 0; ro < cmd->ro_count; ro++) {
- opt_enum = cmd->required_opt_args[ro].opt;
-
- if (opt_names[opt_enum].short_opt) {
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cmd->name, opt_enum));
- } else {
- printf(" \\fB%s\\fP", opt_names[cmd->required_opt_args[ro].opt].long_opt);
- }
-
- if (cmd->required_opt_args[ro].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->required_opt_args[ro].def, 1);
- }
- }
- }
-
- /* print required position args on the same line as the required options */
- if (cmd->rp_count) {
- for (rp = 0; rp < cmd->rp_count; rp++) {
- if (cmd->required_pos_args[rp].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->required_pos_args[rp].def, 1);
- }
- }
-
- printf("\n");
- } else {
- printf("\n");
- }
-
- printf(".br\n");
-
- oo_count:
- if (!cmd->oo_count)
- goto op_count;
-
- sep = 0;
-
- if (cmd->oo_count) {
- printf(".RS 4\n");
- printf("[");
-
- /* print optional options with short opts */
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- opt_enum = cmd->optional_opt_args[oo].opt;
-
- if (!opt_names[opt_enum].short_opt)
- continue;
-
- /*
- * Skip common opts which are in the usage_common string.
- * The common opts are those in lvm_all and in
- * cname->common_options.
- */
-
- if (is_lvm_all_opt(opt_enum))
- continue;
-
- if ((cname->variants > 1) && cname->common_options[opt_enum])
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cmd->name, opt_enum));
-
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- }
-
- /* print optional options without short opts */
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- opt_enum = cmd->optional_opt_args[oo].opt;
-
- if (opt_names[opt_enum].short_opt)
- continue;
-
- /*
- * Skip common opts which are in the usage_common string.
- * The common opts are those in lvm_all and in
- * cname->common_options.
- */
-
- if (is_lvm_all_opt(opt_enum))
- continue;
-
- if ((cname->variants > 1) && cname->common_options[opt_enum])
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- /* space alignment without short opt */
- printf(" ");
-
- printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
-
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- }
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- /* space alignment without short opt */
- printf(" ");
- }
- printf(" COMMON_OPTIONS");
- printf(" ]\n");
- printf(".RE\n");
- printf(".br\n");
- }
-
- op_count:
- if (!cmd->op_count)
- goto done;
-
- printf(".RS 4\n");
- printf("[");
-
- if (cmd->op_count) {
- for (op = 0; op < cmd->op_count; op++) {
- if (cmd->optional_pos_args[op].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->optional_pos_args[op].def, 1);
- }
- }
- }
-
- printf(" ]\n");
- printf(".RE\n");
-
- done:
- printf("\n");
-}
-
-/*
- * common options listed in the usage section.
- *
- * For commands with only one variant, this is only
- * the options which are common to all lvm commands
- * (in lvm_all, see is_lvm_all_opt).
- *
- * For commands with more than one variant, this
- * is the set of options common to all variants
- * (in cname->common_options), (which obviously
- * includes the options common to all lvm commands.)
- *
- * List ordering:
- * options with short+long names, alphabetically,
- * then options with only long names, alphabetically
- */
-
-void print_man_usage_common(struct command *cmd)
-{
- struct cmd_name *cname;
- int i, sep, ro, rp, oo, op, opt_enum;
-
- if (!(cname = find_command_name(cmd->name)))
- return;
-
- sep = 0;
-
- printf(".RS 4\n");
- printf("[");
-
- /* print those with short opts */
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
- if (!cname->common_options[opt_enum])
- continue;
-
- if (!opt_names[opt_enum].short_opt)
- continue;
-
- if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- if (cmd->optional_opt_args[oo].opt != opt_enum)
- continue;
-
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cmd->name, opt_enum));
-
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- break;
- }
-
- }
-
- /* print those without short opts */
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
- if (!cname->common_options[opt_enum])
- continue;
-
- if (opt_names[opt_enum].short_opt)
- continue;
-
- if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- if (cmd->optional_opt_args[oo].opt != opt_enum)
- continue;
-
- /* space alignment without short opt */
- printf(" ");
-
- printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
-
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- break;
- }
- }
-
- printf(" ]\n");
- return;
-}
-
-/*
- * Format of description, when different command names have
- * different descriptions:
- *
- * "#cmdname1"
- * "text foo goes here"
- * "a second line of text."
- * "#cmdname2"
- * "text bar goes here"
- * "another line of text."
- *
- * When called for cmdname2, this function should just print:
- *
- * "text bar goes here"
- * "another line of text."
- */
-
-static void print_man_option_desc(struct cmd_name *cname, int opt_enum)
-{
- const char *desc = opt_names[opt_enum].desc;
- char buf[DESC_LINE];
- int started_cname = 0;
- int line_count = 0;
- int di, bi = 0;
-
- if (desc[0] != '#') {
- printf("%s", desc);
- return;
- }
-
- for (di = 0; di < strlen(desc); di++) {
- buf[bi++] = desc[di];
-
- if (bi == DESC_LINE) {
- printf("print_man_option_desc line too long\n");
- return;
- }
-
- if (buf[bi-1] != '\n')
- continue;
-
- if (buf[0] != '#') {
- if (started_cname) {
- printf("%s", buf);
- line_count++;
- }
-
- memset(buf, 0, sizeof(buf));
- bi = 0;
- continue;
- }
-
- /* Line starting with #cmdname */
-
- /*
- * Must be starting a new command name.
- * If no lines have been printed, multiple command names
- * are using the same text. If lines have been printed,
- * then the start of a new command name means the end
- * of text for the current command name.
- */
- if (line_count && started_cname)
- return;
-
- if (!strncmp(buf + 1, cname->name, strlen(cname->name))) {
- /* The start of our command name. */
- started_cname = 1;
- memset(buf, 0, sizeof(buf));
- bi = 0;
- } else {
- /* The start of another command name. */
- memset(buf, 0, sizeof(buf));
- bi = 0;
- }
- }
-
- if (bi && started_cname)
- printf("%s", buf);
-}
-
-/*
- * Print a list of all options names for a given
- * command name, listed by:
- * options with short+long names, alphabetically,
- * then options with only long names, alphabetically
- */
-
-void print_man_all_options_list(struct cmd_name *cname)
-{
- int opt_enum, val_enum;
- int sep = 0;
- int i;
-
- /* print those with both short and long opts */
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
-
- if (!cname->all_options[opt_enum])
- continue;
-
- if (!opt_names[opt_enum].short_opt)
- continue;
-
- if (sep)
- printf("\n.br\n");
-
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cname->name, opt_enum));
-
- val_enum = opt_names[opt_enum].val_enum;
-
- if (!val_names[val_enum].fn) {
- /* takes no arg */
- } else if (!val_names[val_enum].usage) {
- printf(" ");
- printf("\\fI");
- printf("%s", val_names[val_enum].name);
- printf("\\fP");
- } else {
- printf(" ");
- print_val_man(val_names[val_enum].usage);
- }
-
- sep = 1;
- }
-
- /* print those without short opts */
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
- if (!cname->all_options[opt_enum])
- continue;
-
- if (opt_names[opt_enum].short_opt)
- continue;
-
- if (sep)
- printf("\n.br\n");
-
- /* space alignment without short opt */
- printf(" ");
-
- printf(" \\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
-
- val_enum = opt_names[opt_enum].val_enum;
-
- if (!val_names[val_enum].fn) {
- /* takes no arg */
- } else if (!val_names[val_enum].usage) {
- printf(" ");
- printf("\\fI");
- printf("%s", val_names[val_enum].name);
- printf("\\fP");
- } else {
- printf(" ");
- print_val_man(val_names[val_enum].usage);
- }
-
- sep = 1;
- }
-}
-
-/*
- * All options used for a given command name, along with descriptions.
- * listed in order of:
- * 1. options that are not common to all lvm commands, alphabetically
- * 2. options common to all lvm commands, alphabetically
- */
-
-void print_man_all_options_desc(struct cmd_name *cname)
-{
- int opt_enum, val_enum;
- int print_common = 0;
- int sep = 0;
- int i;
-
- again:
- /*
- * Loop 1: print options that are not common to all lvm commands.
- * Loop 2: print options common to all lvm commands (lvm_all)
- */
-
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
- if (!cname->all_options[opt_enum])
- continue;
-
- if (!print_common && is_lvm_all_opt(opt_enum))
- continue;
-
- if (print_common && !is_lvm_all_opt(opt_enum))
- continue;
-
- if (sep)
- printf("\n.br\n");
-
- printf("\n.TP\n");
-
- if (opt_names[opt_enum].short_opt) {
- printf("\\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cname->name, opt_enum));
- } else {
- printf("\\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
- }
-
- val_enum = opt_names[opt_enum].val_enum;
-
- if (!val_names[val_enum].fn) {
- /* takes no arg */
- } else if (!val_names[val_enum].usage) {
- printf(" ");
- printf("\\fI");
- printf("%s", val_names[val_enum].name);
- printf("\\fP");
- } else {
- printf(" ");
- print_val_man(val_names[val_enum].usage);
- }
-
- if (opt_names[opt_enum].desc) {
- printf("\n");
- printf(".br\n");
- print_man_option_desc(cname, opt_enum);
- }
-
- sep = 1;
- }
-
- if (!print_common) {
- print_common = 1;
- goto again;
- }
-}
-
-void print_desc_man(const char *desc)
-{
- char buf[DESC_LINE] = {0};
- int di = 0;
- int bi = 0;
-
- for (di = 0; di < strlen(desc); di++) {
- if (desc[di] == '\0')
- break;
- if (desc[di] == '\n')
- continue;
-
- if (!strncmp(&desc[di], "DESC:", 5)) {
- if (bi) {
- printf("%s\n", buf);
- printf(".br\n");
- memset(buf, 0, sizeof(buf));
- bi = 0;
- }
- di += 5;
- continue;
- }
-
- if (!bi && desc[di] == ' ')
- continue;
-
- buf[bi++] = desc[di];
-
- if (bi == (DESC_LINE - 1))
- break;
- }
-
- if (bi) {
- printf("%s\n", buf);
- printf(".br\n");
- }
-}
-
-static char *upper_command_name(char *str)
-{
- static char str_upper[32];
- int i = 0;
-
- while (*str) {
- str_upper[i++] = toupper(*str);
- str++;
- }
- str_upper[i] = '\0';
- return str_upper;
-}
-
-void print_man(char *man_command_name, int include_primary, int include_secondary)
-{
- struct cmd_name *cname;
- struct command *cmd, *prev_cmd = NULL;
- const char *desc;
- int i, j, ro, rp, oo, op;
-
- printf(".TH %s 8 \"LVM TOOLS #VERSION#\" \"Sistina Software UK\"\n",
- man_command_name ? upper_command_name(man_command_name) : "LVM_COMMANDS");
-
- for (i = 0; i < cmd_count; i++) {
-
- cmd = &cmd_array[i];
-
- if (prev_cmd && strcmp(prev_cmd->name, cmd->name)) {
- printf("Common options:\n");
- printf(".\n");
- print_man_usage_common(prev_cmd);
-
- printf("\n");
- printf(".SH OPTIONS\n");
- printf(".br\n");
- print_man_all_options_desc(cname);
-
- prev_cmd = NULL;
- }
-
- if ((cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_secondary)
- continue;
-
- if (!(cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_primary)
- continue;
-
- if (man_command_name && strcmp(man_command_name, cmd->name))
- continue;
-
- if (!prev_cmd || strcmp(prev_cmd->name, cmd->name)) {
- printf(".SH NAME\n");
- printf(".\n");
- if ((desc = cmd_name_desc(cmd->name)))
- printf("%s \\- %s\n", cmd->name, desc);
- else
- printf("%s\n", cmd->name);
- printf(".br\n");
- printf(".P\n");
- printf(".\n");
- printf(".SH SYNOPSIS\n");
- printf(".br\n");
- printf(".P\n");
- printf(".\n");
- prev_cmd = cmd;
-
- if (!(cname = find_command_name(cmd->name)))
- return;
-
- if (cname->variant_has_ro && cname->variant_has_rp)
- printf("\\fB%s\\fP \\fIrequired_option_args\\fP \\fIrequired_position_args\\fP\n", cmd->name);
- else if (cname->variant_has_ro && !cname->variant_has_rp)
- printf("\\fB%s\\fP \\fIrequired_option_args\\fP\n", cmd->name);
- else if (!cname->variant_has_ro && cname->variant_has_rp)
- printf("\\fB%s\\fP \\fIrequired_position_args\\fP\n", cmd->name);
- else if (!cname->variant_has_ro && !cname->variant_has_rp)
- printf("\\fB%s\\fP\n", cmd->name);
-
- printf(".br\n");
-
- if (cname->variant_has_oo) {
- printf(" [ \\fIoptional_option_args\\fP ]\n");
- printf(".br\n");
- }
-
- if (cname->variant_has_op) {
- printf(" [ \\fIoptional_position_args\\fP ]\n");
- printf(".br\n");
- }
-
- printf(".P\n");
- printf("\n");
-
- /* listing them all when there's only 1 or 2 is just repetative */
- if (cname->variants > 2) {
- printf(".P\n");
- print_man_all_options_list(cname);
- printf("\n");
- printf(".P\n");
- printf("\n");
- }
-
- printf(".SH USAGE\n");
- printf(".br\n");
- printf(".P\n");
- printf(".\n");
- }
-
- if (cmd->desc) {
- print_desc_man(cmd->desc);
- printf(".P\n");
- }
-
- print_man_usage(cmd);
-
- if (i == (cmd_count - 1)) {
- printf("Common options:\n");
- printf(".\n");
- print_man_usage_common(cmd);
-
- printf("\n");
- printf(".SH OPTIONS\n");
- printf(".br\n");
- print_man_all_options_desc(cname);
-
- }
-
- printf("\n");
- continue;
- }
-}
-
diff --git a/tools/ccmd-util.c b/tools/ccmd-util.c
deleted file mode 100644
index 15b2f96..0000000
--- a/tools/ccmd-util.c
+++ /dev/null
@@ -1,936 +0,0 @@
-#include <asm/types.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <limits.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <sched.h>
-#include <dirent.h>
-#include <ctype.h>
-
-#include "ccmd.h"
-
-struct cmd_name *find_command_name(const char *str);
-int is_lvm_all_opt(int opt);
-
-extern struct val_name val_names[VAL_COUNT + 1];
-extern struct opt_name opt_names[ARG_COUNT + 1];
-extern struct lvp_name lvp_names[LVP_COUNT + 1];
-extern struct lvt_name lvt_names[LVT_COUNT + 1];
-extern struct cmd_name cmd_names[MAX_CMD_NAMES];
-extern struct command lvm_all;
-
-/*
- * modifies buf, replacing the sep characters with \0
- * argv pointers point to positions in buf
- */
-
-char *split_line(char *buf, int *argc, char **argv, char sep)
-{
- char *p = buf, *rp = NULL;
- int i;
-
- argv[0] = p;
-
- for (i = 1; i < MAX_LINE_ARGC; i++) {
- p = strchr(buf, sep);
- if (!p)
- break;
- *p = '\0';
-
- argv[i] = p + 1;
- buf = p + 1;
- }
- *argc = i;
-
- /* we ended by hitting \0, return the point following that */
- if (!rp)
- rp = strchr(buf, '\0') + 1;
-
- return rp;
-}
-
-/* convert value string, e.g. Number, to foo_VAL enum */
-
-int val_str_to_num(char *str)
-{
- char name[32] = { 0 };
- char *new;
- int i;
-
- /* compare the name before any suffix like _new or _<lvtype> */
-
- strncpy(name, str, 31);
- if ((new = strstr(name, "_")))
- *new = '\0';
-
- for (i = 0; i < VAL_COUNT; i++) {
- if (!val_names[i].name)
- break;
- if (!strncmp(name, val_names[i].name, strlen(val_names[i].name)))
- return val_names[i].val_enum;
- }
-
- return 0;
-}
-
-/* convert "--option" to foo_ARG enum */
-
-int opt_str_to_num(char *str)
-{
- char long_name[32];
- char *p;
- int i;
-
- /*
- * --foo_long means there are two args entries
- * for --foo, one with a short option and one
- * without, and we want the one without the
- * short option.
- */
- if (strstr(str, "_long")) {
- strcpy(long_name, str);
- p = strstr(long_name, "_long");
- *p = '\0';
-
- for (i = 0; i < ARG_COUNT; i++) {
- if (!opt_names[i].long_opt)
- continue;
- /* skip anything with a short opt */
- if (opt_names[i].short_opt)
- continue;
- if (!strcmp(opt_names[i].long_opt, long_name))
- return opt_names[i].opt_enum;
- }
-
- printf("Unknown opt str: %s %s\n", str, long_name);
- exit(1);
- }
-
- for (i = 0; i < ARG_COUNT; i++) {
- if (!opt_names[i].long_opt)
- continue;
- /* These are only selected using --foo_long */
- if (strstr(opt_names[i].name, "_long_ARG"))
- continue;
- if (!strcmp(opt_names[i].long_opt, str))
- return opt_names[i].opt_enum;
- }
-
- printf("Unknown opt str: \"%s\"\n", str);
- exit(1);
-}
-
-/* "lv_is_prop" to is_prop_LVP */
-
-int lvp_name_to_enum(char *str)
-{
- int i;
-
- for (i = 1; i < LVP_COUNT; i++) {
- if (!strcmp(str, lvp_names[i].name))
- return lvp_names[i].lvp_enum;
- }
- printf("unknown lv property %s\n", str);
- exit(1);
-}
-
-/* type_LVT to "type" */
-
-const char *lvt_enum_to_name(int lvt_enum)
-{
- return lvt_names[lvt_enum].name;
-}
-
-/* "type" to type_LVT */
-
-static int lvt_name_to_enum(char *str)
-{
- int i;
-
- for (i = 1; i < LVT_COUNT; i++) {
- if (!strcmp(str, lvt_names[i].name))
- return lvt_names[i].lvt_enum;
- }
- printf("unknown lv type %s\n", str);
- exit(1);
-}
-
-/* LV_<type> to <type>_LVT */
-
-int lv_to_enum(char *name)
-{
- return lvt_name_to_enum(name + 3);
-}
-
-/*
- * LV_<type1>_<type2> to lvt_bits
- *
- * type1 to lvt_enum
- * lvt_bits |= lvt_enum_to_bit(lvt_enum)
- * type2 to lvt_enum
- * lvt_bits |= lvt_enum_to_bit(lvt_enum)
- */
-
-uint64_t lv_to_bits(char *name)
-{
- char buf[64];
- char *argv[MAX_LINE_ARGC];
- uint64_t lvt_bits = 0;
- int lvt_enum;
- int argc;
- int i;
-
- strcpy(buf, name);
-
- split_line(buf, &argc, argv, '_');
-
- /* 0 is "LV" */
- for (i = 1; i < argc; i++) {
- if (!strcmp(argv[i], "new"))
- continue;
- lvt_enum = lvt_name_to_enum(argv[i]);
- lvt_bits |= lvt_enum_to_bit(lvt_enum);
- }
-
- return lvt_bits;
-}
-
-/* output for struct/count */
-
-static char *val_bits_to_str(uint64_t val_bits)
-{
- static char buf[1024];
- int i;
- int or = 0;
-
- memset(buf, 0, sizeof(buf));
-
- for (i = 0; i < VAL_COUNT; i++) {
- if (val_bits & val_enum_to_bit(i)) {
- if (or) strcat(buf, " | ");
- strcat(buf, "val_enum_to_bit(");
- strcat(buf, val_names[i].enum_name);
- strcat(buf, ")");
- or = 1;
- }
- }
-
- return buf;
-}
-
-/*
- * When bits for foo_LVP and bar_LVP are both set in bits, print:
- * lvp_enum_to_bit(foo_LVP) | lvp_enum_to_bit(bar_LVP)
- */
-
-static char *lvp_bits_to_str(uint64_t bits)
-{
- static char lvp_buf[1024];
- int i;
- int or = 0;
-
- memset(lvp_buf, 0, sizeof(lvp_buf));
-
- for (i = 0; i < LVP_COUNT; i++) {
- if (bits & lvp_enum_to_bit(i)) {
- if (or) strcat(lvp_buf, " | ");
- strcat(lvp_buf, "lvp_enum_to_bit(");
- strcat(lvp_buf, lvp_names[i].enum_name);
- strcat(lvp_buf, ")");
- or = 1;
- }
- }
-
- return lvp_buf;
-}
-
-/*
- * When bits for foo_LVT and bar_LVT are both set in bits, print:
- * lvt_enum_to_bit(foo_LVT) | lvt_enum_to_bit(bar_LVT)
- */
-
-static char *lvt_bits_to_str(uint64_t bits)
-{
- static char lvt_buf[1024];
- int i;
- int or = 0;
-
- memset(lvt_buf, 0, sizeof(lvt_buf));
-
- for (i = 1; i < LVT_COUNT; i++) {
- if (bits & lvt_enum_to_bit(i)) {
- if (or) strcat(lvt_buf, " | ");
- strcat(lvt_buf, "lvt_enum_to_bit(");
- strcat(lvt_buf, lvt_names[i].enum_name);
- strcat(lvt_buf, ")");
- or = 1;
- }
- }
-
- return lvt_buf;
-}
-
-static void print_def(struct arg_def *def, int usage)
-{
- int val_enum;
- int lvt_enum;
- int sep = 0;
- int i;
-
- for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
- if (def->val_bits & val_enum_to_bit(val_enum)) {
-
- if (val_enum == conststr_VAL)
- printf("%s", def->str);
-
- else if (val_enum == constnum_VAL)
- printf("%llu", (unsigned long long)def->num);
-
- else {
- if (sep) printf("|");
-
- if (!usage || !val_names[val_enum].usage)
- printf("%s", val_names[val_enum].name);
- else
- printf("%s", val_names[val_enum].usage);
-
- sep = 1;
- }
-
- if (val_enum == lv_VAL && def->lvt_bits) {
- for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
- if (lvt_bit_is_set(def->lvt_bits, lvt_enum))
- printf("_%s", lvt_enum_to_name(lvt_enum));
- }
- }
-
- if ((val_enum == vg_VAL) && (def->flags & ARG_DEF_FLAG_NEW_VG))
- printf("_new");
- if ((val_enum == lv_VAL) && (def->flags & ARG_DEF_FLAG_NEW_LV))
- printf("_new");
- }
- }
-
- if (def->flags & ARG_DEF_FLAG_MAY_REPEAT)
- printf(" ...");
-}
-
-static int opt_arg_matches(struct opt_arg *oa1, struct opt_arg *oa2)
-{
- if (oa1->opt != oa2->opt)
- return 0;
-
- /* FIXME: some cases may need more specific val_bits checks */
- if (oa1->def.val_bits != oa2->def.val_bits)
- return 0;
-
- if (oa1->def.str && oa2->def.str && strcmp(oa1->def.str, oa2->def.str))
- return 0;
-
- if (oa1->def.num != oa2->def.num)
- return 0;
-
- /*
- * Do NOT compare lv_types because we are checking if two
- * command lines are ambiguous before the LV type is known.
- */
-
- return 1;
-}
-
-static int pos_arg_matches(struct pos_arg *pa1, struct pos_arg *pa2)
-{
- if (pa1->pos != pa2->pos)
- return 0;
-
- /* FIXME: some cases may need more specific val_bits checks */
- if (pa1->def.val_bits != pa2->def.val_bits)
- return 0;
-
- if (pa1->def.str && pa2->def.str && strcmp(pa1->def.str, pa2->def.str))
- return 0;
-
- if (pa1->def.num != pa2->def.num)
- return 0;
-
- /*
- * Do NOT compare lv_types because we are checking if two
- * command lines are ambiguous before the LV type is known.
- */
-
- return 1;
-}
-
-static const char *opt_to_enum_str(int opt)
-{
- return opt_names[opt].name;
-}
-
-static char *flags_to_str(int flags)
-{
- static char buf_flags[32];
-
- memset(buf_flags, 0, sizeof(buf_flags));
-
- if (flags & ARG_DEF_FLAG_MAY_REPEAT) {
- if (buf_flags[0])
- strcat(buf_flags, " | ");
- strcat(buf_flags, "ARG_DEF_FLAG_MAY_REPEAT");
- }
- if (flags & ARG_DEF_FLAG_NEW_VG) {
- if (buf_flags[0])
- strcat(buf_flags, " | ");
- strcat(buf_flags, "ARG_DEF_FLAG_NEW_VG");
- }
- if (flags & ARG_DEF_FLAG_NEW_LV) {
- if (buf_flags[0])
- strcat(buf_flags, " | ");
- strcat(buf_flags, "ARG_DEF_FLAG_NEW_LV");
- }
-
- return buf_flags;
-}
-
-static char *rule_to_define_str(int rule_type)
-{
- switch (rule_type) {
- case RULE_INVALID:
- return "RULE_INVALID";
- case RULE_REQUIRE:
- return "RULE_REQUIRE";
- }
-}
-
-static char *cmd_flags_to_str(uint32_t flags)
-{
- static char buf_cmd_flags[32];
-
- memset(buf_cmd_flags, 0, sizeof(buf_cmd_flags));
-
- if (flags & CMD_FLAG_SECONDARY_SYNTAX) {
- if (buf_cmd_flags[0])
- strcat(buf_cmd_flags, " | ");
- strcat(buf_cmd_flags, "CMD_FLAG_SECONDARY_SYNTAX");
- }
- if (flags & CMD_FLAG_ONE_REQUIRED_OPT) {
- if (buf_cmd_flags[0])
- strcat(buf_cmd_flags, " | ");
- strcat(buf_cmd_flags, "CMD_FLAG_ONE_REQUIRED_OPT");
- }
-
- return buf_cmd_flags;
-}
-
-static void print_usage_common(struct command *cmd)
-{
- struct cmd_name *cname;
- int i, sep, ro, rp, oo, op, opt_enum;
-
- if (!(cname = find_command_name(cmd->name)))
- return;
-
- sep = 0;
-
- /*
- * when there's more than one variant, options that
- * are common to all commands with a common name.
- */
-
- if (cname->variants < 2)
- goto all;
-
- for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
- if (!cname->common_options[opt_enum])
- continue;
-
- if (is_lvm_all_opt(opt_enum))
- continue;
-
- if (!sep) {
- printf("\n");
- printf("\" [");
- } else {
- printf(",");
- }
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- if (cmd->optional_opt_args[oo].opt != opt_enum)
- continue;
-
- printf(" %s", opt_names[opt_enum].long_opt);
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- break;
- }
- }
-
- all:
- /* options that are common to all lvm commands */
-
- for (oo = 0; oo < lvm_all.oo_count; oo++) {
- opt_enum = lvm_all.optional_opt_args[oo].opt;
-
- if (!sep) {
- printf("\n");
- printf("\" [");
- } else {
- printf(",");
- }
-
- printf(" %s", opt_names[opt_enum].long_opt);
- if (lvm_all.optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def(&lvm_all.optional_opt_args[oo].def, 1);
- }
- sep = 1;
- }
-
- printf(" ]\"");
- printf(";\n");
-}
-
-static void print_usage(struct command *cmd)
-{
- struct cmd_name *cname;
- int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
- int i, sep, ro, rp, oo, op, opt_enum;
-
- if (!(cname = find_command_name(cmd->name)))
- return;
-
- printf("\"%s", cmd->name);
-
- if (cmd->ro_count) {
- if (onereq)
- printf(" (");
- for (ro = 0; ro < cmd->ro_count; ro++) {
- if (ro && onereq)
- printf(",");
- printf(" %s", opt_names[cmd->required_opt_args[ro].opt].long_opt);
-
- if (cmd->required_opt_args[ro].def.val_bits) {
- printf(" ");
- print_def(&cmd->required_opt_args[ro].def, 1);
- }
- }
- if (onereq)
- printf(" )");
- }
-
- if (cmd->rp_count) {
- for (rp = 0; rp < cmd->rp_count; rp++) {
- if (cmd->required_pos_args[rp].def.val_bits) {
- printf(" ");
- print_def(&cmd->required_pos_args[rp].def, 1);
- }
- }
- }
-
- printf("\"");
-
- oo_count:
- if (!cmd->oo_count)
- goto op_count;
-
- sep = 0;
-
- if (cmd->oo_count) {
- printf("\n");
- printf("\" [");
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- opt_enum = cmd->optional_opt_args[oo].opt;
-
- /*
- * Skip common opts which are in the usage_common string.
- * The common opts are those in lvm_all and in
- * cname->common_options.
- */
-
- if (is_lvm_all_opt(opt_enum))
- continue;
-
- if ((cname->variants > 1) && cname->common_options[opt_enum])
- continue;
-
- if (sep)
- printf(",");
-
- printf(" %s", opt_names[opt_enum].long_opt);
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- }
-
- if (sep)
- printf(",");
- printf(" COMMON_OPTIONS");
- printf(" ]\"");
- }
-
- op_count:
- if (!cmd->op_count)
- goto done;
-
- printf("\n");
- printf("\" [");
-
- if (cmd->op_count) {
- for (op = 0; op < cmd->op_count; op++) {
- if (cmd->optional_pos_args[op].def.val_bits) {
- printf(" ");
- print_def(&cmd->optional_pos_args[op].def, 1);
- }
- }
- }
-
- printf(" ]\"");
-
- done:
- printf(";\n");
-}
-
-void print_header_struct(void)
-{
- struct command *cmd;
- int i, j, ro, rp, oo, op, ru, ruo, io;
-
- printf("/* Do not edit. This file is generated by tools/create-commands */\n");
- printf("/* using command definitions from tools/command-lines.in */\n");
- printf("\n");
-
- for (i = 0; i < cmd_count; i++) {
- cmd = &cmd_array[i];
-
- printf("commands[%d].name = \"%s\";\n", i, cmd->name);
- printf("commands[%d].command_line_id = \"%s\";\n", i, cmd->command_line_id);
- printf("commands[%d].command_line_enum = %s_CMD;\n", i, cmd->command_line_id);
- printf("commands[%d].fn = %s;\n", i, cmd->name);
- printf("commands[%d].ro_count = %d;\n", i, cmd->ro_count);
- printf("commands[%d].rp_count = %d;\n", i, cmd->rp_count);
- printf("commands[%d].oo_count = %d;\n", i, cmd->oo_count);
- printf("commands[%d].op_count = %d;\n", i, cmd->op_count);
- printf("commands[%d].io_count = %d;\n", i, cmd->io_count);
- printf("commands[%d].rule_count = %d;\n", i, cmd->rule_count);
-
- if (cmd->cmd_flags)
- printf("commands[%d].cmd_flags = %s;\n", i, cmd_flags_to_str(cmd->cmd_flags));
- else
- printf("commands[%d].cmd_flags = 0;\n", i, cmd_flags_to_str(cmd->cmd_flags));
-
- printf("commands[%d].desc = \"%s\";\n", i, cmd->desc ?: "");
- printf("commands[%d].usage = ", i);
- print_usage(cmd);
-
- if (cmd->oo_count) {
- printf("commands[%d].usage_common = ", i);
- print_usage_common(cmd);
- } else {
- printf("commands[%d].usage_common = \"NULL\";\n", i);
- }
-
- if (cmd->ro_count) {
- for (ro = 0; ro < cmd->ro_count; ro++) {
- printf("commands[%d].required_opt_args[%d].opt = %s;\n",
- i, ro, opt_to_enum_str(cmd->required_opt_args[ro].opt));
-
- if (!cmd->required_opt_args[ro].def.val_bits)
- continue;
-
- printf("commands[%d].required_opt_args[%d].def.val_bits = %s;\n",
- i, ro, val_bits_to_str(cmd->required_opt_args[ro].def.val_bits));
-
- if (cmd->required_opt_args[ro].def.lvt_bits)
- printf("commands[%d].required_opt_args[%d].def.lvt_bits = %s;\n",
- i, ro, lvt_bits_to_str(cmd->required_opt_args[ro].def.lvt_bits));
-
- if (cmd->required_opt_args[ro].def.flags)
- printf("commands[%d].required_opt_args[%d].def.flags = %s;\n",
- i, ro, flags_to_str(cmd->required_opt_args[ro].def.flags));
-
- if (val_bit_is_set(cmd->required_opt_args[ro].def.val_bits, constnum_VAL))
- printf("commands[%d].required_opt_args[%d].def.num = %d;\n",
- i, ro, cmd->required_opt_args[ro].def.num);
-
- if (val_bit_is_set(cmd->required_opt_args[ro].def.val_bits, conststr_VAL))
- printf("commands[%d].required_opt_args[%d].def.str = \"%s\";\n",
- i, ro, cmd->required_opt_args[ro].def.str ?: "NULL");
- }
- }
-
- if (cmd->rp_count) {
- for (rp = 0; rp < cmd->rp_count; rp++) {
- printf("commands[%d].required_pos_args[%d].pos = %d;\n",
- i, rp, cmd->required_pos_args[rp].pos);
-
- if (!cmd->required_pos_args[rp].def.val_bits)
- continue;
-
- printf("commands[%d].required_pos_args[%d].def.val_bits = %s;\n",
- i, rp, val_bits_to_str(cmd->required_pos_args[rp].def.val_bits));
-
- if (cmd->required_pos_args[rp].def.lvt_bits)
- printf("commands[%d].required_pos_args[%d].def.lvt_bits = %s;\n",
- i, rp, lvt_bits_to_str(cmd->required_pos_args[rp].def.lvt_bits));
-
- if (cmd->required_pos_args[rp].def.flags)
- printf("commands[%d].required_pos_args[%d].def.flags = %s;\n",
- i, rp, flags_to_str(cmd->required_pos_args[rp].def.flags));
-
- if (val_bit_is_set(cmd->required_pos_args[rp].def.val_bits, constnum_VAL))
- printf("commands[%d].required_pos_args[%d].def.num = %d;\n",
- i, rp, cmd->required_pos_args[rp].def.num);
-
- if (val_bit_is_set(cmd->required_pos_args[rp].def.val_bits, conststr_VAL))
- printf("commands[%d].required_pos_args[%d].def.str = \"%s\";\n",
- i, rp, cmd->required_pos_args[rp].def.str ?: "NULL");
- }
- }
-
- if (cmd->oo_count) {
- for (oo = 0; oo < cmd->oo_count; oo++) {
- printf("commands[%d].optional_opt_args[%d].opt = %s;\n",
- i, oo, opt_to_enum_str(cmd->optional_opt_args[oo].opt));
-
- if (!cmd->optional_opt_args[oo].def.val_bits)
- continue;
-
- printf("commands[%d].optional_opt_args[%d].def.val_bits = %s;\n",
- i, oo, val_bits_to_str(cmd->optional_opt_args[oo].def.val_bits));
-
- if (cmd->optional_opt_args[oo].def.lvt_bits)
- printf("commands[%d].optional_opt_args[%d].def.lvt_bits = %s;\n",
- i, oo, lvt_bits_to_str(cmd->optional_opt_args[oo].def.lvt_bits));
-
- if (cmd->optional_opt_args[oo].def.flags)
- printf("commands[%d].optional_opt_args[%d].def.flags = %s;\n",
- i, oo, flags_to_str(cmd->optional_opt_args[oo].def.flags));
-
- if (val_bit_is_set(cmd->optional_opt_args[oo].def.val_bits, constnum_VAL))
- printf("commands[%d].optional_opt_args[%d].def.num = %d;\n",
- i, oo, cmd->optional_opt_args[oo].def.num);
-
- if (val_bit_is_set(cmd->optional_opt_args[oo].def.val_bits, conststr_VAL))
- printf("commands[%d].optional_opt_args[%d].def.str = \"%s\";\n",
- i, oo, cmd->optional_opt_args[oo].def.str ?: "NULL");
- }
- }
-
- if (cmd->io_count) {
- for (io = 0; io < cmd->io_count; io++) {
- printf("commands[%d].ignore_opt_args[%d].opt = %s;\n",
- i, io, opt_to_enum_str(cmd->ignore_opt_args[io].opt));
-
- if (!cmd->ignore_opt_args[io].def.val_bits)
- continue;
-
- printf("commands[%d].ignore_opt_args[%d].def.val_bits = %s;\n",
- i, io, val_bits_to_str(cmd->ignore_opt_args[io].def.val_bits));
-
- if (cmd->ignore_opt_args[io].def.lvt_bits)
- printf("commands[%d].ignore_opt_args[%d].def.lvt_bits = %s;\n",
- i, io, lvt_bits_to_str(cmd->ignore_opt_args[io].def.lvt_bits));
-
- if (cmd->ignore_opt_args[io].def.flags)
- printf("commands[%d].ignore_opt_args[%d].def.flags = %s;\n",
- i, io, flags_to_str(cmd->ignore_opt_args[io].def.flags));
-
- if (val_bit_is_set(cmd->ignore_opt_args[io].def.val_bits, constnum_VAL))
- printf("commands[%d].ignore_opt_args[%d].def.num = %d;\n",
- i, io, cmd->ignore_opt_args[io].def.num);
-
- if (val_bit_is_set(cmd->ignore_opt_args[io].def.val_bits, conststr_VAL))
- printf("commands[%d].ignore_opt_args[%d].def.str = \"%s\";\n",
- i, io, cmd->ignore_opt_args[io].def.str ?: "NULL");
- }
- }
-
- if (cmd->op_count) {
- for (op = 0; op < cmd->op_count; op++) {
- printf("commands[%d].optional_pos_args[%d].pos = %d;\n",
- i, op, cmd->optional_pos_args[op].pos);
-
- if (!cmd->optional_pos_args[op].def.val_bits)
- continue;
-
- printf("commands[%d].optional_pos_args[%d].def.val_bits = %s;\n",
- i, op, val_bits_to_str(cmd->optional_pos_args[op].def.val_bits));
-
- if (cmd->optional_pos_args[op].def.lvt_bits)
- printf("commands[%d].optional_pos_args[%d].def.lvt_bits = %s;\n",
- i, op, lvt_bits_to_str(cmd->optional_pos_args[op].def.lvt_bits));
-
- if (cmd->optional_pos_args[op].def.flags)
- printf("commands[%d].optional_pos_args[%d].def.flags = %s;\n",
- i, op, flags_to_str(cmd->optional_pos_args[op].def.flags));
-
- if (val_bit_is_set(cmd->optional_pos_args[op].def.val_bits, constnum_VAL))
- printf("commands[%d].optional_pos_args[%d].def.num = %d;\n",
- i, op, cmd->optional_pos_args[op].def.num);
-
- if (val_bit_is_set(cmd->optional_pos_args[op].def.val_bits, conststr_VAL))
- printf("commands[%d].optional_pos_args[%d].def.str = \"%s\";\n",
- i, op, cmd->optional_pos_args[op].def.str ?: "NULL");
- }
- }
-
- if (cmd->rule_count) {
- for (ru = 0; ru < cmd->rule_count; ru++) {
-
- printf("commands[%d].rules[%d].opts_count = %d;\n", i, ru, cmd->rules[ru].opts_count);
-
- if (cmd->rules[ru].opts_count) {
- printf("static int _command%d_rule%d_opts[] = { ", i, ru);
- for (ruo = 0; ruo < cmd->rules[ru].opts_count; ruo++) {
- if (ruo)
- printf(", ");
- printf("%s", opt_to_enum_str(cmd->rules[ru].opts[ruo]));
- }
- printf(" };\n");
- printf("commands[%d].rules[%d].opts = _command%d_rule%d_opts;\n", i, ru, i, ru);
- } else {
- printf("commands[%d].rules[%d].opts = NULL;\n", i, ru);
- }
-
- printf("commands[%d].rules[%d].check_opts_count = %d;\n", i, ru, cmd->rules[ru].check_opts_count);
-
- if (cmd->rules[ru].check_opts_count) {
- printf("static int _command%d_rule%d_check_opts[] = { ", i, ru);
- for (ruo = 0; ruo < cmd->rules[ru].check_opts_count; ruo++) {
- if (ruo)
- printf(",");
- printf("%s ", opt_to_enum_str(cmd->rules[ru].check_opts[ruo]));
- }
- printf(" };\n");
- printf("commands[%d].rules[%d].check_opts = _command%d_rule%d_check_opts;\n", i, ru, i, ru);
- } else {
- printf("commands[%d].rules[%d].check_opts = NULL;\n", i, ru);
- }
-
- printf("commands[%d].rules[%d].lvt_bits = %s;\n", i, ru,
- cmd->rules[ru].lvt_bits ? lvt_bits_to_str(cmd->rules[ru].lvt_bits) : "0");
-
- printf("commands[%d].rules[%d].lvp_bits = %s;\n", i, ru,
- cmd->rules[ru].lvp_bits ? lvp_bits_to_str(cmd->rules[ru].lvp_bits) : "0");
-
- printf("commands[%d].rules[%d].rule = %s;\n", i, ru,
- rule_to_define_str(cmd->rules[ru].rule));
-
- printf("commands[%d].rules[%d].check_lvt_bits = %s;\n", i, ru,
- cmd->rules[ru].check_lvt_bits ? lvt_bits_to_str(cmd->rules[ru].check_lvt_bits) : "0");
-
- printf("commands[%d].rules[%d].check_lvp_bits = %s;\n", i, ru,
- cmd->rules[ru].check_lvp_bits ? lvp_bits_to_str(cmd->rules[ru].check_lvp_bits) : "0");
- }
- }
-
- printf("\n");
- }
-}
-
-void print_header_count(void)
-{
- struct command *cmd;
- int i, j;
-
- printf("/* Do not edit. This file is generated by tools/create-commands */\n");
- printf("/* using command definitions from tools/command-lines.in */\n");
- printf("#define COMMAND_COUNT %d\n", cmd_count);
-
- printf("enum {\n");
- printf("\tno_CMD,\n"); /* enum value 0 is not used */
-
- for (i = 0; i < cmd_count; i++) {
- cmd = &cmd_array[i];
-
- if (!cmd->command_line_id) {
- printf("Missing ID: at %d\n", i);
- exit(1);
- }
-
- for (j = 0; j < i; j++) {
- if (!strcmp(cmd->command_line_id, cmd_array[j].command_line_id))
- goto next;
- }
-
- printf("\t%s_CMD,\n", cmd->command_line_id);
- next:
- ;
- }
- printf("\tCOMMAND_ID_COUNT,\n");
- printf("};\n");
-}
-
-struct cmd_pair {
- int i, j;
-};
-
-void print_ambiguous(void)
-{
- struct command *cmd, *dup;
- struct cmd_pair dups[64] = { 0 };
- int found = 0;
- int i, j, f, ro, rp;
-
- for (i = 0; i < cmd_count; i++) {
- cmd = &cmd_array[i];
-
- for (j = 0; j < cmd_count; j++) {
- dup = &cmd_array[j];
-
- if (i == j)
- continue;
- if (strcmp(cmd->name, dup->name))
- continue;
- if (cmd->ro_count != dup->ro_count)
- continue;
- if (cmd->rp_count != dup->rp_count)
- continue;
-
- for (ro = 0; ro < cmd->ro_count; ro++) {
- if (!opt_arg_matches(&cmd->required_opt_args[ro],
- &dup->required_opt_args[ro]))
- goto next;
- }
-
- for (rp = 0; rp < cmd->rp_count; rp++) {
- if (!pos_arg_matches(&cmd->required_pos_args[rp],
- &dup->required_pos_args[rp]))
- goto next;
- }
-
- for (f = 0; f < found; f++) {
- if ((dups[f].i == j) && (dups[f].j == i))
- goto next;
- }
-
- printf("Ambiguous commands %d and %d:\n", i, j);
- print_usage(cmd);
- print_usage(dup);
- printf("\n");
-
- dups[found].i = i;
- dups[found].j = j;
- found++;
-next:
- ;
- }
- }
-}
-
diff --git a/tools/ccmd.h b/tools/ccmd.h
deleted file mode 100644
index 1e18125..0000000
--- a/tools/ccmd.h
+++ /dev/null
@@ -1,144 +0,0 @@
-
-#ifndef __CCMD_H__
-#define __CCMD_H__
-
-/* needed to include args.h */
-#define ARG_COUNTABLE 0x00000001
-#define ARG_GROUPABLE 0x00000002
-struct cmd_context;
-struct arg_values;
-
-/* needed to include args.h */
-static inline int yes_no_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int activation_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int cachemode_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int discards_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int mirrorlog_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int size_kb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int size_mb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int size_mb_arg_with_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int int_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int uint32_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int int_arg_with_sign(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int int_arg_with_sign_and_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int major_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int minor_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int string_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int tag_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int permission_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int metadatatype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int units_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int segtype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int alloc_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int locktype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int readahead_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-static inline int vgmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-static inline int pvmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-static inline int metadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-static inline int polloperation_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-static inline int writemostly_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-static inline int syncaction_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-static inline int reportformat_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-static inline int configreport_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-static inline int configtype_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-
-/* also see arg_props in tools.h and args.h */
-struct opt_name {
- const char *name; /* "foo_ARG" */
- int opt_enum; /* foo_ARG */
- const char short_opt; /* -f */
- char _padding[7];
- const char *long_opt; /* --foo */
- int val_enum; /* xyz_VAL when --foo takes a val like "--foo xyz" */
- uint32_t unused1;
- uint32_t unused2;
- const char *desc;
-};
-
-/* also see val_props in tools.h and vals.h */
-struct val_name {
- const char *enum_name; /* "foo_VAL" */
- int val_enum; /* foo_VAL */
- int (*fn) (struct cmd_context *cmd, struct arg_values *av); /* foo_arg() */
- const char *name; /* FooVal */
- const char *usage;
-};
-
-/* also see lv_props in tools.h and lv_props.h */
-struct lvp_name {
- const char *enum_name; /* "is_foo_LVP" */
- int lvp_enum; /* is_foo_LVP */
- const char *name; /* "lv_is_foo" */
-};
-
-/* also see lv_types in tools.h and lv_types.h */
-struct lvt_name {
- const char *enum_name; /* "foo_LVT" */
- int lvt_enum; /* foo_LVT */
- const char *name; /* "foo" */
-};
-
-/* create foo_VAL enums for option and position values */
-
-enum {
-#define val(a, b, c, d) a ,
-#include "vals.h"
-#undef val
-};
-
-/* create foo_ARG enums for --option's */
-
-enum {
-#define arg(a, b, c, d, e, f, g) a ,
-#include "args.h"
-#undef arg
-};
-
-/* create foo_LVP enums for LV properties */
-
-enum {
-#define lvp(a, b, c) a,
-#include "lv_props.h"
-#undef lvp
-};
-
-/* create foo_LVT enums for LV types */
-
-enum {
-#define lvt(a, b, c) a,
-#include "lv_types.h"
-#undef lvt
-};
-
-/* one for each command name, see cmd_names[] */
-
-#define MAX_CMD_NAMES 128
-struct cmd_name {
- const char *name;
- const char *desc;
- int common_options[ARG_COUNT + 1]; /* options common to all defs */
- int all_options[ARG_COUNT + 1]; /* union of options from all defs */
- int variants; /* number of command defs with this command name */
- int variant_has_ro; /* do variants use required_opt_args ? */
- int variant_has_rp; /* do variants use required_pos_args ? */
- int variant_has_oo; /* do variants use optional_opt_args ? */
- int variant_has_op; /* do variants use optional_pos_args ? */
-};
-
-/* struct command */
-
-#include "command.h"
-
-/* one for each command defininition (command-lines.in as struct command) */
-
-#define MAX_CMDS 256
-int cmd_count;
-struct command cmd_array[MAX_CMDS];
-
-#define MAX_LINE 1024
-#define MAX_LINE_ARGC 256
-
-#define DESC_LINE 256
-
-#endif
-
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 4cc51fe..30573f4 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -1,12 +1,15 @@
+# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
+# Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
#
-# When this file is changed, tools/command-lines.h
-# and tools/command-lines-count.h must be regenerated
-# with:
+# This file is part of LVM2.
#
-# tools/create-commands --output count tools/command-lines.in > tools/command-lines-count.h
-# tools/create-commands --output struct tools/command-lines.in > tools/command-lines.h
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU Lesser General Public License v.2.1.
#
-
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#
# Syntax
#
@@ -261,7 +264,7 @@ RULE: --permission not lv_is_external_origin lv_is_raid_metadata lv_is_raid_imag
RULE: --alloc --contiguous --metadataprofile --permission --persistent --profile --readahead not lv_is_thick_origin
RULE: --alloc --discards --zero --cachemode --cachepolicy --cachesettings not lv_is_partial
-# It's unfortunate that acativate needs to be optionally allowed here,
+# It's unfortunate that activate needs to be optionally allowed here,
# like above, it was previouly allowed in combination.
lvchange --resync VG|LV_raid_mirror|Tag|Select ...
diff --git a/tools/command.c b/tools/command.c
new file mode 100644
index 0000000..59c9ea0
--- /dev/null
+++ b/tools/command.c
@@ -0,0 +1,2694 @@
+/*
+ * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of LVM2.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License v.2.1.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <asm/types.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <sched.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <getopt.h>
+
+/*
+ * This file can be compiled by itself as a man page generator.
+ */
+#ifdef MAN_PAGE_GENERATOR
+
+#define log_error(fmt, args...) \
+do { \
+ printf(fmt "\n", ##args); \
+} while (0)
+
+/* needed to include args.h */
+#define ARG_COUNTABLE 0x00000001
+#define ARG_GROUPABLE 0x00000002
+struct cmd_context;
+struct arg_values;
+
+/* needed to include args.h */
+static inline int yes_no_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int activation_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int cachemode_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int discards_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int mirrorlog_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int size_kb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int size_mb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int size_mb_arg_with_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int int_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int uint32_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int int_arg_with_sign(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int int_arg_with_sign_and_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int major_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int minor_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int string_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int tag_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int permission_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int metadatatype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int units_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int segtype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int alloc_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int locktype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int readahead_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int vgmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int pvmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int metadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int polloperation_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int writemostly_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int syncaction_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int reportformat_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int configreport_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int configtype_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+
+/* needed to include commands.h when building man page generator */
+#define CACHE_VGMETADATA 0x00000001
+#define PERMITTED_READ_ONLY 0x00000002
+#define ALL_VGS_IS_DEFAULT 0x00000004
+#define ENABLE_ALL_DEVS 0x00000008
+#define ALLOW_UUID_AS_NAME 0x00000010
+#define LOCKD_VG_SH 0x00000020
+#define NO_METADATA_PROCESSING 0x00000040
+#define REQUIRES_FULL_LABEL_SCAN 0x00000080
+#define MUST_USE_ALL_ARGS 0x00000100
+#define NO_LVMETAD_AUTOSCAN 0x00000200
+#define ENABLE_DUPLICATE_DEVS 0x00000400
+#define DISALLOW_TAG_ARGS 0x00000800
+#define GET_VGNAME_FROM_OPTIONS 0x00001000
+
+/* create foo_CMD enums for command def ID's in command-lines.in */
+
+enum {
+#define cmd(a, b) a ,
+#include "cmds.h"
+#undef cmd
+};
+
+/* create foo_VAL enums for option and position values */
+
+enum {
+#define val(a, b, c, d) a ,
+#include "vals.h"
+#undef val
+};
+
+/* create foo_ARG enums for --option's */
+
+enum {
+#define arg(a, b, c, d, e, f, g) a ,
+#include "args.h"
+#undef arg
+};
+
+/* create foo_LVP enums for LV properties */
+
+enum {
+#define lvp(a, b, c) a,
+#include "lv_props.h"
+#undef lvp
+};
+
+/* create foo_LVT enums for LV types */
+
+enum {
+#define lvt(a, b, c) a,
+#include "lv_types.h"
+#undef lvt
+};
+
+#else
+
+#include "tools.h"
+
+#endif
+
+#include "command.h" /* defines struct command */
+#include "command-count.h" /* defines COMMAND_COUNT */
+
+
+/* see opt_names[] below, also see arg_props[] in tools.h and args.h */
+
+struct opt_name {
+ const char *name; /* "foo_ARG" */
+ int opt_enum; /* foo_ARG */
+ const char short_opt; /* -f */
+ char _padding[7];
+ const char *long_opt; /* --foo */
+ int val_enum; /* xyz_VAL when --foo takes a val like "--foo xyz" */
+ uint32_t unused1;
+ uint32_t unused2;
+ const char *desc;
+};
+
+/* see val_names[] below, also see val_props[] in tools.h and vals.h */
+
+struct val_name {
+ const char *enum_name; /* "foo_VAL" */
+ int val_enum; /* foo_VAL */
+ int (*fn) (struct cmd_context *cmd, struct arg_values *av); /* foo_arg() */
+ const char *name; /* FooVal */
+ const char *usage;
+};
+
+/* see lvp_names[] below, also see lv_props[] in tools.h and lv_props.h */
+
+struct lvp_name {
+ const char *enum_name; /* "is_foo_LVP" */
+ int lvp_enum; /* is_foo_LVP */
+ const char *name; /* "lv_is_foo" */
+};
+
+/* see lvt_names[] below, also see lv_types[] in tools.h and lv_types.h */
+
+struct lvt_name {
+ const char *enum_name; /* "foo_LVT" */
+ int lvt_enum; /* foo_LVT */
+ const char *name; /* "foo" */
+};
+
+/* see cmd_names[] below, one for each unique "ID" in command-lines.in */
+
+struct cmd_name {
+ const char *enum_name; /* "foo_CMD" */
+ int cmd_enum; /* foo_CMD */
+ const char *name; /* "foo" from string after ID: */
+};
+
+/* create table of value names, e.g. String, and corresponding enum from vals.h */
+
+struct val_name val_names[VAL_COUNT + 1] = {
+#define val(a, b, c, d) { # a, a, b, c, d },
+#include "vals.h"
+#undef val
+};
+
+/* create table of option names, e.g. --foo, and corresponding enum from args.h */
+
+struct opt_name opt_names[ARG_COUNT + 1] = {
+#define arg(a, b, c, d, e, f, g) { # a, a, b, "", "--" c, d, e, f, g },
+#include "args.h"
+#undef arg
+};
+
+/* create table of lv property names, e.g. lv_is_foo, and corresponding enum from lv_props.h */
+
+struct lvp_name lvp_names[LVP_COUNT + 1] = {
+#define lvp(a, b, c) { # a, a, b },
+#include "lv_props.h"
+#undef lvp
+};
+
+/* create table of lv type names, e.g. linear and corresponding enum from lv_types.h */
+
+struct lvt_name lvt_names[LVT_COUNT + 1] = {
+#define lvt(a, b, c) { # a, a, b },
+#include "lv_types.h"
+#undef lvt
+};
+
+/* create table of command IDs */
+
+struct cmd_name cmd_names[CMD_COUNT + 1] = {
+#define cmd(a, b) { # a, a, # b },
+#include "cmds.h"
+#undef cmd
+};
+
+/*
+ * command_names[] and commands[] are defined in lvmcmdline.c when building lvm,
+ * but need to be defined here when building the stand-alone man page generator.
+ */
+
+#ifdef MAN_PAGE_GENERATOR
+struct command_name command_names[MAX_COMMAND_NAMES] = {
+#define xx(a, b, c...) { # a, b, c },
+#include "commands.h"
+#undef xx
+};
+struct command commands[COMMAND_COUNT];
+#else
+extern struct command_name command_names[MAX_COMMAND_NAMES]; /* defined in lvmcmdline.c */
+extern struct command commands[COMMAND_COUNT]; /* defined in lvmcmdline.c */
+#endif
+
+/* array of pointers into opt_names[] that is sorted alphabetically (by long opt name) */
+
+struct opt_name *opt_names_alpha[ARG_COUNT + 1];
+
+/* lvm_all is for recording options that are common for all lvm commands */
+
+struct command lvm_all;
+
+/* saves OO_FOO lines (groups of optional options) to include in multiple defs */
+
+static int oo_line_count;
+#define MAX_OO_LINES 256
+
+struct oo_line {
+ char *name;
+ char *line;
+};
+static struct oo_line oo_lines[MAX_OO_LINES];
+
+#define REQUIRED 1 /* required option */
+#define OPTIONAL 0 /* optional option */
+#define IGNORE -1 /* ignore option */
+
+#define MAX_LINE 1024
+#define MAX_LINE_ARGC 256
+#define DESC_LINE 1024
+
+/*
+ * Contains _command_input[] which is command-lines.in with comments
+ * removed and wrapped as a string. The _command_input[] string is
+ * used to populate commands[].
+ */
+#include "command-lines-input.h"
+
+static void add_optional_opt_line(struct command *cmd, int argc, char *argv[]);
+
+/*
+ * modifies buf, replacing the sep characters with \0
+ * argv pointers point to positions in buf
+ */
+
+static char *split_line(char *buf, int *argc, char **argv, char sep)
+{
+ char *p = buf, *rp = NULL;
+ int i;
+
+ argv[0] = p;
+
+ for (i = 1; i < MAX_LINE_ARGC; i++) {
+ p = strchr(buf, sep);
+ if (!p)
+ break;
+ *p = '\0';
+
+ argv[i] = p + 1;
+ buf = p + 1;
+ }
+ *argc = i;
+
+ /* we ended by hitting \0, return the point following that */
+ if (!rp)
+ rp = strchr(buf, '\0') + 1;
+
+ return rp;
+}
+
+/* convert value string, e.g. Number, to foo_VAL enum */
+
+static int val_str_to_num(char *str)
+{
+ char name[32] = { 0 };
+ char *new;
+ int i;
+
+ /* compare the name before any suffix like _new or _<lvtype> */
+
+ strncpy(name, str, 31);
+ if ((new = strstr(name, "_")))
+ *new = '\0';
+
+ for (i = 0; i < VAL_COUNT; i++) {
+ if (!val_names[i].name)
+ break;
+ if (!strncmp(name, val_names[i].name, strlen(val_names[i].name)))
+ return val_names[i].val_enum;
+ }
+
+ return 0;
+}
+
+/* convert "--option" to foo_ARG enum */
+
+static int opt_str_to_num(char *str)
+{
+ char long_name[32];
+ char *p;
+ int i;
+
+ /*
+ * --foo_long means there are two args entries
+ * for --foo, one with a short option and one
+ * without, and we want the one without the
+ * short option.
+ */
+ if (strstr(str, "_long")) {
+ strcpy(long_name, str);
+ p = strstr(long_name, "_long");
+ *p = '\0';
+
+ for (i = 0; i < ARG_COUNT; i++) {
+ if (!opt_names[i].long_opt)
+ continue;
+ /* skip anything with a short opt */
+ if (opt_names[i].short_opt)
+ continue;
+ if (!strcmp(opt_names[i].long_opt, long_name))
+ return opt_names[i].opt_enum;
+ }
+
+ log_error("Parsing command defs: unknown opt str: %s %s", str, long_name);
+ exit(EXIT_FAILURE);
+ }
+
+ for (i = 0; i < ARG_COUNT; i++) {
+ if (!opt_names[i].long_opt)
+ continue;
+ /* These are only selected using --foo_long */
+ if (strstr(opt_names[i].name, "_long_ARG"))
+ continue;
+ if (!strcmp(opt_names[i].long_opt, str))
+ return opt_names[i].opt_enum;
+ }
+
+ log_error("Parsing command defs: unknown opt str: \"%s\"", str);
+ exit(EXIT_FAILURE);
+}
+
+/* "foo" string to foo_CMD int */
+
+int command_id_to_enum(const char *str)
+{
+ int i;
+
+ for (i = 1; i < CMD_COUNT; i++) {
+ if (!strcmp(str, cmd_names[i].name))
+ return cmd_names[i].cmd_enum;
+ }
+ log_error("Parsing command defs: unknown cmd name %s", str);
+ exit(EXIT_FAILURE);
+}
+
+/* "lv_is_prop" to is_prop_LVP */
+
+static int lvp_name_to_enum(char *str)
+{
+ int i;
+
+ for (i = 1; i < LVP_COUNT; i++) {
+ if (!strcmp(str, lvp_names[i].name))
+ return lvp_names[i].lvp_enum;
+ }
+ log_error("Parsing command defs: unknown lv property %s", str);
+ exit(EXIT_FAILURE);
+}
+
+/* "type" to type_LVT */
+
+static int lvt_name_to_enum(char *str)
+{
+ int i;
+
+ for (i = 1; i < LVT_COUNT; i++) {
+ if (!strcmp(str, lvt_names[i].name))
+ return lvt_names[i].lvt_enum;
+ }
+ log_error("Parsing command defs: unknown lv type %s", str);
+ exit(EXIT_FAILURE);
+}
+
+/* LV_<type> to <type>_LVT */
+
+static int lv_to_enum(char *name)
+{
+ return lvt_name_to_enum(name + 3);
+}
+
+/*
+ * LV_<type1>_<type2> to lvt_bits
+ *
+ * type1 to lvt_enum
+ * lvt_bits |= lvt_enum_to_bit(lvt_enum)
+ * type2 to lvt_enum
+ * lvt_bits |= lvt_enum_to_bit(lvt_enum)
+ */
+
+static uint64_t lv_to_bits(char *name)
+{
+ char buf[64];
+ char *argv[MAX_LINE_ARGC];
+ uint64_t lvt_bits = 0;
+ int lvt_enum;
+ int argc;
+ int i;
+
+ strcpy(buf, name);
+
+ split_line(buf, &argc, argv, '_');
+
+ /* 0 is "LV" */
+ for (i = 1; i < argc; i++) {
+ if (!strcmp(argv[i], "new"))
+ continue;
+ lvt_enum = lvt_name_to_enum(argv[i]);
+ lvt_bits |= lvt_enum_to_bit(lvt_enum);
+ }
+
+ return lvt_bits;
+}
+
+static struct command_name *find_command_name(const char *name)
+{
+ int i;
+
+ for (i = 0; i < MAX_COMMAND_NAMES; i++) {
+ if (!command_names[i].name)
+ break;
+ if (!strcmp(command_names[i].name, name))
+ return &command_names[i];
+ }
+ return NULL;
+}
+
+static const char *is_command_name(char *str)
+{
+ int i;
+
+ for (i = 0; i < MAX_COMMAND_NAMES; i++) {
+ if (!command_names[i].name)
+ break;
+ if (!strcmp(command_names[i].name, str))
+ return command_names[i].name;
+ }
+ return NULL;
+}
+
+static int is_opt_name(char *str)
+{
+ if (!strncmp(str, "--", 2))
+ return 1;
+
+ if ((str[0] == '-') && (str[1] != '-')) {
+ log_error("Parsing command defs: options must be specified in long form: %s", str);
+ exit(EXIT_FAILURE);
+ }
+
+ return 0;
+}
+
+/*
+ * "Select" as a pos name means that the position
+ * can be empty if the --select option is used.
+ */
+
+static int is_pos_name(char *str)
+{
+ if (!strncmp(str, "VG", 2))
+ return 1;
+ if (!strncmp(str, "LV", 2))
+ return 1;
+ if (!strncmp(str, "PV", 2))
+ return 1;
+ if (!strncmp(str, "Tag", 3))
+ return 1;
+ if (!strncmp(str, "String", 6))
+ return 1;
+ if (!strncmp(str, "Select", 6))
+ return 1;
+ return 0;
+}
+
+static int is_oo_definition(char *str)
+{
+ if (!strncmp(str, "OO_", 3) && strstr(str, ":"))
+ return 1;
+ return 0;
+}
+
+static int is_oo_line(char *str)
+{
+ if (!strncmp(str, "OO:", 3))
+ return 1;
+ return 0;
+}
+
+static int is_io_line(char *str)
+{
+ if (!strncmp(str, "IO:", 3))
+ return 1;
+ return 0;
+}
+
+static int is_op_line(char *str)
+{
+ if (!strncmp(str, "OP:", 3))
+ return 1;
+ return 0;
+}
+
+static int is_desc_line(char *str)
+{
+ if (!strncmp(str, "DESC:", 5))
+ return 1;
+ return 0;
+}
+
+static int is_flags_line(char *str)
+{
+ if (!strncmp(str, "FLAGS:", 6))
+ return 1;
+ return 0;
+}
+
+static int is_rule_line(char *str)
+{
+ if (!strncmp(str, "RULE:", 5))
+ return 1;
+ return 0;
+}
+
+static int is_id_line(char *str)
+{
+ if (!strncmp(str, "ID:", 3))
+ return 1;
+ return 0;
+}
+
+/*
+ * Save a positional arg in a struct arg_def.
+ * Parse str for anything that can appear in a position,
+ * like VG, VG|LV, VG|LV_linear|LV_striped, etc.
+ */
+
+static void set_pos_def(struct command *cmd, char *str, struct arg_def *def)
+{
+ char *argv[MAX_LINE_ARGC];
+ int argc;
+ char *name;
+ int val_enum;
+ int i;
+
+ split_line(str, &argc, argv, '|');
+
+ for (i = 0; i < argc; i++) {
+ name = argv[i];
+
+ val_enum = val_str_to_num(name);
+
+ if (!val_enum) {
+ log_error("Parsing command defs: unknown pos arg: %s", name);
+ exit(EXIT_FAILURE);
+ }
+
+ def->val_bits |= val_enum_to_bit(val_enum);
+
+ if ((val_enum == lv_VAL) && strstr(name, "_"))
+ def->lvt_bits = lv_to_bits(name);
+
+ if (strstr(name, "_new")) {
+ if (val_enum == lv_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_LV;
+ else if (val_enum == vg_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_VG;
+ }
+ }
+}
+
+/*
+ * Save an option arg in a struct arg_def.
+ * Parse str for anything that can follow --option.
+ */
+
+static void set_opt_def(struct command *cmd, char *str, struct arg_def *def)
+{
+ char *argv[MAX_LINE_ARGC];
+ int argc;
+ char *name;
+ int val_enum;
+ int i;
+
+ split_line(str, &argc, argv, '|');
+
+ for (i = 0; i < argc; i++) {
+ name = argv[i];
+
+ val_enum = val_str_to_num(name);
+
+ if (!val_enum) {
+ /* a literal number or string */
+
+ if (isdigit(name[0]))
+ val_enum = constnum_VAL;
+
+ else if (isalpha(name[0]))
+ val_enum = conststr_VAL;
+
+ else {
+ log_error("Parsing command defs: unknown opt arg: %s", name);
+ exit(EXIT_FAILURE);
+ }
+ }
+
+
+ def->val_bits |= val_enum_to_bit(val_enum);
+
+ if (val_enum == constnum_VAL)
+ def->num = (uint64_t)atoi(name);
+
+ if (val_enum == conststr_VAL)
+ def->str = strdup(name);
+
+ if (val_enum == lv_VAL) {
+ if (strstr(name, "_"))
+ def->lvt_bits = lv_to_bits(name);
+ }
+
+ if (strstr(name, "_new")) {
+ if (val_enum == lv_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_LV;
+ else if (val_enum == vg_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_VG;
+
+ }
+ }
+}
+
+/*
+ * Save a set of common options so they can be included in
+ * multiple command defs.
+ *
+ * OO_FOO: --opt1 ...
+ *
+ * oo->name = "OO_FOO";
+ * oo->line = "--opt1 ...";
+ */
+
+static void add_oo_definition_line(const char *name, const char *line)
+{
+ struct oo_line *oo;
+ char *colon;
+ char *start;
+
+ oo = &oo_lines[oo_line_count++];
+ oo->name = strdup(name);
+
+ if ((colon = strstr(oo->name, ":")))
+ *colon = '\0';
+ else {
+ log_error("Parsing command defs: invalid OO definition");
+ exit(EXIT_FAILURE);
+ }
+
+ start = strstr(line, ":") + 2;
+ oo->line = strdup(start);
+}
+
+/* Support OO_FOO: continuing on multiple lines. */
+
+static void append_oo_definition_line(const char *new_line)
+{
+ struct oo_line *oo;
+ char *old_line;
+ char *line;
+ int len;
+
+ oo = &oo_lines[oo_line_count-1];
+
+ old_line = oo->line;
+
+ /* +2 = 1 space between old and new + 1 terminating \0 */
+ len = strlen(old_line) + strlen(new_line) + 2;
+ line = malloc(len);
+ memset(line, 0, len);
+
+ strcat(line, old_line);
+ strcat(line, " ");
+ strcat(line, new_line);
+
+ free(oo->line);
+ oo->line = line;
+}
+
+/* Find a saved OO_FOO definition. */
+
+static char *get_oo_line(const char *str)
+{
+ char *name;
+ char *end;
+ char str2[64];
+ int i;
+
+ strcpy(str2, str);
+ if ((end = strstr(str2, ":")))
+ *end = '\0';
+ if ((end = strstr(str2, ",")))
+ *end = '\0';
+
+ for (i = 0; i < oo_line_count; i++) {
+ name = oo_lines[i].name;
+ if (!strcmp(name, str2))
+ return oo_lines[i].line;
+ }
+ return NULL;
+}
+
+/*
+ * Add optional_opt_args entries when OO_FOO appears on OO: line,
+ * i.e. include common options from an OO_FOO definition.
+ */
+
+static void include_optional_opt_args(struct command *cmd, const char *str)
+{
+ char *oo_line;
+ char *line;
+ char *line_argv[MAX_LINE_ARGC];
+ int line_argc;
+
+ if (!(oo_line = get_oo_line(str))) {
+ log_error("Parsing command defs: no OO line found for %s", str);
+ exit(EXIT_FAILURE);
+ }
+
+ if (!(line = strdup(oo_line)))
+ exit(EXIT_FAILURE);
+
+ split_line(line, &line_argc, line_argv, ' ');
+ add_optional_opt_line(cmd, line_argc, line_argv);
+ free(line);
+}
+
+/*
+ * When an --option is seen, add a new opt_args entry for it.
+ * This function sets the opt_args.opt value for it.
+ */
+
+static void add_opt_arg(struct command *cmd, char *str, int *takes_arg, int required)
+{
+ char *comma;
+ int opt;
+
+ /* opt_arg.opt set here */
+ /* opt_arg.def will be set in update_prev_opt_arg() if needed */
+
+ if ((comma = strstr(str, ",")))
+ *comma = '\0';
+
+ /*
+ * Work around nasty hack where --uuid is used for both uuid_ARG
+ * and uuidstr_ARG. The input uses --uuidstr, where an actual
+ * command uses --uuid string.
+ */
+ if (!strcmp(str, "--uuidstr")) {
+ opt = uuidstr_ARG;
+ goto skip;
+ }
+
+ opt = opt_str_to_num(str);
+skip:
+ if (required > 0)
+ cmd->required_opt_args[cmd->ro_count++].opt = opt;
+ else if (!required)
+ cmd->optional_opt_args[cmd->oo_count++].opt = opt;
+ else if (required < 0)
+ cmd->ignore_opt_args[cmd->io_count++].opt = opt;
+ else
+ exit(EXIT_FAILURE);
+
+ *takes_arg = opt_names[opt].val_enum ? 1 : 0;
+}
+
+/*
+ * After --option has been seen, this function sets opt_args.def value
+ * for the value that appears after --option.
+ */
+
+static void update_prev_opt_arg(struct command *cmd, char *str, int required)
+{
+ struct arg_def def = { 0 };
+ char *comma;
+
+ if (str[0] == '-') {
+ log_error("Parsing command defs: option %s must be followed by an arg.", str);
+ exit(EXIT_FAILURE);
+ }
+
+ /* opt_arg.def set here */
+ /* opt_arg.opt was previously set in add_opt_arg() when --foo was read */
+
+ if ((comma = strstr(str, ",")))
+ *comma = '\0';
+
+ set_opt_def(cmd, str, &def);
+
+ if (required > 0)
+ cmd->required_opt_args[cmd->ro_count-1].def = def;
+ else if (!required)
+ cmd->optional_opt_args[cmd->oo_count-1].def = def;
+ else if (required < 0)
+ cmd->ignore_opt_args[cmd->io_count-1].def = def;
+ else
+ exit(EXIT_FAILURE);
+}
+
+/*
+ * When an position arg is seen, add a new pos_args entry for it.
+ * This function sets the pos_args.pos and pos_args.def.
+ */
+
+static void add_pos_arg(struct command *cmd, char *str, int required)
+{
+ struct arg_def def = { 0 };
+
+ /* pos_arg.pos and pos_arg.def are set here */
+
+ set_pos_def(cmd, str, &def);
+
+ if (required) {
+ cmd->required_pos_args[cmd->rp_count].pos = cmd->pos_count++;
+ cmd->required_pos_args[cmd->rp_count].def = def;
+ cmd->rp_count++;
+ } else {
+ cmd->optional_pos_args[cmd->op_count].pos = cmd->pos_count++;;
+ cmd->optional_pos_args[cmd->op_count].def = def;
+ cmd->op_count++;
+ }
+}
+
+/* Process something that follows a pos arg, which is not a new pos arg. */
+
+static void update_prev_pos_arg(struct command *cmd, char *str, int required)
+{
+ struct arg_def *def;
+
+ /* a previous pos_arg.def is modified here */
+
+ if (required)
+ def = &cmd->required_pos_args[cmd->rp_count-1].def;
+ else
+ def = &cmd->optional_pos_args[cmd->op_count-1].def;
+
+ if (!strcmp(str, "..."))
+ def->flags |= ARG_DEF_FLAG_MAY_REPEAT;
+ else {
+ log_error("Parsing command defs: unknown pos arg: %s", str);
+ exit(EXIT_FAILURE);
+ }
+}
+
+/* Process what follows OO:, which are the optional opt args for the cmd def. */
+
+static void add_optional_opt_line(struct command *cmd, int argc, char *argv[])
+{
+ int takes_arg;
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (!i && !strncmp(argv[i], "OO:", 3))
+ continue;
+ if (is_opt_name(argv[i]))
+ add_opt_arg(cmd, argv[i], &takes_arg, OPTIONAL);
+ else if (!strncmp(argv[i], "OO_", 3))
+ include_optional_opt_args(cmd, argv[i]);
+ else if (takes_arg)
+ update_prev_opt_arg(cmd, argv[i], OPTIONAL);
+ else {
+ log_error("Parsing command defs: can't parse argc %d argv %s prev %s",
+ i, argv[i], argv[i-1]);
+ exit(EXIT_FAILURE);
+ }
+ }
+}
+
+/* Process what follows IO:, which are the ignore options for the cmd def. */
+
+static void add_ignore_opt_line(struct command *cmd, int argc, char *argv[])
+{
+ int takes_arg;
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (!i && !strncmp(argv[i], "IO:", 3))
+ continue;
+ if (is_opt_name(argv[i]))
+ add_opt_arg(cmd, argv[i], &takes_arg, IGNORE);
+ else if (takes_arg)
+ update_prev_opt_arg(cmd, argv[i], IGNORE);
+ else {
+ log_error("Parsing command defs: can't parse argc %d argv %s prev %s",
+ i, argv[i], argv[i-1]);
+ exit(EXIT_FAILURE);
+ }
+ }
+}
+
+/* Process what follows OP:, which are optional pos args for the cmd def. */
+
+static void add_optional_pos_line(struct command *cmd, int argc, char *argv[])
+{
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (!i && !strncmp(argv[i], "OP:", 3))
+ continue;
+ if (is_pos_name(argv[i]))
+ add_pos_arg(cmd, argv[i], OPTIONAL);
+ else
+ update_prev_pos_arg(cmd, argv[i], OPTIONAL);
+ }
+}
+
+static void add_required_opt_line(struct command *cmd, int argc, char *argv[])
+{
+ int takes_arg;
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (is_opt_name(argv[i]))
+ add_opt_arg(cmd, argv[i], &takes_arg, REQUIRED);
+ else if (takes_arg)
+ update_prev_opt_arg(cmd, argv[i], REQUIRED);
+ else {
+ log_error("Parsing command defs: can't parse argc %d argv %s prev %s",
+ i, argv[i], argv[i-1]);
+ exit(EXIT_FAILURE);
+ }
+ }
+}
+
+/*
+ * Add to required_opt_args from an OO_FOO definition.
+ * (This is the special case of vgchange/lvchange where one
+ * optional option is required, and others are then optional.)
+ * The set of options from OO_FOO are saved in required_opt_args,
+ * and flag CMD_FLAG_ONE_REQUIRED_OPT is set on the cmd indicating
+ * this special case.
+ */
+
+static void include_required_opt_args(struct command *cmd, char *str)
+{
+ char *oo_line;
+ char *line;
+ char *line_argv[MAX_LINE_ARGC];
+ int line_argc;
+
+ if (!(oo_line = get_oo_line(str))) {
+ log_error("Parsing command defs: no OO line found for %s", str);
+ exit(EXIT_FAILURE);
+ }
+
+ if (!(line = strdup(oo_line)))
+ exit(EXIT_FAILURE);
+
+ split_line(line, &line_argc, line_argv, ' ');
+ add_required_opt_line(cmd, line_argc, line_argv);
+ free(line);
+}
+
+/* Process what follows command_name, which are required opt/pos args. */
+
+static void add_required_line(struct command *cmd, int argc, char *argv[])
+{
+ int i;
+ int takes_arg;
+ int prev_was_opt = 0, prev_was_pos = 0;
+
+ /* argv[0] is command name */
+
+ for (i = 1; i < argc; i++) {
+
+ if (is_opt_name(argv[i])) {
+ /* add new required_opt_arg */
+ add_opt_arg(cmd, argv[i], &takes_arg, REQUIRED);
+ prev_was_opt = 1;
+ prev_was_pos = 0;
+
+ } else if (prev_was_opt && takes_arg) {
+ /* set value for previous required_opt_arg */
+ update_prev_opt_arg(cmd, argv[i], REQUIRED);
+ prev_was_opt = 0;
+ prev_was_pos = 0;
+
+ } else if (is_pos_name(argv[i])) {
+ /* add new required_pos_arg */
+ add_pos_arg(cmd, argv[i], REQUIRED);
+ prev_was_opt = 0;
+ prev_was_pos = 1;
+
+ } else if (!strncmp(argv[i], "OO_", 3)) {
+ /* one required_opt_arg is required, special case lv/vgchange */
+ cmd->cmd_flags |= CMD_FLAG_ONE_REQUIRED_OPT;
+ include_required_opt_args(cmd, argv[i]);
+
+ } else if (prev_was_pos) {
+ /* set property for previous required_pos_arg */
+ update_prev_pos_arg(cmd, argv[i], REQUIRED);
+ } else {
+ log_error("Parsing command defs: can't parse argc %d argv %s prev %s",
+ i, argv[i], argv[i-1]);
+ exit(EXIT_FAILURE);
+ }
+
+ }
+}
+
+static void add_flags(struct command *cmd, char *line)
+{
+ if (strstr(line, "SECONDARY_SYNTAX"))
+ cmd->cmd_flags |= CMD_FLAG_SECONDARY_SYNTAX;
+}
+
+#define MAX_RULE_OPTS 64
+
+static void add_rule(struct command *cmd, char *line)
+{
+ struct cmd_rule *rule;
+ char *line_argv[MAX_LINE_ARGC];
+ char *arg;
+ int line_argc;
+ int i, lvt_enum, lvp_enum;
+ int check = 0;
+
+ if (cmd->rule_count == CMD_MAX_RULES) {
+ log_error("Parsing command defs: too many rules for cmd");
+ exit(EXIT_FAILURE);
+ }
+
+ rule = &cmd->rules[cmd->rule_count++];
+
+ split_line(line, &line_argc, line_argv, ' ');
+
+ for (i = 0; i < line_argc; i++) {
+ arg = line_argv[i];
+
+ if (!strcmp(arg, "not")) {
+ rule->rule = RULE_INVALID;
+ check = 1;
+ }
+
+ else if (!strcmp(arg, "and")) {
+ rule->rule = RULE_REQUIRE;
+ check = 1;
+ }
+
+ else if (!strncmp(arg, "all", 3)) {
+ /* opt/lvt_bits/lvp_bits all remain 0 to mean all */
+ continue;
+ }
+
+ else if (!strncmp(arg, "--", 2)) {
+ if (!rule->opts) {
+ if (!(rule->opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
+ log_error("Parsing command defs: no mem");
+ exit(EXIT_FAILURE);
+ }
+ memset(rule->opts, 0, MAX_RULE_OPTS * sizeof(int));
+ }
+
+ if (!rule->check_opts) {
+ if (!(rule->check_opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
+ log_error("Parsing command defs: no mem");
+ exit(EXIT_FAILURE);
+ }
+ memset(rule->check_opts, 0, MAX_RULE_OPTS * sizeof(int));
+ }
+
+ if (check)
+ rule->check_opts[rule->check_opts_count++] = opt_str_to_num(arg);
+ else
+ rule->opts[rule->opts_count++] = opt_str_to_num(arg);
+ }
+
+ else if (!strncmp(arg, "LV_", 3)) {
+ lvt_enum = lv_to_enum(arg);
+
+ if (check)
+ rule->check_lvt_bits |= lvt_enum_to_bit(lvt_enum);
+ else
+ rule->lvt_bits |= lvt_enum_to_bit(lvt_enum);
+ }
+
+ else if (!strncmp(arg, "lv_is_", 6)) {
+ lvp_enum = lvp_name_to_enum(arg);
+
+ if (check)
+ rule->check_lvp_bits |= lvp_enum_to_bit(lvp_enum);
+ else
+ rule->lvp_bits |= lvp_enum_to_bit(lvp_enum);
+ }
+ }
+}
+
+/* The given option is common to all lvm commands (set in lvm_all). */
+
+static int is_lvm_all_opt(int opt)
+{
+ int oo;
+
+ for (oo = 0; oo < lvm_all.oo_count; oo++) {
+ if (lvm_all.optional_opt_args[oo].opt == opt)
+ return 1;
+ }
+ return 0;
+}
+
+/* Find common options for all variants of each command name. */
+
+static void factor_common_options(void)
+{
+ int cn, opt_enum, ci, oo, ro, found;
+ struct command *cmd;
+
+ for (cn = 0; cn < MAX_COMMAND_NAMES; cn++) {
+ if (!command_names[cn].name)
+ break;
+
+ for (ci = 0; ci < COMMAND_COUNT; ci++) {
+ cmd = &commands[ci];
+
+ if (strcmp(cmd->name, command_names[cn].name))
+ continue;
+
+ command_names[cn].variants++;
+ }
+
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+
+ for (ci = 0; ci < COMMAND_COUNT; ci++) {
+ cmd = &commands[ci];
+
+ if (strcmp(cmd->name, command_names[cn].name))
+ continue;
+
+ if (cmd->ro_count)
+ command_names[cn].variant_has_ro = 1;
+ if (cmd->rp_count)
+ command_names[cn].variant_has_rp = 1;
+ if (cmd->oo_count)
+ command_names[cn].variant_has_oo = 1;
+ if (cmd->op_count)
+ command_names[cn].variant_has_op = 1;
+
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ command_names[cn].all_options[cmd->required_opt_args[ro].opt] = 1;
+
+ if ((cmd->required_opt_args[ro].opt == size_ARG) && !strncmp(cmd->name, "lv", 2))
+ command_names[cn].all_options[extents_ARG] = 1;
+ }
+ for (oo = 0; oo < cmd->oo_count; oo++)
+ command_names[cn].all_options[cmd->optional_opt_args[oo].opt] = 1;
+
+ found = 0;
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt == opt_enum) {
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found)
+ goto next_opt;
+ }
+
+ /* all commands starting with this name use this option */
+ command_names[cn].common_options[opt_enum] = 1;
+ next_opt:
+ ;
+ }
+ }
+}
+
+static int long_name_compare(const void *on1, const void *on2)
+{
+ struct opt_name **optname1 = (void *)on1;
+ struct opt_name **optname2 = (void *)on2;
+ return strcmp((*optname1)->long_opt + 2, (*optname2)->long_opt + 2);
+}
+
+/* Create list of option names for printing alphabetically. */
+
+static void create_opt_names_alpha(void)
+{
+ int i;
+
+ for (i = 0; i < ARG_COUNT; i++)
+ opt_names_alpha[i] = &opt_names[i];
+
+ qsort(opt_names_alpha, ARG_COUNT, sizeof(long), long_name_compare);
+}
+
+static int copy_line(char *line, int max_line, int *position)
+{
+ int p = *position;
+ int i = 0;
+
+ memset(line, 0, max_line);
+
+ while (1) {
+ line[i] = _command_input[p];
+ i++;
+ p++;
+
+ if (_command_input[p] == '\n') {
+ p++;
+ break;
+ }
+
+ if (i == (max_line - 1))
+ break;
+ }
+ *position = p;
+ return 1;
+}
+
+int define_commands(void)
+{
+ struct command *cmd;
+ char line[MAX_LINE];
+ char line_orig[MAX_LINE];
+ char *line_argv[MAX_LINE_ARGC];
+ const char *name;
+ char *n;
+ int line_argc;
+ int cmd_count = 0;
+ int prev_was_oo_def = 0;
+ int prev_was_oo = 0;
+ int prev_was_op = 0;
+ int copy_pos = 0;
+
+ create_opt_names_alpha();
+
+ /* Process each line of command-lines-input.h (from command-lines.in) */
+
+ while (copy_line(line, MAX_LINE, ©_pos)) {
+ if (line[0] == '\n')
+ break;
+
+ if ((n = strchr(line, '\n')))
+ *n = '\0';
+
+ memcpy(line_orig, line, sizeof(line));
+ split_line(line, &line_argc, line_argv, ' ');
+
+ if (!line_argc)
+ continue;
+
+ /* New cmd def begins: command_name <required opt/pos args> */
+ if ((name = is_command_name(line_argv[0]))) {
+ if (cmd_count >= COMMAND_COUNT) {
+ return 0;
+ }
+
+ /*
+ * FIXME: when running one specific command name,
+ * we can optimize by not parsing command defs
+ * that don't start with that command name.
+ */
+
+ cmd = &commands[cmd_count];
+ cmd->command_index = cmd_count;
+ cmd_count++;
+ cmd->name = strdup(name);
+ cmd->pos_count = 1;
+ add_required_line(cmd, line_argc, line_argv);
+
+ /* Every cmd gets the OO_ALL options */
+ include_optional_opt_args(cmd, "OO_ALL:");
+ continue;
+ }
+
+ /*
+ * All other kinds of lines are processed in the
+ * context of the existing command[].
+ */
+
+ if (is_desc_line(line_argv[0])) {
+ char *desc = strdup(line_orig);
+ if (cmd->desc) {
+ int newlen = strlen(cmd->desc) + strlen(desc) + 2;
+ char *newdesc = malloc(newlen);
+ memset(newdesc, 0, newlen);
+ snprintf(newdesc, newlen, "%s %s", cmd->desc, desc);
+ cmd->desc = newdesc;
+ free(desc);
+ } else
+ cmd->desc = desc;
+ continue;
+ }
+
+ if (is_flags_line(line_argv[0])) {
+ add_flags(cmd, line_orig);
+ continue;
+ }
+
+ if (is_rule_line(line_argv[0])) {
+ add_rule(cmd, line_orig);
+ continue;
+ }
+
+ if (is_id_line(line_argv[0])) {
+ cmd->command_id = strdup(line_argv[1]);
+ continue;
+ }
+
+ /* OO_FOO: ... */
+ if (is_oo_definition(line_argv[0])) {
+ add_oo_definition_line(line_argv[0], line_orig);
+ prev_was_oo_def = 1;
+ prev_was_oo = 0;
+ prev_was_op = 0;
+ continue;
+ }
+
+ /* OO: ... */
+ if (is_oo_line(line_argv[0])) {
+ add_optional_opt_line(cmd, line_argc, line_argv);
+ prev_was_oo_def = 0;
+ prev_was_oo = 1;
+ prev_was_op = 0;
+ continue;
+ }
+
+ /* OP: ... */
+ if (is_op_line(line_argv[0])) {
+ add_optional_pos_line(cmd, line_argc, line_argv);
+ prev_was_oo_def = 0;
+ prev_was_oo = 0;
+ prev_was_op = 1;
+ continue;
+ }
+
+ /* IO: ... */
+ if (is_io_line(line_argv[0])) {
+ add_ignore_opt_line(cmd, line_argc, line_argv);
+ prev_was_oo = 0;
+ prev_was_op = 0;
+ continue;
+ }
+
+ /* handle OO_FOO:, OO:, OP: continuing on multiple lines */
+
+ if (prev_was_oo_def) {
+ append_oo_definition_line(line_orig);
+ continue;
+ }
+
+ if (prev_was_oo) {
+ add_optional_opt_line(cmd, line_argc, line_argv);
+ continue;
+ }
+
+ if (prev_was_op) {
+ add_optional_pos_line(cmd, line_argc, line_argv);
+ continue;
+ }
+ }
+
+ /*
+ * For usage.
+ * Looks at all variants of each command name and figures out
+ * which options are common to all variants (for compact output)
+ */
+ factor_common_options();
+
+ /*
+ * For usage.
+ * Predefined string of options common to all commands
+ * (for compact output)
+ */
+ include_optional_opt_args(&lvm_all, "OO_USAGE_COMMON");
+
+ return 1;
+}
+
+/* type_LVT to "type" */
+
+static const char *lvt_enum_to_name(int lvt_enum)
+{
+ return lvt_names[lvt_enum].name;
+}
+
+static void _print_usage_description(struct command *cmd)
+{
+ const char *desc = cmd->desc;
+ char buf[MAX_LINE] = {0};
+ int di = 0;
+ int bi = 0;
+
+ for (di = 0; di < strlen(desc); di++) {
+ if (!strncmp(&desc[di], "DESC:", 5)) {
+ if (bi) {
+ buf[bi] = '\0';
+ printf(" %s\n", buf);
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ }
+ /* skip DESC: */
+ di += 5;
+ continue;
+ }
+
+ if (!bi && desc[di] == ' ')
+ continue;
+
+ buf[bi++] = desc[di];
+
+ if (bi == (MAX_LINE - 1))
+ break;
+ }
+
+ if (bi) {
+ buf[bi] = '\0';
+ printf(" %s\n", buf);
+ }
+}
+
+static void print_usage_def(struct arg_def *def)
+{
+ int val_enum;
+ int lvt_enum;
+ int sep = 0;
+
+ for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
+ if (def->val_bits & val_enum_to_bit(val_enum)) {
+
+ if (val_enum == conststr_VAL)
+ printf("%s", def->str);
+
+ else if (val_enum == constnum_VAL)
+ printf("%llu", (unsigned long long)def->num);
+
+ else {
+ if (sep) printf("|");
+
+ if (!val_names[val_enum].usage)
+ printf("%s", val_names[val_enum].name);
+ else
+ printf("%s", val_names[val_enum].usage);
+
+ sep = 1;
+ }
+
+ if (val_enum == lv_VAL && def->lvt_bits) {
+ for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
+ if (lvt_bit_is_set(def->lvt_bits, lvt_enum))
+ printf("_%s", lvt_enum_to_name(lvt_enum));
+ }
+ }
+
+ if ((val_enum == vg_VAL) && (def->flags & ARG_DEF_FLAG_NEW_VG))
+ printf("_new");
+ if ((val_enum == lv_VAL) && (def->flags & ARG_DEF_FLAG_NEW_LV))
+ printf("_new");
+ }
+ }
+
+ if (def->flags & ARG_DEF_FLAG_MAY_REPEAT)
+ printf(" ...");
+}
+
+void print_usage(struct command *cmd)
+{
+ struct command_name *cname = find_command_name(cmd->name);
+ int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
+ int ro, rp, oo, op, opt_enum, first;
+
+ if (cmd->desc)
+ _print_usage_description(cmd);
+
+ printf(" %s", cmd->name);
+
+ if (cmd->ro_count) {
+ first = 1;
+
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ if (onereq) {
+ if (first)
+ printf("\n\t(");
+ else
+ printf(",\n\t ");
+ first = 0;
+ }
+
+ printf(" %s", opt_names[cmd->required_opt_args[ro].opt].long_opt);
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_usage_def(&cmd->required_opt_args[ro].def);
+ }
+ }
+ if (onereq)
+ printf(" )\n");
+ }
+
+ if (cmd->rp_count) {
+ if (onereq)
+ printf("\t");
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits) {
+ printf(" ");
+ print_usage_def(&cmd->required_pos_args[rp].def);
+ }
+ }
+ }
+
+ if (!cmd->oo_count)
+ goto op_count;
+
+ if (cmd->oo_count) {
+ first = 1;
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ opt_enum = cmd->optional_opt_args[oo].opt;
+
+ /*
+ * Skip common opts in lvm_all and cname->common_options.
+ */
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if ((cname->variants > 1) && cname->common_options[opt_enum])
+ continue;
+
+ if (first)
+ printf("\n\t[");
+ else
+ printf(",\n\t ");
+ first = 0;
+
+ printf(" %s", opt_names[opt_enum].long_opt);
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_usage_def(&cmd->optional_opt_args[oo].def);
+ }
+ }
+
+ if (first)
+ printf("\n\t[");
+ else
+ printf(",\n\t ");
+ printf(" COMMON_OPTIONS ]");
+ }
+
+ op_count:
+ if (!cmd->op_count)
+ goto done;
+
+ printf("\n\t[");
+
+ if (cmd->op_count) {
+ for (op = 0; op < cmd->op_count; op++) {
+ if (cmd->optional_pos_args[op].def.val_bits) {
+ printf(" ");
+ print_usage_def(&cmd->optional_pos_args[op].def);
+ }
+ }
+ }
+
+ printf(" ]");
+ done:
+ printf("\n");
+ return;
+}
+
+
+void print_usage_common(struct command_name *cname, struct command *cmd)
+{
+ int oo, opt_enum, first;
+
+ printf(" Common options:");
+
+ /*
+ * when there's more than one variant, options that
+ * are common to all commands with a common name.
+ */
+
+ if (cname->variants < 2)
+ goto all;
+
+ first = 1;
+
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ if (!cname->common_options[opt_enum])
+ continue;
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (first)
+ printf("\n\t[");
+ else
+ printf(",\n\t ");
+ first = 0;
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ printf(" %s", opt_names[opt_enum].long_opt);
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_usage_def(&cmd->optional_opt_args[oo].def);
+ }
+ break;
+ }
+ }
+
+ all:
+ /* options that are common to all lvm commands */
+
+ for (oo = 0; oo < lvm_all.oo_count; oo++) {
+ opt_enum = lvm_all.optional_opt_args[oo].opt;
+
+ if (first)
+ printf("\n\t[");
+ else
+ printf(",\n\t ");
+ first = 0;
+
+ printf(" %s", opt_names[opt_enum].long_opt);
+ if (lvm_all.optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_usage_def(&lvm_all.optional_opt_args[oo].def);
+ }
+ }
+
+ printf(" ]\n");
+}
+
+#ifdef MAN_PAGE_GENERATOR
+
+static void print_val_man(const char *str)
+{
+ char *line;
+ char *line_argv[MAX_LINE_ARGC];
+ int line_argc;
+ int i;
+
+ if (!strcmp(str, "Number") ||
+ !strcmp(str, "String") ||
+ !strncmp(str, "VG", 2) ||
+ !strncmp(str, "LV", 2) ||
+ !strncmp(str, "PV", 2) ||
+ !strcmp(str, "Tag")) {
+ printf("\\fI%s\\fP", str);
+ return;
+ }
+
+ if (strstr(str, "Number[") || strstr(str, "]Number")) {
+ for (i = 0; i < strlen(str); i++) {
+ if (str[i] == 'N')
+ printf("\\fI");
+ if (str[i] == 'r') {
+ printf("%c", str[i]);
+ printf("\\fP");
+ continue;
+ }
+ printf("%c", str[i]);
+ }
+ return;
+ }
+
+ if (strstr(str, "|")) {
+ int len = strlen(str);
+ line = strdup(str);
+ split_line(line, &line_argc, line_argv, '|');
+ for (i = 0; i < line_argc; i++) {
+ if (i) {
+ printf("|");
+
+ /* this is a hack to add a line break for
+ a long string of opt values */
+ if ((len > 40) && (i >= (line_argc / 2) + 1)) {
+ printf("\n");
+ printf(" ");
+ len = 0;
+ }
+ }
+ if (strstr(line_argv[i], "Number"))
+ printf("\\fI%s\\fP", line_argv[i]);
+ else
+ printf("\\fB%s\\fP", line_argv[i]);
+ }
+ return;
+ }
+
+ printf("\\fB%s\\fP", str);
+}
+
+static void print_def_man(struct arg_def *def, int usage)
+{
+ int val_enum;
+ int lvt_enum;
+ int sep = 0;
+ int i;
+
+ for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
+ if (def->val_bits & val_enum_to_bit(val_enum)) {
+
+ if (val_enum == conststr_VAL) {
+ printf("\\fB");
+ printf("%s", def->str);
+ printf("\\fP");
+ }
+
+ else if (val_enum == constnum_VAL) {
+ printf("\\fB");
+ printf("%llu", (unsigned long long)def->num);
+ printf("\\fP");
+ }
+
+ else {
+ if (sep) printf("|");
+
+ if (!usage || !val_names[val_enum].usage) {
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ sep = 1;
+ }
+
+ if (val_enum == lv_VAL && def->lvt_bits) {
+ printf("\\fI");
+ for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
+ if (lvt_bit_is_set(def->lvt_bits, lvt_enum))
+ printf("_%s", lvt_enum_to_name(lvt_enum));
+ }
+ printf("\\fP");
+ }
+
+ if ((val_enum == vg_VAL) && (def->flags & ARG_DEF_FLAG_NEW_VG)) {
+ printf("\\fI");
+ printf("_new");
+ printf("\\fP");
+ }
+ if ((val_enum == lv_VAL) && (def->flags & ARG_DEF_FLAG_NEW_LV)) {
+ printf("\\fI");
+ printf("_new");
+ printf("\\fP");
+ }
+ }
+ }
+
+ if (def->flags & ARG_DEF_FLAG_MAY_REPEAT)
+ printf(" ...");
+}
+
+static char *man_long_opt_name(const char *cmdname, int opt_enum)
+{
+ static char long_opt_name[64];
+
+ memset(&long_opt_name, 0, sizeof(long_opt_name));
+
+ switch (opt_enum) {
+ case syncaction_ARG:
+ strncpy(long_opt_name, "--[raid]syncaction", 63);
+ break;
+ case writemostly_ARG:
+ strncpy(long_opt_name, "--[raid]writemostly", 63);
+ break;
+ case minrecoveryrate_ARG:
+ strncpy(long_opt_name, "--[raid]minrecoveryrate", 63);
+ break;
+ case maxrecoveryrate_ARG:
+ strncpy(long_opt_name, "--[raid]maxrecoveryrate", 63);
+ break;
+ case writebehind_ARG:
+ strncpy(long_opt_name, "--[raid]writebehind", 63);
+ break;
+ case vgmetadatacopies_ARG:
+ if (!strncmp(cmdname, "vg", 2))
+ strncpy(long_opt_name, "--[vg]metadatacopies", 63);
+ else
+ strncpy(long_opt_name, "--vgmetadatacopies", 63);
+ break;
+ case pvmetadatacopies_ARG:
+ if (!strncmp(cmdname, "pv", 2))
+ strncpy(long_opt_name, "--[pv]metadatacopies", 63);
+ else
+ strncpy(long_opt_name, "--pvmetadatacopies", 63);
+ break;
+ default:
+ strncpy(long_opt_name, opt_names[opt_enum].long_opt, 63);
+ break;
+ }
+
+ return long_opt_name;
+}
+
+void print_man_usage(char *lvmname, struct command *cmd)
+{
+ struct command_name *cname;
+ int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
+ int i, sep, ro, rp, oo, op, opt_enum;
+ int need_ro_indent_end = 0;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ printf("\\fB%s\\fP", lvmname);
+
+ if (!onereq)
+ goto ro_normal;
+
+ /*
+ * one required option in a set, print as:
+ * ( -a|--a,
+ * -b|--b,
+ * --c,
+ * --d )
+ *
+ * First loop through ro prints those with short opts,
+ * and the second loop prints those without short opts.
+ */
+
+ if (cmd->ro_count) {
+ printf("\n");
+ printf(".RS 4\n");
+ printf("(");
+
+ sep = 0;
+
+ /* print required options with a short opt */
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ opt_enum = cmd->required_opt_args[ro].opt;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ if (opt_names[opt_enum].short_opt) {
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+ } else {
+ printf(" ");
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+ }
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_opt_args[ro].def, 1);
+ }
+
+ sep++;
+ }
+
+ /* print required options without a short opt */
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ opt_enum = cmd->required_opt_args[ro].opt;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ printf(" ");
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_opt_args[ro].def, 1);
+ }
+
+ sep++;
+ }
+
+ printf(" )\n");
+ printf(".RE\n");
+ }
+
+ /* print required position args on a new line after the onereq set */
+ if (cmd->rp_count) {
+ printf(".RS 4\n");
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_pos_args[rp].def, 1);
+ }
+ }
+
+ printf("\n");
+ printf(".RE\n");
+ } else {
+ /* printf("\n"); */
+ }
+
+ printf(".br\n");
+ goto oo_count;
+
+ ro_normal:
+
+ /*
+ * all are required options, print as:
+ * -a|--aaa <val> -b|--bbb <val>
+ */
+
+ if (cmd->ro_count) {
+ sep = 0;
+
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+
+ /* avoid long line wrapping */
+ if ((cmd->ro_count > 2) && (sep == 2)) {
+ printf("\n.RS 5\n");
+ need_ro_indent_end = 1;
+ }
+
+ opt_enum = cmd->required_opt_args[ro].opt;
+
+ if (opt_names[opt_enum].short_opt) {
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+ } else {
+ printf(" \\fB%s\\fP", opt_names[cmd->required_opt_args[ro].opt].long_opt);
+ }
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_opt_args[ro].def, 1);
+ }
+
+ sep++;
+ }
+ }
+
+ /* print required position args on the same line as the required options */
+ if (cmd->rp_count) {
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_pos_args[rp].def, 1);
+ }
+ }
+
+ printf("\n");
+ } else {
+ printf("\n");
+ }
+
+ if (need_ro_indent_end)
+ printf(".RE\n");
+
+ printf(".br\n");
+
+ oo_count:
+ if (!cmd->oo_count)
+ goto op_count;
+
+ sep = 0;
+
+ if (cmd->oo_count) {
+ printf(".RS 4\n");
+ printf("[");
+
+ /* print optional options with short opts */
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ opt_enum = cmd->optional_opt_args[oo].opt;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if ((cname->variants > 1) && cname->common_options[opt_enum])
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ /* print optional options without short opts */
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ opt_enum = cmd->optional_opt_args[oo].opt;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if ((cname->variants > 1) && cname->common_options[opt_enum])
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ /* space alignment without short opt */
+ printf(" ");
+ }
+ printf(" COMMON_OPTIONS");
+ printf(" ]\n");
+ printf(".RE\n");
+ printf(".br\n");
+ }
+
+ op_count:
+ if (!cmd->op_count)
+ goto done;
+
+ printf(".RS 4\n");
+ printf("[");
+
+ if (cmd->op_count) {
+ for (op = 0; op < cmd->op_count; op++) {
+ if (cmd->optional_pos_args[op].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_pos_args[op].def, 1);
+ }
+ }
+ }
+
+ printf(" ]\n");
+ printf(".RE\n");
+
+ done:
+ printf("\n");
+}
+
+/*
+ * common options listed in the usage section.
+ *
+ * For commands with only one variant, this is only
+ * the options which are common to all lvm commands
+ * (in lvm_all, see is_lvm_all_opt).
+ *
+ * For commands with more than one variant, this
+ * is the set of options common to all variants
+ * (in cname->common_options), (which obviously
+ * includes the options common to all lvm commands.)
+ *
+ * List ordering:
+ * options with short+long names, alphabetically,
+ * then options with only long names, alphabetically
+ */
+
+void print_man_usage_common(struct command *cmd)
+{
+ struct command_name *cname;
+ int i, sep, ro, rp, oo, op, opt_enum;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ sep = 0;
+
+ printf(".RS 4\n");
+ printf("[");
+
+ /* print those with short opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (!cname->common_options[opt_enum])
+ continue;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ break;
+ }
+
+ }
+
+ /* print those without short opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (!cname->common_options[opt_enum])
+ continue;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ break;
+ }
+ }
+
+ printf(" ]\n");
+ return;
+}
+
+/*
+ * Format of description, when different command names have
+ * different descriptions:
+ *
+ * "#cmdname1"
+ * "text foo goes here"
+ * "a second line of text."
+ * "#cmdname2"
+ * "text bar goes here"
+ * "another line of text."
+ *
+ * When called for cmdname2, this function should just print:
+ *
+ * "text bar goes here"
+ * "another line of text."
+ */
+
+static void print_man_option_desc(struct command_name *cname, int opt_enum)
+{
+ const char *desc = opt_names[opt_enum].desc;
+ char buf[DESC_LINE];
+ int started_cname = 0;
+ int line_count = 0;
+ int di, bi = 0;
+
+ if (desc[0] != '#') {
+ printf("%s", desc);
+ return;
+ }
+
+ for (di = 0; di < strlen(desc); di++) {
+ buf[bi++] = desc[di];
+
+ if (bi == DESC_LINE) {
+ log_error("Parsing command defs: print_man_option_desc line too long");
+ exit(EXIT_FAILURE);
+ }
+
+ if (buf[bi-1] != '\n')
+ continue;
+
+ if (buf[0] != '#') {
+ if (started_cname) {
+ printf("%s", buf);
+ line_count++;
+ }
+
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ continue;
+ }
+
+ /* Line starting with #cmdname */
+
+ /*
+ * Must be starting a new command name.
+ * If no lines have been printed, multiple command names
+ * are using the same text. If lines have been printed,
+ * then the start of a new command name means the end
+ * of text for the current command name.
+ */
+ if (line_count && started_cname)
+ return;
+
+ if (!strncmp(buf + 1, cname->name, strlen(cname->name))) {
+ /* The start of our command name. */
+ started_cname = 1;
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ } else {
+ /* The start of another command name. */
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ }
+ }
+
+ if (bi && started_cname)
+ printf("%s", buf);
+}
+
+/*
+ * Print a list of all options names for a given
+ * command name, listed by:
+ * options with short+long names, alphabetically,
+ * then options with only long names, alphabetically
+ */
+
+void print_man_all_options_list(struct command_name *cname)
+{
+ int opt_enum, val_enum;
+ int sep = 0;
+ int i;
+
+ /* print those with both short and long opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+
+ if (!cname->all_options[opt_enum])
+ continue;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep)
+ printf("\n.br\n");
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cname->name, opt_enum));
+
+ val_enum = opt_names[opt_enum].val_enum;
+
+ if (!val_names[val_enum].fn) {
+ /* takes no arg */
+ } else if (!val_names[val_enum].usage) {
+ printf(" ");
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ printf(" ");
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ sep = 1;
+ }
+
+ /* print those without short opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (!cname->all_options[opt_enum])
+ continue;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep)
+ printf("\n.br\n");
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
+
+ val_enum = opt_names[opt_enum].val_enum;
+
+ if (!val_names[val_enum].fn) {
+ /* takes no arg */
+ } else if (!val_names[val_enum].usage) {
+ printf(" ");
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ printf(" ");
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ sep = 1;
+ }
+}
+
+/*
+ * All options used for a given command name, along with descriptions.
+ * listed in order of:
+ * 1. options that are not common to all lvm commands, alphabetically
+ * 2. options common to all lvm commands, alphabetically
+ */
+
+void print_man_all_options_desc(struct command_name *cname)
+{
+ int opt_enum, val_enum;
+ int print_common = 0;
+ int sep = 0;
+ int i;
+
+ again:
+ /*
+ * Loop 1: print options that are not common to all lvm commands.
+ * Loop 2: print options common to all lvm commands (lvm_all)
+ */
+
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (!cname->all_options[opt_enum])
+ continue;
+
+ if (!print_common && is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (print_common && !is_lvm_all_opt(opt_enum))
+ continue;
+
+ printf("\n.TP\n");
+
+ if (opt_names[opt_enum].short_opt) {
+ printf("\\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cname->name, opt_enum));
+ } else {
+ printf("\\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
+ }
+
+ val_enum = opt_names[opt_enum].val_enum;
+
+ if (!val_names[val_enum].fn) {
+ /* takes no arg */
+ } else if (!val_names[val_enum].usage) {
+ printf(" ");
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ printf(" ");
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ if (opt_names[opt_enum].desc) {
+ printf("\n");
+ printf(".br\n");
+ print_man_option_desc(cname, opt_enum);
+ }
+
+ sep = 1;
+ }
+
+ if (!print_common) {
+ print_common = 1;
+ goto again;
+ }
+}
+
+void print_desc_man(const char *desc)
+{
+ char buf[DESC_LINE] = {0};
+ int di = 0;
+ int bi = 0;
+
+ for (di = 0; di < strlen(desc); di++) {
+ if (desc[di] == '\0')
+ break;
+ if (desc[di] == '\n')
+ continue;
+
+ if (!strncmp(&desc[di], "DESC:", 5)) {
+ if (bi) {
+ printf("%s\n", buf);
+ printf(".br\n");
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ }
+ di += 5;
+ continue;
+ }
+
+ if (!bi && desc[di] == ' ')
+ continue;
+
+ buf[bi++] = desc[di];
+
+ if (bi == (DESC_LINE - 1))
+ break;
+ }
+
+ if (bi) {
+ printf("%s\n", buf);
+ printf(".br\n");
+ }
+}
+
+static char *upper_command_name(char *str)
+{
+ static char str_upper[32];
+ int i = 0;
+
+ while (*str) {
+ str_upper[i++] = toupper(*str);
+ str++;
+ }
+ str_upper[i] = '\0';
+ return str_upper;
+}
+
+static void include_description_file(char *name, char *des_file)
+{
+ char buf[1024 * 1024];
+ int fd;
+
+ memset(buf, 0, sizeof(buf));
+
+ fd = open(des_file, O_RDONLY);
+
+ if (fd < 0)
+ return;
+
+ read(fd, buf, sizeof(buf) - 1);
+
+ printf(".SH DESCRIPTION\n");
+ printf("%s\n", buf);
+
+ close(fd);
+}
+
+void print_man(char *name, char *des_file, int include_primary, int include_secondary)
+{
+ struct command_name *cname;
+ struct command *cmd, *prev_cmd = NULL;
+ char *lvmname = name;
+ const char *desc;
+ int i, j, ro, rp, oo, op;
+
+ if (!strncmp(name, "lvm-", 4))
+ name += 4;
+
+ cname = find_command_name(name);
+
+ printf(".TH %s 8 \"LVM TOOLS #VERSION#\" \"Sistina Software UK\"\n",
+ upper_command_name(lvmname));
+
+ for (i = 0; i < COMMAND_COUNT; i++) {
+
+ cmd = &commands[i];
+
+ if (prev_cmd && strcmp(prev_cmd->name, cmd->name)) {
+ printf("Common options:\n");
+ printf(".\n");
+ print_man_usage_common(prev_cmd);
+
+ printf("\n");
+ printf(".SH OPTIONS\n");
+ printf(".br\n");
+ print_man_all_options_desc(cname);
+
+ prev_cmd = NULL;
+ }
+
+ if ((cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_secondary)
+ continue;
+
+ if (!(cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_primary)
+ continue;
+
+ if (name && strcmp(name, cmd->name))
+ continue;
+
+ if (!prev_cmd || strcmp(prev_cmd->name, cmd->name)) {
+ printf(".SH NAME\n");
+ printf(".\n");
+ if (cname->desc)
+ printf("%s \\- %s\n", lvmname, cname->desc);
+ else
+ printf("%s\n", lvmname);
+ printf(".P\n");
+
+ printf(".\n");
+ printf(".SH SYNOPSIS\n");
+ printf(".br\n");
+ printf(".P\n");
+ printf(".\n");
+ prev_cmd = cmd;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ if (cname->variant_has_ro && cname->variant_has_rp)
+ printf("\\fB%s\\fP \\fIrequired_option_args\\fP \\fIrequired_position_args\\fP\n", lvmname);
+ else if (cname->variant_has_ro && !cname->variant_has_rp)
+ printf("\\fB%s\\fP \\fIrequired_option_args\\fP\n", lvmname);
+ else if (!cname->variant_has_ro && cname->variant_has_rp)
+ printf("\\fB%s\\fP \\fIrequired_position_args\\fP\n", lvmname);
+ else if (!cname->variant_has_ro && !cname->variant_has_rp)
+ printf("\\fB%s\\fP\n", lvmname);
+
+ printf(".br\n");
+
+ if (cname->variant_has_oo) {
+ printf(" [ \\fIoptional_option_args\\fP ]\n");
+ printf(".br\n");
+ }
+
+ if (cname->variant_has_op) {
+ printf(" [ \\fIoptional_position_args\\fP ]\n");
+ printf(".br\n");
+ }
+
+ printf(".P\n");
+ printf("\n");
+
+ /* listing them all when there's only 1 or 2 is just repetative */
+ if (cname->variants > 2) {
+ printf(".P\n");
+ print_man_all_options_list(cname);
+ printf("\n");
+ printf(".P\n");
+ printf("\n");
+ }
+
+ if (des_file) {
+ include_description_file(lvmname, des_file);
+ printf(".P\n");
+ }
+
+ printf(".SH USAGE\n");
+ printf(".br\n");
+ printf(".P\n");
+ printf(".\n");
+ }
+
+ if (cmd->desc) {
+ print_desc_man(cmd->desc);
+ printf(".P\n");
+ }
+
+ print_man_usage(lvmname, cmd);
+
+ if (i == (COMMAND_COUNT - 1)) {
+ printf("Common options:\n");
+ printf(".\n");
+ print_man_usage_common(cmd);
+
+ printf("\n");
+ printf(".SH OPTIONS\n");
+ printf(".br\n");
+ print_man_all_options_desc(cname);
+
+ }
+
+ printf("\n");
+ continue;
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ memset(&commands, 0, sizeof(commands));
+
+ if (argc < 2) {
+ log_error("Usage: %s <command> [/path/to/description-file]", argv[0]);
+ exit(EXIT_FAILURE);
+ }
+
+ define_commands();
+
+ print_man(argv[1], (argc > 2) ? argv[2] : NULL, 1, 1);
+
+ return 0;
+}
+
+#endif
diff --git a/tools/command.h b/tools/command.h
index c9be260..b3fae03 100644
--- a/tools/command.h
+++ b/tools/command.h
@@ -22,21 +22,33 @@ struct cmd_context;
typedef int (*command_fn) (struct cmd_context *cmd, int argc, char **argv);
/* new per-command-line-id functions */
-typedef int (*command_line_fn) (struct cmd_context *cmd, int argc, char **argv);
+typedef int (*command_id_fn) (struct cmd_context *cmd, int argc, char **argv);
struct command_function {
- int command_line_enum;
- command_line_fn fn;
+ int command_enum;
+ command_id_fn fn;
};
+#define MAX_COMMAND_NAMES 64
+
struct command_name {
const char *name;
const char *desc; /* general command description from commands.h */
unsigned int flags;
+ command_fn fn; /* old style */
/* union of {required,optional}_opt_args for all commands with this name */
- int valid_args[ARG_COUNT];
+ int valid_args[ARG_COUNT]; /* used for getopt */
int num_args;
+
+ /* the following are for generating help and man page output */
+ int common_options[ARG_COUNT]; /* options common to all defs */
+ int all_options[ARG_COUNT]; /* union of options from all defs */
+ int variants; /* number of command defs with this command name */
+ int variant_has_ro; /* do variants use required_opt_args ? */
+ int variant_has_rp; /* do variants use required_pos_args ? */
+ int variant_has_oo; /* do variants use optional_opt_args ? */
+ int variant_has_op; /* do variants use optional_pos_args ? */
};
/*
@@ -158,14 +170,13 @@ struct cmd_rule {
/* a register of the lvm commands */
struct command {
const char *name;
- const char *desc; /* specific command description from command-lines.h */
- const char *usage; /* excludes common options like --help, --debug */
- const char *usage_common; /* includes commmon options like --help, --debug */
- const char *command_line_id;
- int command_line_enum; /* <command_line_id>_CMD */
+ const char *desc; /* specific command description from command-lines.in */
+ const char *command_id; /* ID string in command-lines.in */
+ int command_enum; /* <command_id>_CMD */
+ int command_index; /* position in commands[] */
- command_fn fn; /* old style */
struct command_function *functions; /* new style */
+ command_fn fn; /* old style */
unsigned int cmd_flags; /* CMD_FLAG_ */
@@ -198,4 +209,9 @@ struct command {
int pos_count; /* temp counter used by create-command */
};
+int define_commands(void);
+int command_id_to_enum(const char *str);
+void print_usage(struct command *cmd);
+void print_usage_common(struct command_name *cname, struct command *cmd);
+
#endif
diff --git a/tools/lvchange.c b/tools/lvchange.c
index b75d058..1c00b76 100644
--- a/tools/lvchange.c
+++ b/tools/lvchange.c
@@ -1016,9 +1016,7 @@ static int _lvchange_properties_check(struct cmd_context *cmd,
{
if (!lv_is_visible(lv)) {
if (lv_is_named_arg)
- log_error("Operation not permitted (%s %d) on hidden LV %s.",
- cmd->command->command_line_id, cmd->command->command_line_enum,
- display_lvname(lv));
+ log_error("Operation not permitted on hidden LV %s.", display_lvname(lv));
return 0;
}
@@ -1129,9 +1127,7 @@ static int _lvchange_activate_check(struct cmd_context *cmd,
{
if (!lv_is_visible(lv)) {
if (lv_is_named_arg)
- log_error("Operation not permitted (%s %d) on hidden LV %s.",
- cmd->command->command_line_id, cmd->command->command_line_enum,
- display_lvname(lv));
+ log_error("Operation not permitted on hidden LV %s.", display_lvname(lv));
return 0;
}
@@ -1185,9 +1181,7 @@ static int _lvchange_refresh_check(struct cmd_context *cmd,
{
if (!lv_is_visible(lv)) {
if (lv_is_named_arg)
- log_error("Operation not permitted (%s %d) on hidden LV %s.",
- cmd->command->command_line_id, cmd->command->command_line_enum,
- display_lvname(lv));
+ log_error("Operation not permitted on hidden LV %s.", display_lvname(lv));
return 0;
}
@@ -1367,9 +1361,7 @@ static int _lvchange_persistent_check(struct cmd_context *cmd,
{
if (!lv_is_visible(lv)) {
if (lv_is_named_arg)
- log_error("Operation not permitted (%s %d) on hidden LV %s.",
- cmd->command->command_line_id, cmd->command->command_line_enum,
- display_lvname(lv));
+ log_error("Operation not permitted on hidden LV %s.", display_lvname(lv));
return 0;
}
@@ -1385,8 +1377,8 @@ int lvchange_persistent_cmd(struct cmd_context *cmd, int argc, char **argv)
int lvchange(struct cmd_context *cmd, int argc, char **argv)
{
- log_error(INTERNAL_ERROR "Missing function for command definition %s.",
- cmd->command->command_line_id);
+ log_error(INTERNAL_ERROR "Missing function for command definition %d:%s.",
+ cmd->command->command_index, cmd->command->command_id);
return ECMD_FAILED;
}
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 2ccf264..75bdcb9 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -17,7 +17,6 @@
#include "polldaemon.h"
#include "lv_alloc.h"
#include "lvconvert_poll.h"
-#include "command-lines-count.h"
typedef enum {
/* Split:
@@ -3764,7 +3763,7 @@ static int _lvconvert_to_pool_single(struct cmd_context *cmd,
int to_thinpool = 0;
int to_cachepool = 0;
- switch (cmd->command->command_line_enum) {
+ switch (cmd->command->command_enum) {
case lvconvert_to_thinpool_CMD:
to_thinpool = 1;
break;
@@ -3813,7 +3812,7 @@ int lvconvert_to_pool_noarg_cmd(struct cmd_context *cmd, int argc, char **argv)
char *pool_data_name;
int i, p;
- switch (cmd->command->command_line_enum) {
+ switch (cmd->command->command_enum) {
case lvconvert_to_thinpool_noarg_CMD:
pool_data_name = (char *)arg_str_value(cmd, thinpool_ARG, NULL);
new_command = get_command(lvconvert_to_thinpool_CMD);
@@ -3827,9 +3826,9 @@ int lvconvert_to_pool_noarg_cmd(struct cmd_context *cmd, int argc, char **argv)
return 0;
};
- log_debug("Changing command line id %s %d to standard form %s %d",
- cmd->command->command_line_id, cmd->command->command_line_enum,
- new_command->command_line_id, new_command->command_line_enum);
+ log_debug("Changing command %d:%s to standard form %d:%s",
+ cmd->command->command_index, cmd->command->command_id,
+ new_command->command_index, new_command->command_id);
/* Make the LV the first position arg. */
@@ -4092,7 +4091,7 @@ int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, ch
struct command *new_command;
char *pool_name;
- switch (cmd->command->command_line_enum) {
+ switch (cmd->command->command_enum) {
case lvconvert_swap_thinpool_metadata_CMD:
pool_name = (char *)arg_str_value(cmd, thinpool_ARG, NULL);
break;
@@ -4106,9 +4105,9 @@ int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, ch
new_command = get_command(lvconvert_swap_pool_metadata_CMD);
- log_debug("Changing command line id %s %d to standard form %s %d",
- cmd->command->command_line_id, cmd->command->command_line_enum,
- new_command->command_line_id, new_command->command_line_enum);
+ log_debug("Changing command %d:%s to standard form %d:%s",
+ cmd->command->command_index, cmd->command->command_id,
+ new_command->command_index, new_command->command_id);
/* Make the LV the first position arg. */
@@ -4172,7 +4171,7 @@ static int _lvconvert_split_cachepool_single(struct cmd_context *cmd,
return ECMD_FAILED;
}
- switch (cmd->command->command_line_enum) {
+ switch (cmd->command->command_enum) {
case lvconvert_split_and_keep_cachepool_CMD:
ret = _lvconvert_split_and_keep_cachepool(cmd, cache_lv, cachepool_lv);
break;
@@ -4193,7 +4192,7 @@ static int _lvconvert_split_cachepool_single(struct cmd_context *cmd,
int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv)
{
- if (cmd->command->command_line_enum == lvconvert_split_and_remove_cachepool_CMD) {
+ if (cmd->command->command_enum == lvconvert_split_and_remove_cachepool_CMD) {
cmd->handles_missing_pvs = 1;
cmd->partial_activation = 1;
}
@@ -4272,8 +4271,7 @@ static int _lvconvert_raid_types_check(struct cmd_context *cmd, struct logical_v
case thinpool_LVT:
case cachepool_LVT:
case snapshot_LVT:
- log_error("Operation not permitted (%s %d) on LV %s type %s.",
- cmd->command->command_line_id, cmd->command->command_line_enum,
+ log_error("Operation not permitted on LV %s type %s.",
display_lvname(lv), lvtype ? lvtype->name : "unknown");
return 0;
}
@@ -4281,9 +4279,7 @@ static int _lvconvert_raid_types_check(struct cmd_context *cmd, struct logical_v
return 1;
fail_hidden:
- log_error("Operation not permitted (%s %d) on hidden LV %s.",
- cmd->command->command_line_id, cmd->command->command_line_enum,
- display_lvname(lv));
+ log_error("Operation not permitted on hidden LV %s.", display_lvname(lv));
return 0;
}
@@ -4342,9 +4338,7 @@ static int _lvconvert_visible_check(struct cmd_context *cmd, struct logical_volu
int lv_is_named_arg)
{
if (!lv_is_visible(lv)) {
- log_error("Operation not permitted (%s %d) on hidden LV %s.",
- cmd->command->command_line_id, cmd->command->command_line_enum,
- display_lvname(lv));
+ log_error("Operation not permitted on hidden LV %s.", display_lvname(lv));
return 0;
}
@@ -4547,8 +4541,8 @@ int lvconvert_merge_cmd(struct cmd_context *cmd, int argc, char **argv)
int lvconvert(struct cmd_context *cmd, int argc, char **argv)
{
- log_error(INTERNAL_ERROR "Missing function for command definition %s.",
- cmd->command->command_line_id);
+ log_error(INTERNAL_ERROR "Missing function for command definition %d:%s.",
+ cmd->command->command_index, cmd->command->command_id);
return ECMD_FAILED;
}
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 4039dd9..121a9dd 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -49,7 +49,6 @@ extern char *optarg;
# define OPTIND_INIT 1
#endif
-#include "command-lines-count.h"
/*
* Table of valid --option values.
@@ -70,16 +69,6 @@ static struct arg_props _arg_props[ARG_COUNT + 1] = {
};
/*
- * Table of valid command names
- */
-#define MAX_COMMAND_NAMES 64
-struct command_name command_names[MAX_COMMAND_NAMES] = {
-#define xx(a, b, c...) { # a, b, c },
-#include "commands.h"
-#undef xx
-};
-
-/*
* Table of LV properties
*/
static struct lv_props _lv_props[LVP_COUNT + 1] = {
@@ -97,11 +86,20 @@ static struct lv_types _lv_types[LVT_COUNT + 1] = {
#undef lvt
};
+/*
+ * Table of command names
+ */
+struct command_name command_names[MAX_COMMAND_NAMES] = {
+#define xx(a, b, c...) { # a, b, c, a},
+#include "commands.h"
+#undef xx
+};
/*
- * Table of valid command lines
+ * Table of commands (as defined in command-lines.in)
*/
-static struct command commands[COMMAND_COUNT];
+struct command commands[COMMAND_COUNT];
+
static struct cmdline_context _cmdline;
/*
@@ -111,7 +109,7 @@ static struct cmdline_context _cmdline;
* to use these functions instead of the old per-command-name function.
* For now, any command id not included here uses the old command fn.
*/
-struct command_function command_functions[COMMAND_ID_COUNT] = {
+struct command_function command_functions[CMD_COUNT] = {
{ lvmconfig_general_CMD, lvmconfig },
{ lvchange_properties_CMD, lvchange_properties_cmd },
{ lvchange_resync_CMD, lvchange_resync_cmd },
@@ -1061,7 +1059,7 @@ static void _set_valid_args_for_command_name(int ci)
command_names[ci].num_args = num_args;
}
-static struct command_name *_find_command_name(const char *name)
+static struct command_name *find_command_name(const char *name)
{
int i;
@@ -1074,39 +1072,50 @@ static struct command_name *_find_command_name(const char *name)
return NULL;
}
-static struct command_function *_find_command_function(int command_line_enum)
+static struct command_function *_find_command_id_function(int command_enum)
{
int i;
- if (!command_line_enum)
+ if (!command_enum)
return NULL;
- for (i = 0; i < COMMAND_ID_COUNT; i++) {
- if (command_functions[i].command_line_enum == command_line_enum)
+ for (i = 0; i < CMD_COUNT; i++) {
+ if (command_functions[i].command_enum == command_enum)
return &command_functions[i];
}
return NULL;
}
-static void _define_commands(void)
-{
-/* command-lines.h defines command[] structs, generated from command-lines.in */
-#include "command-lines.h" /* generated from command-lines.in */
-}
-
void lvm_register_commands(void)
{
int i;
memset(&commands, 0, sizeof(commands));
- _define_commands();
+ /*
+ * populate commands[] array with command definitions
+ * by parsing command-lines.in/command-lines-input.h
+ */
+ if (!define_commands()) {
+ log_error("Failed to parse command definitions.");
+ return;
+ }
_cmdline.commands = commands;
_cmdline.num_commands = COMMAND_COUNT;
- for (i = 0; i < COMMAND_COUNT; i++)
- commands[i].functions = _find_command_function(commands[i].command_line_enum);
+ for (i = 0; i < COMMAND_COUNT; i++) {
+ commands[i].command_enum = command_id_to_enum(commands[i].command_id);
+
+ /* new style */
+ commands[i].functions = _find_command_id_function(commands[i].command_enum);
+
+ /* old style */
+ if (!commands[i].functions) {
+ struct command_name *cname = find_command_name(commands[i].name);
+ commands[i].fn = cname->fn;
+ }
+ }
_cmdline.command_names = command_names;
@@ -1139,7 +1148,7 @@ struct command *get_command(int cmd_enum)
int i;
for (i = 0; i < COMMAND_COUNT; i++) {
- if (commands[i].command_line_enum == cmd_enum)
+ if (commands[i].command_enum == cmd_enum)
return &commands[i];
}
@@ -1283,194 +1292,6 @@ static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp
return 0;
}
-
-#define HELP_LINE_SIZE 1024
-
-static void _print_usage(const char *usage_str, int only_required)
-{
- char buf[HELP_LINE_SIZE];
- int optional_ui = 0;
- int optional_pos_ui = 0;
- int ui;
- int bi;
-
- if (!usage_str || !strlen(usage_str))
- return;
-
- /*
- * copy the required opt_args/pos_args
- *
- * The optional portions of the usage string are enclosed
- * in [] and follow the required portions.
- *
- * The optional portion begins with [ followed by a space,
- * i.e. "[ " to distinguish the option usage which may
- * include [ in cases like --option Number[units].
- */
-
- memset(buf, 0, sizeof(buf));
- bi = 0;
-
- for (ui = 0; ui < strlen(usage_str); ui++) {
- if (!bi && ((usage_str[ui] == ' ') || (usage_str[ui] == '\n')))
- continue;
-
- /* The first "[ " indicates the start of the optional opt_args. */
- if ((usage_str[ui] == '[') && (usage_str[ui+1] == ' ')) {
- optional_ui = ui;
- break;
- }
-
- if (usage_str[ui] == '\0')
- break;
-
- if (usage_str[ui] == '(') {
- buf[bi++] = '\n';
- buf[bi++] = '\t';
- }
-
- buf[bi++] = usage_str[ui];
-
- if (usage_str[ui] == ')') {
- buf[bi++] = '\n';
- buf[bi++] = '\t';
- }
-
- if (usage_str[ui] == ',') {
- buf[bi++] = '\n';
- buf[bi++] = '\t';
- buf[bi++] = ' ';
- }
-
- if (bi == (HELP_LINE_SIZE - 1))
- break;
- }
-
- /*
- * print the required opt_args/pos_args
- */
-
- if (bi)
- log_print("%s", buf);
-
- if (only_required)
- return;
-
- /*
- * copy the optional opt_args
- */
-
- if (!optional_ui)
- goto out;
-
- memset(buf, 0, sizeof(buf));
- bi = 0;
-
- for (ui = optional_ui; ui < strlen(usage_str); ui++) {
-
- /* The second "[ " indicates the start of the optional pos_args. */
- if ((ui > optional_ui) && (usage_str[ui] == '[') && (usage_str[ui+1] == ' ')) {
- optional_pos_ui = ui;
- break;
- }
-
- if (usage_str[ui] == '\0')
- break;
- if (usage_str[ui] == '\n')
- break;
-
- if (!bi)
- buf[bi++] = '\t';
-
- buf[bi++] = usage_str[ui];
-
- if (usage_str[ui] == ',') {
- buf[bi++] = '\n';
- buf[bi++] = '\t';
- buf[bi++] = ' ';
- }
-
- if (bi == (HELP_LINE_SIZE - 1))
- break;
- }
-
- /*
- * print the optional opt_args
- */
-
- if (bi)
- log_print("%s", buf);
-
- /*
- * copy the optional pos_args
- */
-
- if (!optional_pos_ui)
- goto out;
-
- memset(buf, 0, sizeof(buf));
- bi = 0;
-
- for (ui = optional_pos_ui; ui < strlen(usage_str); ui++) {
- if (usage_str[ui] == '\0')
- break;
- if (usage_str[ui] == '\n')
- break;
-
- if (!bi)
- buf[bi++] = '\t';
-
- buf[bi++] = usage_str[ui];
-
- if (bi == (HELP_LINE_SIZE - 1))
- break;
- }
-
- /*
- * print the optional pos_args
- */
-
- if (bi)
- log_print("%s", buf);
- out:
- return;
-}
-
-static void _print_description(int ci)
-{
- const char *desc = _cmdline.commands[ci].desc;
- char buf[HELP_LINE_SIZE] = {0};
- int di = 0;
- int bi = 0;
-
- for (di = 0; di < strlen(desc); di++) {
- if (!strncmp(&desc[di], "DESC:", 5)) {
- if (bi) {
- buf[bi] = '\0';
- log_print("%s", buf);
- memset(buf, 0, sizeof(buf));
- bi = 0;
- }
- /* skip DESC: */
- di += 5;
- continue;
- }
-
- if (!bi && desc[di] == ' ')
- continue;
-
- buf[bi++] = desc[di];
-
- if (bi == (HELP_LINE_SIZE - 1))
- break;
- }
-
- if (bi) {
- buf[bi] = '\0';
- log_print("%s", buf);
- }
-}
-
/*
* Match what the user typed with a one specific command definition/prototype
* from commands[]. If nothing matches, it's not a valid command. The match
@@ -1683,7 +1504,7 @@ static struct command *_find_command(struct cmd_context *cmd, const char *path,
log_error("Failed to find a matching command definition.");
if (close_ro) {
log_warn("Closest command usage is:");
- _print_usage(_cmdline.commands[close_i].usage, 1);
+ print_usage(&_cmdline.commands[close_i]);
}
return NULL;
}
@@ -1698,8 +1519,7 @@ static struct command *_find_command(struct cmd_context *cmd, const char *path,
if (best_unused_count) {
for (i = 0; i < best_unused_count; i++) {
- log_error("Invalid option for command (%s %d): %s.",
- commands[best_i].command_line_id, best_i,
+ log_error("Invalid option for command: %s.",
arg_long_option_name(best_unused_options[i]));
}
return NULL;
@@ -1729,8 +1549,7 @@ static struct command *_find_command(struct cmd_context *cmd, const char *path,
break;
if (count >= (commands[best_i].rp_count + commands[best_i].op_count)) {
- log_error("Invalid positional argument for command (%s %d): %s.",
- commands[best_i].command_line_id, best_i, argv[count]);
+ log_error("Invalid positional argument for command: %s.", argv[count]);
/* FIXME: to warn/ignore, clear so it can't be used when processing. */
/*
@@ -1774,22 +1593,21 @@ out:
if (opts_match_count && (rule->rule == RULE_INVALID)) {
memset(buf, 0, sizeof(buf));
opt_array_to_str(cmd, rule->check_opts, rule->check_opts_count, buf, sizeof(buf));
- log_error("Invalid options for command (%s %d): %s",
- commands[best_i].command_line_id, best_i, buf);
+ log_error("Invalid options for command: %s", buf);
return NULL;
}
if (opts_unmatch_count && (rule->rule == RULE_REQUIRE)) {
memset(buf, 0, sizeof(buf));
opt_array_to_str(cmd, rule->check_opts, rule->check_opts_count, buf, sizeof(buf));
- log_error("Required options for command (%s %d): %s",
- commands[best_i].command_line_id, best_i, buf);
+ log_error("Required options for command: %s", buf);
return NULL;
}
}
}
- log_debug("command line id: %s %d", commands[best_i].command_line_id, best_i);
+ log_debug("Using command index %d id %s enum %d.",
+ best_i, commands[best_i].command_id, commands[best_i].command_enum);
return &commands[best_i];
}
@@ -1801,8 +1619,8 @@ static void _short_usage(const char *name)
static int _usage(const char *name, int help_count)
{
- struct command_name *cname = _find_command_name(name);
- const char *usage_common = NULL;
+ struct command_name *cname = find_command_name(name);
+ struct command *cmd;
int i;
if (!cname) {
@@ -1812,28 +1630,20 @@ static int _usage(const char *name, int help_count)
log_print("%s - %s\n", name, cname->desc);
- for (i = 0; i < _cmdline.num_commands; i++) {
+ for (i = 0; i < COMMAND_COUNT; i++) {
if (strcmp(_cmdline.commands[i].name, name))
continue;
if ((_cmdline.commands[i].cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && (help_count < 3))
continue;
- if (strlen(_cmdline.commands[i].desc))
- _print_description(i);
-
- usage_common = _cmdline.commands[i].usage_common;
-
- _print_usage(_cmdline.commands[i].usage, 0);
- log_print(" "); /* for built-in \n */
+ print_usage(&_cmdline.commands[i]);
+ cmd = &_cmdline.commands[i];
+ printf("\n");
}
/* Common options are printed once for all variants of a command name. */
- if (usage_common) {
- log_print("Common options:");
- _print_usage(usage_common, 0);
- log_print(" "); /* for built-in \n */
- }
+ print_usage_common(cname, cmd);
if (help_count > 1) {
/*
@@ -1957,7 +1767,7 @@ static int _find_arg(const char *cmd_name, int goval)
int arg_enum;
int i;
- if (!(cname = _find_command_name(cmd_name)))
+ if (!(cname = find_command_name(cmd_name)))
return -1;
for (i = 0; i < cname->num_args; i++) {
@@ -1989,7 +1799,7 @@ static int _process_command_line(struct cmd_context *cmd, int *argc, char ***arg
int goval; /* the number returned from getopt_long identifying what it found */
int i;
- if (!(cname = _find_command_name(cmd->name)))
+ if (!(cname = find_command_name(cmd->name)))
return_0;
if (!(cmd->opt_arg_values = dm_pool_zalloc(cmd->mem, sizeof(*cmd->opt_arg_values) * ARG_COUNT))) {
@@ -2686,7 +2496,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
log_debug("Parsing: %s", cmd->cmd_line);
- if (!(cmd->cname = _find_command_name(cmd->name))) {
+ if (!(cmd->cname = find_command_name(cmd->name))) {
log_error("Command name not found.\n");
return EINVALID_CMD_LINE;
}
@@ -2857,7 +2667,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
}
if (cmd->command->functions)
- /* A command-line--specific function is used */
+ /* A command-line-specific function is used */
ret = cmd->command->functions->fn(cmd, argc, argv);
else
/* The old style command-name function is used */
@@ -3388,3 +3198,4 @@ int lvm2_main(int argc, char **argv)
lvm_fin(cmd);
return lvm_return_code(ret);
}
+
diff --git a/tools/toollib.c b/tools/toollib.c
index 2c0096f..3b47989 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -2692,8 +2692,8 @@ static int _check_lv_types(struct cmd_context *cmd, struct logical_volume *lv, i
return 1;
if (!val_bit_is_set(cmd->command->required_pos_args[pos-1].def.val_bits, lv_VAL)) {
- log_error(INTERNAL_ERROR "Command (%s %d) arg position %d does not permit an LV (%llx)",
- cmd->command->command_line_id, cmd->command->command_line_enum,
+ log_error(INTERNAL_ERROR "Command %d:%s arg position %d does not permit an LV (%llx)",
+ cmd->command->command_index, cmd->command->command_id,
pos, (unsigned long long)cmd->command->required_pos_args[pos-1].def.val_bits);
return 0;
}
@@ -3109,9 +3109,7 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
if (!_check_lv_types(cmd, lvl->lv, lv_arg_pos)) {
/* FIXME: include this result in report log? */
if (lv_is_named_arg) {
- log_error("Operation not permitted (%s %d) on LV %s.",
- cmd->command->command_line_id, cmd->command->command_line_enum,
- display_lvname(lvl->lv));
+ log_error("Operation not permitted on LV %s.", display_lvname(lvl->lv));
ret_max = ECMD_FAILED;
}
continue;
@@ -3120,9 +3118,7 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
if (!_check_lv_rules(cmd, lvl->lv)) {
/* FIXME: include this result in report log? */
if (lv_is_named_arg) {
- log_error("Operation not permitted (%s %d) on LV %s.",
- cmd->command->command_line_id, cmd->command->command_line_enum,
- display_lvname(lvl->lv));
+ log_error("Operation not permitted on LV %s.", display_lvname(lvl->lv));
ret_max = ECMD_FAILED;
}
continue;
diff --git a/tools/tools.h b/tools/tools.h
index 392490f..4e1d87f 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -50,6 +50,13 @@
#define CMD_LEN 256
#define MAX_ARGS 64
+/* define the enums for each unique ID in command defs in command-lines.in */
+enum {
+#define cmd(a, b) a ,
+#include "cmds.h"
+#undef cmd
+};
+
/* define the enums for the values accepted by command line --options, foo_VAL */
enum {
#define val(a, b, c, d) a ,
@@ -84,6 +91,7 @@ enum {
};
#include "command.h"
+#include "command-count.h"
#define ARG_COUNTABLE 0x00000001 /* E.g. -vvvv */
#define ARG_GROUPABLE 0x00000002 /* E.g. --addtag */
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=942dc07402747d00…
Commit: 942dc07402747d00946c5e80d890d535c0cbd125
Parent: f067c0ad78cc894a2d620c38af4d74b679d5c316
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Feb 10 11:34:12 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvconvert: remove unused code
For "split" which is not an alias for splitmirrors.
---
tools/lvconvert.c | 46 +++++++---------------------------------------
1 files changed, 7 insertions(+), 39 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 1d7dc1b..2ccf264 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -24,7 +24,6 @@ typedef enum {
* For a mirrored or raid LV, split mirror into two mirrors, optionally tracking
* future changes to the main mirror to allow future recombination.
*/
- CONV_SPLIT = 1,
CONV_SPLIT_MIRRORS = 2,
/* Every other segment type or mirror log conversion we haven't separated out */
@@ -33,7 +32,6 @@ typedef enum {
struct lvconvert_params {
/* Exactly one of these 12 command categories is determined */
- int split; /* 1 */
int keep_mimages; /* 2 */ /* --splitmirrors */
/* other */ /* 3 */
@@ -169,34 +167,21 @@ static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp)
lp->mirrorlog = 1;
}
- if (arg_is_set(cmd, split_ARG)) {
- if (arg_outside_list_is_set(cmd, "cannot be used with --split",
- split_ARG,
- name_ARG,
- force_ARG, noudevsync_ARG, test_ARG,
- -1))
- return_0;
- lp->split = 1;
- _set_conv_type(lp, CONV_SPLIT);
- }
-
if (arg_is_set(cmd, trackchanges_ARG))
lp->track_changes = 1;
- if (lp->split) {
- if ((lp->lv_split_name = arg_str_value(cmd, name_ARG, NULL))) {
- if (!validate_restricted_lvname_param(cmd, &vg_name, &lp->lv_split_name))
- return_0;
- }
-
-
/*
* The '--splitmirrors n' argument is equivalent to '--mirrors -n'
* (note the minus sign), except that it signifies the additional
* intent to keep the mimage that is detached, rather than
* discarding it.
*/
- } else if (arg_is_set(cmd, splitmirrors_ARG)) {
+ if (arg_is_set(cmd, splitmirrors_ARG)) {
+ if ((lp->lv_split_name = arg_str_value(cmd, name_ARG, NULL))) {
+ if (!validate_restricted_lvname_param(cmd, &vg_name, &lp->lv_split_name))
+ return_0;
+ }
+
if (_mirror_or_raid_type_requested(cmd, lp->type_str)) {
log_error("--mirrors/--type mirror/--type raid* and --splitmirrors are "
"mutually exclusive.");
@@ -217,20 +202,11 @@ static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp)
_set_conv_type(lp, CONV_SPLIT_MIRRORS);
lp->mirrors = arg_uint_value(cmd, splitmirrors_ARG, 0);
lp->mirrors_sign = SIGN_MINUS;
- } else {
- if (lp->track_changes) {
- log_error("--trackchanges is only valid with --splitmirrors.");
- return 0;
- }
- if (arg_is_set(cmd, name_ARG)) {
- log_error("The 'name' argument is only valid with --splitmirrors");
- return 0;
- }
}
/* If no other case was identified, then use of --stripes means --type striped */
if (!arg_is_set(cmd, type_ARG) && !*lp->type_str &&
- !lp->split && !lp->mirrorlog && !lp->corelog &&
+ !lp->mirrorlog && !lp->corelog &&
(arg_is_set(cmd, stripes_long_ARG) || arg_is_set(cmd, stripesize_ARG)))
lp->type_str = SEG_TYPE_NAME_STRIPED;
@@ -251,21 +227,13 @@ static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp)
lp->alloc = (alloc_policy_t) arg_uint_value(cmd, alloc_ARG, ALLOC_INHERIT);
- /* We should have caught all these cases already. */
- if (lp->split + lp->keep_mimages > 1) {
- log_error(INTERNAL_ERROR "Unexpected combination of incompatible options selected.");
- return 0;
- }
-
/*
* Final checking of each case:
- * lp->split
* lp->keep_mimages
* --type mirror|raid lp->mirrorlog lp->corelog
* --type raid0|striped
*/
switch(lp->conv_type) {
- case CONV_SPLIT:
case CONV_SPLIT_MIRRORS:
break;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f067c0ad78cc894a…
Commit: f067c0ad78cc894a2d620c38af4d74b679d5c316
Parent: c3e1838382122e254aaf9bda6159bc5e95303309
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Jan 19 13:47:24 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
args: split is a synonym for splitcache
also tidy the other synonyms
---
tools/args.h | 59 +++++++++++++++++++++--------------------------
tools/command-lines.in | 1 +
tools/lvmcmdline.c | 4 +++
3 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index 8802cd7..1d7d6f7 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -133,9 +133,6 @@ arg(configreport_ARG, '\0', "configreport", configreport_VAL, ARG_GROUPABLE, 1,
arg(configtype_ARG, '\0', "typeconfig", configtype_VAL, 0, 0,
"See lvmreport(7).\n")
-arg(corelog_ARG, '\0', "corelog", 0, 0, 0,
- "An alias for --mirrorlog core.\n")
-
arg(dataalignment_ARG, '\0', "dataalignment", sizekb_VAL, 0, 0,
"Align the start of the data to a multiple of this number.\n"
"Also specify an appropriate Physical Extent size when creating a VG.\n"
@@ -288,10 +285,6 @@ arg(mergedconfig_ARG, '\0', "mergedconfig", 0, 0, 0,
"cascade is displayed.\n"
"See lvm.conf(5) for more information about config.\n")
-arg(metadatacopies_ARG, '\0', "metadatacopies", metadatacopies_VAL, 0, 0,
- "For commands starting with 'pv', this is an alias for --pvmetadatacopies.\n"
- "For commands starting with 'vg', this is an alias for --vgmetadatacopies.\n")
-
arg(metadataignore_ARG, '\0', "metadataignore", bool_VAL, 0, 0,
"Specifies the metadataignore property of a PV.\n"
"If yes, metadata areas on the PV are ignored, and lvm will\n"
@@ -440,24 +433,6 @@ arg(pvmetadatacopies_ARG, '\0', "pvmetadatacopies", pvmetadatacopies_VAL, 0, 0,
"This may be useful in VGs containing many PVs (this places limitations\n"
"on the ability to use vgsplit later.)\n")
-arg(raidrebuild_ARG, '\0', "raidrebuild", pv_VAL, ARG_GROUPABLE, 0,
- "An alias for --rebuild.\n")
-
-arg(raidmaxrecoveryrate_ARG, '\0', "raidmaxrecoveryrate", sizekb_VAL, 0, 0,
- "An alias for --maxrecoveryrate.\n")
-
-arg(raidminrecoveryrate_ARG, '\0', "raidminrecoveryrate", sizekb_VAL, 0, 0,
- "An alias for --minrecoveryrate.\n")
-
-arg(raidsyncaction_ARG, '\0', "raidsyncaction", syncaction_VAL, 0, 0,
- "An alias for --syncaction.\n")
-
-arg(raidwritebehind_ARG, '\0', "raidwritebehind", number_VAL, 0, 0,
- "An alias for --writebehind.\n")
-
-arg(raidwritemostly_ARG, '\0', "raidwritemostly", writemostly_VAL, ARG_GROUPABLE, 0,
- "An alias for --writemostly.\n")
-
arg(readonly_ARG, '\0', "readonly", 0, 0, 0,
"Run the command in a special read-only mode which will read on-disk\n"
"metadata without needing to take any locks. This can be used to peek\n"
@@ -571,9 +546,6 @@ arg(sinceversion_ARG, '\0', "sinceversion", string_VAL, 0, 0,
"This option is currently applicable only with --type new\n"
"to display all configuration settings introduced since given version.\n")
-/* Not used */
-arg(split_ARG, '\0', "split", 0, 0, 0, NULL)
-
arg(splitcache_ARG, '\0', "splitcache", 0, 0, 0,
"Separates a cache pool from a cache LV, and keeps the unused cache pool LV.\n"
"Before the separation, the cache is flushed. Also see --uncache.\n")
@@ -732,9 +704,6 @@ arg(vgmetadatacopies_ARG, '\0', "vgmetadatacopies", vgmetadatacopies_VAL, 0, 0,
"\\fBall\\fP causes LVM to first clear the metadataignore flags on\n"
"all PVs, and then to become unmanaged.\n")
-arg(virtualoriginsize_ARG, '\0', "virtualoriginsize", sizemb_VAL, 0, 0,
- "An alias for --virtualsize.\n")
-
arg(withsummary_ARG, '\0', "withsummary", 0, 0, 0,
"Display a one line comment for each configuration node.\n")
@@ -768,10 +737,34 @@ arg(writemostly_ARG, '\0', "writemostly", writemostly_VAL, ARG_GROUPABLE, 0,
"the suffix \\fB:t\\fP. Repeat this option to change the attribute on\n"
"multiple PVs.\n")
-/* Allow some variations */
+/*
+ * Synonyms of other options.
+ *
+ * Only the standard option names are used in command definitions.
+ *
+ * If used on the command line, lvm automatically translates them
+ * to the standard option name.
+ *
+ * The generated help and man output does not include
+ * these variants. The description of the standard option names
+ * can mention a synonym, or in some cases the man page generation
+ * recognizes some of these and prints the option name to include
+ * the variant, e.g. man page generation prints --[raid]writebehind.
+ */
+arg(corelog_ARG, '\0', "corelog", 0, 0, 0, NULL)
+arg(resizable_ARG, '\0', "resizable", bool_VAL, 0, 0, NULL)
arg(allocation_ARG, '\0', "allocation", bool_VAL, 0, 0, NULL)
arg(available_ARG, '\0', "available", activation_VAL, 0, 0, NULL)
-arg(resizable_ARG, '\0', "resizable", bool_VAL, 0, 0, NULL)
+arg(raidrebuild_ARG, '\0', "raidrebuild", pv_VAL, ARG_GROUPABLE, 0, NULL)
+arg(raidsyncaction_ARG, '\0', "raidsyncaction", syncaction_VAL, 0, 0, NULL)
+arg(raidwritemostly_ARG, '\0', "raidwritemostly", writemostly_VAL, ARG_GROUPABLE, 0, NULL)
+arg(raidminrecoveryrate_ARG, '\0', "raidminrecoveryrate", sizekb_VAL, 0, 0, NULL)
+arg(raidmaxrecoveryrate_ARG, '\0', "raidmaxrecoveryrate", sizekb_VAL, 0, 0, NULL)
+arg(raidwritebehind_ARG, '\0', "raidwritebehind", number_VAL, 0, 0, NULL)
+arg(virtualoriginsize_ARG, '\0', "virtualoriginsize", sizemb_VAL, 0, 0, NULL)
+arg(split_ARG, '\0', "split", 0, 0, 0, NULL)
+arg(metadatacopies_ARG, '\0', "metadatacopies", metadatacopies_VAL, 0, 0, NULL)
+
/*
* ... and now the short args.
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 81c70ba..4cc51fe 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -106,6 +106,7 @@
# maxrecoveryrate (raidmaxrecoveryrate)
# writebehind (raidwritebehind)
# virtualsize (virtualoriginsize)
+# splitcache (split)
# vgmetadatacopies (metadatacopies)
# pvmetadatacopies (metadatacopies)
#
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index dda4b16..4039dd9 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -940,6 +940,8 @@ static int _opt_standard_to_synonym(const char *cmd_name, int opt)
return raidwritebehind_ARG;
case virtualsize_ARG:
return virtualoriginsize_ARG;
+ case splitcache_ARG:
+ return split_ARG;
case pvmetadatacopies_ARG:
if (!strncmp(cmd_name, "pv", 2))
return metadatacopies_ARG;
@@ -977,6 +979,8 @@ static int _opt_synonym_to_standard(const char *cmd_name, int opt)
return writebehind_ARG;
case virtualoriginsize_ARG:
return virtualsize_ARG;
+ case split_ARG:
+ return splitcache_ARG;
case metadatacopies_ARG:
if (!strncmp(cmd_name, "pv", 2))
return pvmetadatacopies_ARG;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c3e1838382122e25…
Commit: c3e1838382122e254aaf9bda6159bc5e95303309
Parent: 15d9f2850e60a44cfc55d48ce108b4a82aecd9ae
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Jan 16 16:26:14 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
man: lvmthin updates
Some minor changes to some of the command syntaxes
to use more standard forms.
---
man/lvmthin.7.in | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/man/lvmthin.7.in b/man/lvmthin.7.in
index ce86974..714233e 100644
--- a/man/lvmthin.7.in
+++ b/man/lvmthin.7.in
@@ -157,17 +157,17 @@ The --thinpool argument specifies which thin pool will
contain the ThinLV.
.fi
-.B lvcreate \-n ThinLV \-V VirtualSize \-\-thinpool VG/ThinPoolLV
+.B lvcreate \-n ThinLV \-V VirtualSize \-\-thinpool ThinPoolLV VG
.I Example
.br
Create a thin LV in a thin pool:
.br
-# lvcreate \-n thin1 \-V 1T \-\-thinpool vg/pool0
+# lvcreate \-n thin1 \-V 1T \-\-thinpool pool0 vg
Create another thin LV in the same thin pool:
.br
-# lvcreate \-n thin2 \-V 1T \-\-thinpool vg/pool0
+# lvcreate \-n thin2 \-V 1T \-\-thinpool pool0 vg
# lvs vg/thin1 vg/thin2
LV VG Attr LSize Pool Origin Data%
@@ -184,9 +184,9 @@ when creating a thin snapshot.
.br
A size argument will cause an old COW snapshot to be created.
-.B lvcreate \-n SnapLV \-s VG/ThinLV
+.B lvcreate \-n SnapLV \-\-snapshot VG/ThinLV
.br
-.B lvcreate \-n SnapLV \-s VG/PrevSnapLV
+.B lvcreate \-n SnapLV \-\-snapshot VG/PrevSnapLV
.I Example
.br
@@ -286,15 +286,12 @@ The fully specified syntax for creating a thin pool LV shown above is:
.B lvconvert \-\-type thin-pool \-\-poolmetadata VG/ThinMetaLV VG/ThinDataLV
-An existing LV is converted to a thin pool by changing its type to
-thin-pool. An alternate syntax may be used for the same operation:
+An alternate syntax may be used for the same operation:
.B lvconvert \-\-thinpool VG/ThinDataLV \-\-poolmetadata VG/ThinMetaLV
-The thin-pool type is inferred by lvm; the --thinpool option is not an
-alias for --type thin-pool. The use of the --thinpool option here is
-different from the use of the --thinpool option when creating a thin LV,
-where it specifies the pool in which the thin LV is created.
+The thin-pool type is inferred by lvm; the \-\-thinpool option is not an
+alias for \-\-type thin\-pool.
.SS Automatic pool metadata LV
@@ -1234,7 +1231,7 @@ and creates a thin LV in the new pool.
.br
\-V VirtualSize specifies the virtual size of the thin LV.
-.B lvcreate \-V VirtualSize \-L LargeSize
+.B lvcreate \-\-type thin \-V VirtualSize \-L LargeSize
.RS
.B \-n ThinLV \-\-thinpool VG/ThinPoolLV
.RE
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=15d9f2850e60a44c…
Commit: 15d9f2850e60a44cfc55d48ce108b4a82aecd9ae
Parent: 013c080756dcc2faaecc80b489d85d7ab1384cbf
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Jan 12 14:44:58 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
ccmd: split into multiple files
---
tools/Makefile.in | 36 +-
tools/ccmd-main.c | 1130 +++++++++++++++++
tools/ccmd-man.c | 997 +++++++++++++++
tools/ccmd-util.c | 936 ++++++++++++++
tools/ccmd.h | 144 +++
tools/create-commands.c | 3169 -----------------------------------------------
6 files changed, 3238 insertions(+), 3174 deletions(-)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 887bc69..8f53851 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,3 +1,4 @@
+
#
# Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
# Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved.
@@ -140,6 +141,8 @@ all: device-mapper
CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS)
CFLAGS_lvmcmdline.o += $(VALGRIND_CFLAGS)
+INCLUDES += -I$(top_builddir)/tools
+
lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
$(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
@@ -173,12 +176,35 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
$(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
egrep -v '^ *(|#.*|config|devtypes|dumpconfig|formats|fullreport|help|lastlog|lvpoll|pvdata|segtypes|systemid|tags|version) *$$' > .commands
-ccmd: create-commands.c
- $(CC) create-commands.c -o ccmd
+ccmd: $(srcdir)/ccmd-main.c $(srcdir)/ccmd-util.c $(srcdir)/ccmd-man.c
+ $(CC) $(srcdir)/ccmd-main.c $(srcdir)/ccmd-util.c $(srcdir)/ccmd-man.c -o ccmd
+
+.DELETE_ON_ERROR:
+
+command-lines.h: $(srcdir)/command-lines.in ccmd
+ $(top_builddir)/tools/ccmd --output struct $(srcdir)/command-lines.in > $@
+
+command-lines-count.h: $(srcdir)/command-lines.in ccmd
+ $(top_builddir)/tools/ccmd --output count $(srcdir)/command-lines.in > $@
+
+# move properly to configure
+WC = /usr/bin/wc
+GREP = /bin/grep
+SORT = /bin/sort
+CUT = /bin/cut
+SED = /bin/sed
+
+# FIXME Add licence text from template file
+command-lines-count-new.h: $(srcdir)/command-lines.in ccmd Makefile
+ set -o pipefail && \
+ (echo -n "#define COMMAND_COUNT " && \
+ $(GREP) '^ID:' $(srcdir)/command-lines.in | $(WC) -l && \
+ echo -e "enum {\n\tno_CMD," && \
+ $(GREP) '^ID:' $(srcdir)/command-lines.in | $(CUT) -d\ -f2 | $(SORT) -u | $(SED) 's/\(.*\)/\t&_CMD,/' && \
+ echo -e "\tCOMMAND_ID_COUNT,\n};" \
+ ) > $@
-command-lines.h: ccmd
- ./ccmd --output struct command-lines.in > command-lines.h
- ./ccmd --output count command-lines.in > command-lines-count.h
+$(SOURCES:%.c=%.d): command-lines.h command-lines-count.h
ifneq ("$(CFLOW_CMD)", "")
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
diff --git a/tools/ccmd-main.c b/tools/ccmd-main.c
new file mode 100644
index 0000000..85d5656
--- /dev/null
+++ b/tools/ccmd-main.c
@@ -0,0 +1,1130 @@
+#include <asm/types.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <sched.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <getopt.h>
+
+#include "ccmd.h"
+
+
+/* input util functions (in ccmd-util.c) */
+char *split_line(char *buf, int *argc, char **argv, char sep);
+int val_str_to_num(char *str);
+int opt_str_to_num(char *str);
+int lvp_name_to_enum(char *str);
+int lv_to_enum(char *name);
+uint64_t lv_to_bits(char *name);
+
+/* header output functions (in ccmd-util.c) */
+void print_header_struct(void);
+void print_header_count(void);
+void print_ambiguous(void);
+
+/* man page output (in ccmd-main.c) */
+void print_man(char *man_command_name, int include_primary, int include_secondary);
+
+
+/* create table of value names, e.g. String, and corresponding enum from vals.h */
+
+struct val_name val_names[VAL_COUNT + 1] = {
+#define val(a, b, c, d) { # a, a, b, c, d },
+#include "vals.h"
+#undef val
+};
+
+/* create table of option names, e.g. --foo, and corresponding enum from args.h */
+
+struct opt_name opt_names[ARG_COUNT + 1] = {
+#define arg(a, b, c, d, e, f, g) { # a, a, b, "", "--" c, d, e, f, g },
+#include "args.h"
+#undef arg
+};
+
+/* create table of lv property names, e.g. lv_is_foo, and corresponding enum from lv_props.h */
+
+struct lvp_name lvp_names[LVP_COUNT + 1] = {
+#define lvp(a, b, c) { # a, a, b },
+#include "lv_props.h"
+#undef lvp
+};
+
+/* create table of lv type names, e.g. linear and corresponding enum from lv_types.h */
+
+struct lvt_name lvt_names[LVT_COUNT + 1] = {
+#define lvt(a, b, c) { # a, a, b },
+#include "lv_types.h"
+#undef lvt
+};
+
+/* create table of command names, e.g. vgcreate */
+
+struct cmd_name cmd_names[MAX_CMD_NAMES] = {
+#define xx(a, b, c) { # a , b } ,
+#include "commands.h"
+#undef xx
+};
+
+/* array of pointers into opt_names[] that is sorted alphabetically (by long opt name) */
+
+struct opt_name *opt_names_alpha[ARG_COUNT + 1];
+
+/* lvm_all is for recording options that are common for all lvm commands */
+
+struct command lvm_all;
+
+/* saves OO_FOO lines (groups of optional options) to include in multiple defs */
+
+static int oo_line_count;
+#define MAX_OO_LINES 256
+
+struct oo_line {
+ char *name;
+ char *line;
+};
+static struct oo_line oo_lines[MAX_OO_LINES];
+
+#define REQUIRED 1 /* required option */
+#define OPTIONAL 0 /* optional option */
+#define IGNORE -1 /* ignore option */
+
+/* control man page output */
+
+static int include_man_secondary = 1; /* include SECONDARY forms in man output */
+static int include_man_primary = 1; /* include primary forms in man output */
+static char *man_command_name = NULL; /* print man page for a single command name */
+
+
+static void add_optional_opt_line(struct command *cmd, int argc, char *argv[]);
+
+/*
+ * Parse command-lines.in and record those definitions
+ * in an array of struct command: cmd_array[].
+ */
+
+static const char *is_command_name(char *str)
+{
+ int i;
+
+ for (i = 0; i < MAX_CMD_NAMES; i++) {
+ if (!cmd_names[i].name)
+ break;
+ if (!strcmp(cmd_names[i].name, str))
+ return cmd_names[i].name;
+ }
+ return NULL;
+}
+
+struct cmd_name *find_command_name(const char *str)
+{
+ int i;
+
+ for (i = 0; i < MAX_CMD_NAMES; i++) {
+ if (!cmd_names[i].name)
+ break;
+ if (!strcmp(cmd_names[i].name, str))
+ return &cmd_names[i];
+ }
+ return NULL;
+}
+
+static int is_opt_name(char *str)
+{
+ if (!strncmp(str, "--", 2))
+ return 1;
+
+ if ((str[0] == '-') && (str[1] != '-')) {
+ printf("Options must be specified in long form: %s\n", str);
+ exit(1);
+ }
+
+ return 0;
+}
+
+/*
+ * "Select" as a pos name means that the position
+ * can be empty if the --select option is used.
+ */
+
+static int is_pos_name(char *str)
+{
+ if (!strncmp(str, "VG", 2))
+ return 1;
+ if (!strncmp(str, "LV", 2))
+ return 1;
+ if (!strncmp(str, "PV", 2))
+ return 1;
+ if (!strncmp(str, "Tag", 3))
+ return 1;
+ if (!strncmp(str, "String", 6))
+ return 1;
+ if (!strncmp(str, "Select", 6))
+ return 1;
+ return 0;
+}
+
+static int is_oo_definition(char *str)
+{
+ if (!strncmp(str, "OO_", 3) && strstr(str, ":"))
+ return 1;
+ return 0;
+}
+
+static int is_oo_line(char *str)
+{
+ if (!strncmp(str, "OO:", 3))
+ return 1;
+ return 0;
+}
+
+static int is_io_line(char *str)
+{
+ if (!strncmp(str, "IO:", 3))
+ return 1;
+ return 0;
+}
+
+static int is_op_line(char *str)
+{
+ if (!strncmp(str, "OP:", 3))
+ return 1;
+ return 0;
+}
+
+static int is_desc_line(char *str)
+{
+ if (!strncmp(str, "DESC:", 5))
+ return 1;
+ return 0;
+}
+
+static int is_flags_line(char *str)
+{
+ if (!strncmp(str, "FLAGS:", 6))
+ return 1;
+ return 0;
+}
+
+static int is_rule_line(char *str)
+{
+ if (!strncmp(str, "RULE:", 5))
+ return 1;
+ return 0;
+}
+
+static int is_id_line(char *str)
+{
+ if (!strncmp(str, "ID:", 3))
+ return 1;
+ return 0;
+}
+
+/*
+ * Save a positional arg in a struct arg_def.
+ * Parse str for anything that can appear in a position,
+ * like VG, VG|LV, VG|LV_linear|LV_striped, etc.
+ */
+
+static void set_pos_def(struct command *cmd, char *str, struct arg_def *def)
+{
+ char *argv[MAX_LINE_ARGC];
+ int argc;
+ char *name;
+ int val_enum;
+ int i;
+
+ split_line(str, &argc, argv, '|');
+
+ for (i = 0; i < argc; i++) {
+ name = argv[i];
+
+ val_enum = val_str_to_num(name);
+
+ if (!val_enum) {
+ printf("Unknown pos arg: %s\n", name);
+ exit(1);
+ }
+
+ def->val_bits |= val_enum_to_bit(val_enum);
+
+ if ((val_enum == lv_VAL) && strstr(name, "_"))
+ def->lvt_bits = lv_to_bits(name);
+
+ if (strstr(name, "_new")) {
+ if (val_enum == lv_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_LV;
+ else if (val_enum == vg_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_VG;
+ }
+ }
+}
+
+/*
+ * Save an option arg in a struct arg_def.
+ * Parse str for anything that can follow --option.
+ */
+
+static void set_opt_def(struct command *cmd, char *str, struct arg_def *def)
+{
+ char *argv[MAX_LINE_ARGC];
+ int argc;
+ char *name;
+ int val_enum;
+ int i, j;
+
+ split_line(str, &argc, argv, '|');
+
+ for (i = 0; i < argc; i++) {
+ name = argv[i];
+
+ val_enum = val_str_to_num(name);
+
+ if (!val_enum) {
+ /* a literal number or string */
+
+ if (isdigit(name[0]))
+ val_enum = constnum_VAL;
+
+ else if (isalpha(name[0]))
+ val_enum = conststr_VAL;
+
+ else {
+ printf("Unknown opt arg: %s\n", name);
+ exit(0);
+ }
+ }
+
+
+ def->val_bits |= val_enum_to_bit(val_enum);
+
+ if (val_enum == constnum_VAL)
+ def->num = (uint64_t)atoi(name);
+
+ if (val_enum == conststr_VAL)
+ def->str = strdup(name);
+
+ if (val_enum == lv_VAL) {
+ if (strstr(name, "_"))
+ def->lvt_bits = lv_to_bits(name);
+ }
+
+ if (strstr(name, "_new")) {
+ if (val_enum == lv_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_LV;
+ else if (val_enum == vg_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_VG;
+
+ }
+ }
+}
+
+/*
+ * Save a set of common options so they can be included in
+ * multiple command defs.
+ *
+ * OO_FOO: --opt1 ...
+ *
+ * oo->name = "OO_FOO";
+ * oo->line = "--opt1 ...";
+ */
+
+static void add_oo_definition_line(const char *name, const char *line)
+{
+ struct oo_line *oo;
+ char *colon;
+ char *start;
+
+ oo = &oo_lines[oo_line_count++];
+ oo->name = strdup(name);
+
+ if ((colon = strstr(oo->name, ":")))
+ *colon = '\0';
+ else {
+ printf("invalid OO definition\n");
+ exit(1);
+ }
+
+ start = strstr(line, ":") + 2;
+ oo->line = strdup(start);
+}
+
+/* Support OO_FOO: continuing on multiple lines. */
+
+static void append_oo_definition_line(const char *new_line)
+{
+ struct oo_line *oo;
+ char *old_line;
+ char *line;
+ int len;
+
+ oo = &oo_lines[oo_line_count-1];
+
+ old_line = oo->line;
+
+ /* +2 = 1 space between old and new + 1 terminating \0 */
+ len = strlen(old_line) + strlen(new_line) + 2;
+ line = malloc(len);
+ memset(line, 0, len);
+
+ strcat(line, old_line);
+ strcat(line, " ");
+ strcat(line, new_line);
+
+ free(oo->line);
+ oo->line = line;
+}
+
+/* Find a saved OO_FOO definition. */
+
+char *get_oo_line(char *str)
+{
+ char *name;
+ char *end;
+ char str2[64];
+ int i;
+
+ strcpy(str2, str);
+ if ((end = strstr(str2, ":")))
+ *end = '\0';
+ if ((end = strstr(str2, ",")))
+ *end = '\0';
+
+ for (i = 0; i < oo_line_count; i++) {
+ name = oo_lines[i].name;
+ if (!strcmp(name, str2))
+ return oo_lines[i].line;
+ }
+ return NULL;
+}
+
+/*
+ * Add optional_opt_args entries when OO_FOO appears on OO: line,
+ * i.e. include common options from an OO_FOO definition.
+ */
+
+static void include_optional_opt_args(struct command *cmd, char *str)
+{
+ char *oo_line;
+ char *line;
+ char *line_argv[MAX_LINE_ARGC];
+ int line_argc;
+
+ if (!(oo_line = get_oo_line(str))) {
+ printf("No OO line found for %s\n", str);
+ exit(1);
+ }
+
+ if (!(line = strdup(oo_line)))
+ exit(1);
+
+ split_line(line, &line_argc, line_argv, ' ');
+ add_optional_opt_line(cmd, line_argc, line_argv);
+ free(line);
+}
+
+/*
+ * When an --option is seen, add a new opt_args entry for it.
+ * This function sets the opt_args.opt value for it.
+ */
+
+static void add_opt_arg(struct command *cmd, char *str, int *takes_arg, int required)
+{
+ char *comma;
+ int opt;
+
+ /* opt_arg.opt set here */
+ /* opt_arg.def will be set in update_prev_opt_arg() if needed */
+
+ if ((comma = strstr(str, ",")))
+ *comma = '\0';
+
+ /*
+ * Work around nasty hack where --uuid is used for both uuid_ARG
+ * and uuidstr_ARG. The input uses --uuidstr, where an actual
+ * command uses --uuid string.
+ */
+ if (!strcmp(str, "--uuidstr")) {
+ opt = uuidstr_ARG;
+ goto skip;
+ }
+
+ opt = opt_str_to_num(str);
+skip:
+ if (required > 0)
+ cmd->required_opt_args[cmd->ro_count++].opt = opt;
+ else if (!required)
+ cmd->optional_opt_args[cmd->oo_count++].opt = opt;
+ else if (required < 0)
+ cmd->ignore_opt_args[cmd->io_count++].opt = opt;
+ else
+ exit(1);
+
+ *takes_arg = opt_names[opt].val_enum ? 1 : 0;
+}
+
+/*
+ * After --option has been seen, this function sets opt_args.def value
+ * for the value that appears after --option.
+ */
+
+static void update_prev_opt_arg(struct command *cmd, char *str, int required)
+{
+ struct arg_def def = { 0 };
+ char *comma;
+
+ if (str[0] == '-') {
+ printf("Option %s must be followed by an arg.\n", str);
+ exit(1);
+ }
+
+ /* opt_arg.def set here */
+ /* opt_arg.opt was previously set in add_opt_arg() when --foo was read */
+
+ if ((comma = strstr(str, ",")))
+ *comma = '\0';
+
+ set_opt_def(cmd, str, &def);
+
+ if (required > 0)
+ cmd->required_opt_args[cmd->ro_count-1].def = def;
+ else if (!required)
+ cmd->optional_opt_args[cmd->oo_count-1].def = def;
+ else if (required < 0)
+ cmd->ignore_opt_args[cmd->io_count-1].def = def;
+ else
+ exit(1);
+}
+
+/*
+ * When an position arg is seen, add a new pos_args entry for it.
+ * This function sets the pos_args.pos and pos_args.def.
+ */
+
+static void add_pos_arg(struct command *cmd, char *str, int required)
+{
+ struct arg_def def = { 0 };
+
+ /* pos_arg.pos and pos_arg.def are set here */
+
+ set_pos_def(cmd, str, &def);
+
+ if (required) {
+ cmd->required_pos_args[cmd->rp_count].pos = cmd->pos_count++;
+ cmd->required_pos_args[cmd->rp_count].def = def;
+ cmd->rp_count++;
+ } else {
+ cmd->optional_pos_args[cmd->op_count].pos = cmd->pos_count++;;
+ cmd->optional_pos_args[cmd->op_count].def = def;
+ cmd->op_count++;
+ }
+}
+
+/* Process something that follows a pos arg, which is not a new pos arg. */
+
+static void update_prev_pos_arg(struct command *cmd, char *str, int required)
+{
+ struct arg_def *def;
+
+ /* a previous pos_arg.def is modified here */
+
+ if (required)
+ def = &cmd->required_pos_args[cmd->rp_count-1].def;
+ else
+ def = &cmd->optional_pos_args[cmd->op_count-1].def;
+
+ if (!strcmp(str, "..."))
+ def->flags |= ARG_DEF_FLAG_MAY_REPEAT;
+ else {
+ printf("Unknown pos arg: %s\n", str);
+ exit(1);
+ }
+}
+
+/* Process what follows OO:, which are the optional opt args for the cmd def. */
+
+static void add_optional_opt_line(struct command *cmd, int argc, char *argv[])
+{
+ int takes_arg;
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (!i && !strncmp(argv[i], "OO:", 3))
+ continue;
+ if (is_opt_name(argv[i]))
+ add_opt_arg(cmd, argv[i], &takes_arg, OPTIONAL);
+ else if (!strncmp(argv[i], "OO_", 3))
+ include_optional_opt_args(cmd, argv[i]);
+ else if (takes_arg)
+ update_prev_opt_arg(cmd, argv[i], OPTIONAL);
+ else
+ printf("Can't parse argc %d argv %s prev %s\n",
+ i, argv[i], argv[i-1]);
+ }
+}
+
+/* Process what follows IO:, which are the ignore options for the cmd def. */
+
+static void add_ignore_opt_line(struct command *cmd, int argc, char *argv[])
+{
+ int takes_arg;
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (!i && !strncmp(argv[i], "IO:", 3))
+ continue;
+ if (is_opt_name(argv[i]))
+ add_opt_arg(cmd, argv[i], &takes_arg, IGNORE);
+ else if (takes_arg)
+ update_prev_opt_arg(cmd, argv[i], IGNORE);
+ else
+ printf("Can't parse argc %d argv %s prev %s\n",
+ i, argv[i], argv[i-1]);
+ }
+}
+
+/* Process what follows OP:, which are optional pos args for the cmd def. */
+
+static void add_optional_pos_line(struct command *cmd, int argc, char *argv[])
+{
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (!i && !strncmp(argv[i], "OP:", 3))
+ continue;
+ if (is_pos_name(argv[i]))
+ add_pos_arg(cmd, argv[i], OPTIONAL);
+ else
+ update_prev_pos_arg(cmd, argv[i], OPTIONAL);
+ }
+}
+
+static void add_required_opt_line(struct command *cmd, int argc, char *argv[])
+{
+ int takes_arg;
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (is_opt_name(argv[i]))
+ add_opt_arg(cmd, argv[i], &takes_arg, REQUIRED);
+ else if (takes_arg)
+ update_prev_opt_arg(cmd, argv[i], REQUIRED);
+ else
+ printf("Can't parse argc %d argv %s prev %s\n",
+ i, argv[i], argv[i-1]);
+ }
+}
+
+/*
+ * Add to required_opt_args from an OO_FOO definition.
+ * (This is the special case of vgchange/lvchange where one
+ * optional option is required, and others are then optional.)
+ * The set of options from OO_FOO are saved in required_opt_args,
+ * and flag CMD_FLAG_ONE_REQUIRED_OPT is set on the cmd indicating
+ * this special case.
+ */
+
+static void include_required_opt_args(struct command *cmd, char *str)
+{
+ char *oo_line;
+ char *line;
+ char *line_argv[MAX_LINE_ARGC];
+ int line_argc;
+
+ if (!(oo_line = get_oo_line(str))) {
+ printf("No OO line found for %s\n", str);
+ exit(1);
+ }
+
+ if (!(line = strdup(oo_line)))
+ exit(1);
+
+ split_line(line, &line_argc, line_argv, ' ');
+ add_required_opt_line(cmd, line_argc, line_argv);
+ free(line);
+}
+
+/* Process what follows command_name, which are required opt/pos args. */
+
+static void add_required_line(struct command *cmd, int argc, char *argv[])
+{
+ int i;
+ int takes_arg;
+ int prev_was_opt = 0, prev_was_pos = 0;
+
+ /* argv[0] is command name */
+
+ for (i = 1; i < argc; i++) {
+
+ if (is_opt_name(argv[i])) {
+ /* add new required_opt_arg */
+ add_opt_arg(cmd, argv[i], &takes_arg, REQUIRED);
+ prev_was_opt = 1;
+ prev_was_pos = 0;
+
+ } else if (prev_was_opt && takes_arg) {
+ /* set value for previous required_opt_arg */
+ update_prev_opt_arg(cmd, argv[i], REQUIRED);
+ prev_was_opt = 0;
+ prev_was_pos = 0;
+
+ } else if (is_pos_name(argv[i])) {
+ /* add new required_pos_arg */
+ add_pos_arg(cmd, argv[i], REQUIRED);
+ prev_was_opt = 0;
+ prev_was_pos = 1;
+
+ } else if (!strncmp(argv[i], "OO_", 3)) {
+ /* one required_opt_arg is required, special case lv/vgchange */
+ cmd->cmd_flags |= CMD_FLAG_ONE_REQUIRED_OPT;
+ include_required_opt_args(cmd, argv[i]);
+
+ } else if (prev_was_pos) {
+ /* set property for previous required_pos_arg */
+ update_prev_pos_arg(cmd, argv[i], REQUIRED);
+ } else
+ printf("Can't parse argc %d argv %s prev %s\n",
+ i, argv[i], argv[i-1]);
+
+ }
+}
+
+static void add_flags(struct command *cmd, char *line)
+{
+ if (strstr(line, "SECONDARY_SYNTAX"))
+ cmd->cmd_flags |= CMD_FLAG_SECONDARY_SYNTAX;
+}
+
+#define MAX_RULE_OPTS 64
+
+static void add_rule(struct command *cmd, char *line)
+{
+ struct cmd_rule *rule;
+ char *line_argv[MAX_LINE_ARGC];
+ char *arg;
+ int line_argc;
+ int i, lvt_enum, lvp_enum;
+ int check = 0;
+
+ if (cmd->rule_count == CMD_MAX_RULES) {
+ printf("too many rules for cmd\n");
+ exit(1);
+ }
+
+ rule = &cmd->rules[cmd->rule_count++];
+
+ split_line(line, &line_argc, line_argv, ' ');
+
+ for (i = 0; i < line_argc; i++) {
+ arg = line_argv[i];
+
+ if (!strcmp(arg, "not")) {
+ rule->rule = RULE_INVALID;
+ check = 1;
+ }
+
+ else if (!strcmp(arg, "and")) {
+ rule->rule = RULE_REQUIRE;
+ check = 1;
+ }
+
+ else if (!strncmp(arg, "all", 3)) {
+ /* opt/lvt_bits/lvp_bits all remain 0 to mean all */
+ continue;
+ }
+
+ else if (!strncmp(arg, "--", 2)) {
+ if (!rule->opts) {
+ if (!(rule->opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
+ printf("no mem\n");
+ exit(1);
+ }
+ memset(rule->opts, 0, MAX_RULE_OPTS * sizeof(int));
+ }
+
+ if (!rule->check_opts) {
+ if (!(rule->check_opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
+ printf("no mem\n");
+ exit(1);
+ }
+ memset(rule->check_opts, 0, MAX_RULE_OPTS * sizeof(int));
+ }
+
+ if (check)
+ rule->check_opts[rule->check_opts_count++] = opt_str_to_num(arg);
+ else
+ rule->opts[rule->opts_count++] = opt_str_to_num(arg);
+ }
+
+ else if (!strncmp(arg, "LV_", 3)) {
+ lvt_enum = lv_to_enum(arg);
+
+ if (check)
+ rule->check_lvt_bits |= lvt_enum_to_bit(lvt_enum);
+ else
+ rule->lvt_bits |= lvt_enum_to_bit(lvt_enum);
+ }
+
+ else if (!strncmp(arg, "lv_is_", 6)) {
+ lvp_enum = lvp_name_to_enum(arg);
+
+ if (check)
+ rule->check_lvp_bits |= lvp_enum_to_bit(lvp_enum);
+ else
+ rule->lvp_bits |= lvp_enum_to_bit(lvp_enum);
+ }
+ }
+}
+
+/* The given option is common to all lvm commands (set in lvm_all). */
+
+int is_lvm_all_opt(int opt)
+{
+ int oo;
+
+ for (oo = 0; oo < lvm_all.oo_count; oo++) {
+ if (lvm_all.optional_opt_args[oo].opt == opt)
+ return 1;
+ }
+ return 0;
+}
+
+/* Find common options for all variants of each command name. */
+
+static void factor_common_options(void)
+{
+ int cn, opt_enum, ci, oo, ro, found;
+ struct command *cmd;
+
+ for (cn = 0; cn < MAX_CMD_NAMES; cn++) {
+ if (!cmd_names[cn].name)
+ break;
+
+ for (ci = 0; ci < cmd_count; ci++) {
+ cmd = &cmd_array[ci];
+
+ if (strcmp(cmd->name, cmd_names[cn].name))
+ continue;
+
+ cmd_names[cn].variants++;
+ }
+
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+
+ for (ci = 0; ci < cmd_count; ci++) {
+ cmd = &cmd_array[ci];
+
+ if (strcmp(cmd->name, cmd_names[cn].name))
+ continue;
+
+ if (cmd->ro_count)
+ cmd_names[cn].variant_has_ro = 1;
+ if (cmd->rp_count)
+ cmd_names[cn].variant_has_rp = 1;
+ if (cmd->oo_count)
+ cmd_names[cn].variant_has_oo = 1;
+ if (cmd->op_count)
+ cmd_names[cn].variant_has_op = 1;
+
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ cmd_names[cn].all_options[cmd->required_opt_args[ro].opt] = 1;
+
+ if ((cmd->required_opt_args[ro].opt == size_ARG) && !strncmp(cmd->name, "lv", 2))
+ cmd_names[cn].all_options[extents_ARG] = 1;
+ }
+ for (oo = 0; oo < cmd->oo_count; oo++)
+ cmd_names[cn].all_options[cmd->optional_opt_args[oo].opt] = 1;
+
+ found = 0;
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt == opt_enum) {
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found)
+ goto next_opt;
+ }
+
+ /* all commands starting with this name use this option */
+ cmd_names[cn].common_options[opt_enum] = 1;
+ next_opt:
+ ;
+ }
+ }
+}
+
+static int long_name_compare(const void *on1, const void *on2)
+{
+ struct opt_name **optname1 = (void *)on1;
+ struct opt_name **optname2 = (void *)on2;
+ return strcmp((*optname1)->long_opt + 2, (*optname2)->long_opt + 2);
+}
+
+/* Create list of option names for printing alphabetically. */
+
+static void create_opt_names_alpha(void)
+{
+ int i;
+
+ for (i = 0; i < ARG_COUNT; i++)
+ opt_names_alpha[i] = &opt_names[i];
+
+ qsort(opt_names_alpha, ARG_COUNT, sizeof(long), long_name_compare);
+}
+
+static void print_help(int argc, char *argv[])
+{
+ printf("%s [options] --output <format> <filename>\n", argv[0]);
+ printf("\n");
+ printf("output formats:\n");
+ printf("struct: print C structures for command-lines.h\n");
+ printf("count: print defines and enums for command-lines-count.h\n");
+ printf("ambiguous: print commands differing only by LV types\n");
+ printf("man: print man page format.\n");
+ printf("\n");
+ printf("options:\n");
+ printf("-c|--man-command <commandname> man output for one command name\n");
+}
+
+int main(int argc, char *argv[])
+{
+ char *outputformat = NULL;
+ char *inputfile = NULL;
+ FILE *file;
+ struct command *cmd;
+ char line[MAX_LINE];
+ char line_orig[MAX_LINE];
+ const char *name;
+ char *line_argv[MAX_LINE_ARGC];
+ char *n;
+ int line_argc;
+ int prev_was_oo_def = 0;
+ int prev_was_oo = 0;
+ int prev_was_op = 0;
+
+ if (argc < 2) {
+ print_help(argc, argv);
+ exit(EXIT_FAILURE);
+ }
+
+ create_opt_names_alpha();
+
+ static struct option long_options[] = {
+ {"help", no_argument, 0, 'h' },
+ {"output", required_argument, 0, 'o' },
+ {"man-primary", required_argument, 0, 'p' },
+ {"man-secondary", required_argument, 0, 's' },
+ {"man-command", required_argument, 0, 'c' },
+ {0, 0, 0, 0 }
+ };
+
+ while (1) {
+ int c;
+ int option_index = 0;
+
+ c = getopt_long(argc, argv, "ho:p:s:c:",
+ long_options, &option_index);
+ if (c == -1)
+ break;
+
+ switch (c) {
+ case '0':
+ break;
+ case 'h':
+ print_help(argc, argv);
+ exit(EXIT_SUCCESS);
+ case 'o':
+ outputformat = strdup(optarg);
+ break;
+ case 'p':
+ include_man_primary = atoi(optarg);
+ break;
+ case 's':
+ include_man_secondary = atoi(optarg);
+ break;
+ case 'c':
+ man_command_name = strdup(optarg);
+ break;
+ }
+ }
+
+ if (optind < argc)
+ inputfile = argv[optind];
+ else {
+ printf("Missing filename.\n");
+ return 0;
+ }
+
+ if (!(file = fopen(inputfile, "r"))) {
+ printf("Cannot open %s\n", argv[1]);
+ return -1;
+ }
+
+ /* Process each line of input file. */
+
+ while (fgets(line, MAX_LINE, file)) {
+ if (line[0] == '#')
+ continue;
+ if (line[0] == '\n')
+ continue;
+ if (line[0] == '-' && line[1] == '-' && line[2] == '-')
+ continue;
+
+ if ((n = strchr(line, '\n')))
+ *n = '\0';
+
+ memcpy(line_orig, line, sizeof(line));
+ split_line(line, &line_argc, line_argv, ' ');
+
+ if (!line_argc)
+ continue;
+
+ /* command ... */
+ if ((name = is_command_name(line_argv[0]))) {
+ if (cmd_count >= MAX_CMDS) {
+ printf("MAX_CMDS too small\n");
+ return -1;
+ }
+ cmd = &cmd_array[cmd_count++];
+ cmd->name = name;
+ cmd->pos_count = 1;
+ add_required_line(cmd, line_argc, line_argv);
+
+ /* Every cmd gets the OO_ALL options */
+ include_optional_opt_args(cmd, "OO_ALL:");
+ continue;
+ }
+
+ if (is_desc_line(line_argv[0])) {
+ char *desc = strdup(line_orig);
+ if (cmd->desc) {
+ int newlen = strlen(cmd->desc) + strlen(desc) + 2;
+ char *newdesc = malloc(newlen);
+ memset(newdesc, 0, newlen);
+ snprintf(newdesc, newlen, "%s %s", cmd->desc, desc);
+ cmd->desc = newdesc;
+ free(desc);
+ } else
+ cmd->desc = desc;
+ continue;
+ }
+
+ if (is_flags_line(line_argv[0])) {
+ add_flags(cmd, line_orig);
+ continue;
+ }
+
+ if (is_rule_line(line_argv[0])) {
+ add_rule(cmd, line_orig);
+ continue;
+ }
+
+ if (is_id_line(line_argv[0])) {
+ cmd->command_line_id = strdup(line_argv[1]);
+ continue;
+ }
+
+ /* OO_FOO: ... */
+ if (is_oo_definition(line_argv[0])) {
+ add_oo_definition_line(line_argv[0], line_orig);
+ prev_was_oo_def = 1;
+ prev_was_oo = 0;
+ prev_was_op = 0;
+ continue;
+ }
+
+ /* OO: ... */
+ if (is_oo_line(line_argv[0])) {
+ add_optional_opt_line(cmd, line_argc, line_argv);
+ prev_was_oo_def = 0;
+ prev_was_oo = 1;
+ prev_was_op = 0;
+ continue;
+ }
+
+ /* OP: ... */
+ if (is_op_line(line_argv[0])) {
+ add_optional_pos_line(cmd, line_argc, line_argv);
+ prev_was_oo_def = 0;
+ prev_was_oo = 0;
+ prev_was_op = 1;
+ continue;
+ }
+
+ /* IO: ... */
+ if (is_io_line(line_argv[0])) {
+ add_ignore_opt_line(cmd, line_argc, line_argv);
+ prev_was_oo = 0;
+ prev_was_op = 0;
+ continue;
+ }
+
+ /* handle OO_FOO:, OO:, OP: continuing on multiple lines */
+
+ if (prev_was_oo_def) {
+ append_oo_definition_line(line_orig);
+ continue;
+ }
+
+ if (prev_was_oo) {
+ add_optional_opt_line(cmd, line_argc, line_argv);
+ continue;
+ }
+
+ if (prev_was_op) {
+ add_optional_pos_line(cmd, line_argc, line_argv);
+ continue;
+ }
+ }
+
+ fclose(file);
+
+ /*
+ * Looks at all variants of each command name and figures out
+ * which options are common to all variants (for compact output)
+ */
+ factor_common_options();
+
+ /*
+ * Predefined string of options common to all commands
+ * (for compact output)
+ */
+ include_optional_opt_args(&lvm_all, "OO_USAGE_COMMON");
+
+ /*
+ * Print output.
+ */
+
+ if (!strcmp(outputformat, "struct"))
+ print_header_struct();
+
+ else if (!strcmp(outputformat, "count"))
+ print_header_count();
+
+ else if (!strcmp(outputformat, "ambiguous"))
+ print_ambiguous();
+
+ else if (!strcmp(outputformat, "man"))
+ print_man(man_command_name, include_man_primary, include_man_secondary);
+ else
+ print_help(argc, argv);
+
+ return 0;
+}
+
diff --git a/tools/ccmd-man.c b/tools/ccmd-man.c
new file mode 100644
index 0000000..34a9c38
--- /dev/null
+++ b/tools/ccmd-man.c
@@ -0,0 +1,997 @@
+#include <asm/types.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <sched.h>
+#include <dirent.h>
+#include <ctype.h>
+
+#include "ccmd.h"
+
+char *split_line(char *buf, int *argc, char **argv, char sep);
+struct cmd_name *find_command_name(const char *str);
+int is_lvm_all_opt(int opt);
+const char *lvt_enum_to_name(int lvt_enum);
+
+extern struct val_name val_names[VAL_COUNT + 1];
+extern struct opt_name opt_names[ARG_COUNT + 1];
+extern struct lvp_name lvp_names[LVP_COUNT + 1];
+extern struct lvt_name lvt_names[LVT_COUNT + 1];
+extern struct cmd_name cmd_names[MAX_CMD_NAMES];
+extern struct opt_name *opt_names_alpha[ARG_COUNT + 1];
+extern struct command lvm_all;
+
+static const char *cmd_name_desc(const char *name)
+{
+ int i;
+
+ for (i = 0; i < MAX_CMD_NAMES; i++) {
+ if (!cmd_names[i].name)
+ break;
+ if (!strcmp(cmd_names[i].name, name))
+ return cmd_names[i].desc;
+ }
+ return NULL;
+}
+
+static void print_val_man(const char *str)
+{
+ char *line;
+ char *line_argv[MAX_LINE_ARGC];
+ int line_argc;
+ int i;
+
+ if (!strcmp(str, "Number") ||
+ !strcmp(str, "String") ||
+ !strncmp(str, "VG", 2) ||
+ !strncmp(str, "LV", 2) ||
+ !strncmp(str, "PV", 2) ||
+ !strcmp(str, "Tag")) {
+ printf("\\fI%s\\fP", str);
+ return;
+ }
+
+ if (strstr(str, "Number[") || strstr(str, "]Number")) {
+ for (i = 0; i < strlen(str); i++) {
+ if (str[i] == 'N')
+ printf("\\fI");
+ if (str[i] == 'r') {
+ printf("%c", str[i]);
+ printf("\\fP");
+ continue;
+ }
+ printf("%c", str[i]);
+ }
+ return;
+ }
+
+ if (strstr(str, "|")) {
+ int len = strlen(str);
+ line = strdup(str);
+ split_line(line, &line_argc, line_argv, '|');
+ for (i = 0; i < line_argc; i++) {
+ if (i) {
+ printf("|");
+
+ /* this is a hack to add a line break for
+ a long string of opt values */
+ if ((len > 40) && (i >= (line_argc / 2) + 1)) {
+ printf("\n");
+ printf(" ");
+ len = 0;
+ }
+ }
+ if (strstr(line_argv[i], "Number"))
+ printf("\\fI%s\\fP", line_argv[i]);
+ else
+ printf("\\fB%s\\fP", line_argv[i]);
+ }
+ return;
+ }
+
+ printf("\\fB%s\\fP", str);
+}
+
+static void print_def_man(struct arg_def *def, int usage)
+{
+ int val_enum;
+ int lvt_enum;
+ int sep = 0;
+ int i;
+
+ for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
+ if (def->val_bits & val_enum_to_bit(val_enum)) {
+
+ if (val_enum == conststr_VAL) {
+ printf("\\fB");
+ printf("%s", def->str);
+ printf("\\fP");
+ }
+
+ else if (val_enum == constnum_VAL) {
+ printf("\\fB");
+ printf("%llu", (unsigned long long)def->num);
+ printf("\\fP");
+ }
+
+ else {
+ if (sep) printf("|");
+
+ if (!usage || !val_names[val_enum].usage) {
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ sep = 1;
+ }
+
+ if (val_enum == lv_VAL && def->lvt_bits) {
+ printf("\\fI");
+ for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
+ if (lvt_bit_is_set(def->lvt_bits, lvt_enum))
+ printf("_%s", lvt_enum_to_name(lvt_enum));
+ }
+ printf("\\fP");
+ }
+
+ if ((val_enum == vg_VAL) && (def->flags & ARG_DEF_FLAG_NEW_VG)) {
+ printf("\\fI");
+ printf("_new");
+ printf("\\fP");
+ }
+ if ((val_enum == lv_VAL) && (def->flags & ARG_DEF_FLAG_NEW_LV)) {
+ printf("\\fI");
+ printf("_new");
+ printf("\\fP");
+ }
+ }
+ }
+
+ if (def->flags & ARG_DEF_FLAG_MAY_REPEAT)
+ printf(" ...");
+}
+
+static char *man_long_opt_name(const char *cmdname, int opt_enum)
+{
+ static char long_opt_name[64];
+
+ memset(&long_opt_name, 0, sizeof(long_opt_name));
+
+ switch (opt_enum) {
+ case syncaction_ARG:
+ strncpy(long_opt_name, "--[raid]syncaction", 63);
+ break;
+ case writemostly_ARG:
+ strncpy(long_opt_name, "--[raid]writemostly", 63);
+ break;
+ case minrecoveryrate_ARG:
+ strncpy(long_opt_name, "--[raid]minrecoveryrate", 63);
+ break;
+ case maxrecoveryrate_ARG:
+ strncpy(long_opt_name, "--[raid]maxrecoveryrate", 63);
+ break;
+ case writebehind_ARG:
+ strncpy(long_opt_name, "--[raid]writebehind", 63);
+ break;
+ case vgmetadatacopies_ARG:
+ if (!strncmp(cmdname, "vg", 2))
+ strncpy(long_opt_name, "--[vg]metadatacopies", 63);
+ else
+ strncpy(long_opt_name, "--vgmetadatacopies", 63);
+ break;
+ case pvmetadatacopies_ARG:
+ if (!strncmp(cmdname, "pv", 2))
+ strncpy(long_opt_name, "--[pv]metadatacopies", 63);
+ else
+ strncpy(long_opt_name, "--pvmetadatacopies", 63);
+ break;
+ default:
+ strncpy(long_opt_name, opt_names[opt_enum].long_opt, 63);
+ break;
+ }
+
+ return long_opt_name;
+}
+
+void print_man_usage(struct command *cmd)
+{
+ struct cmd_name *cname;
+ int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
+ int i, sep, ro, rp, oo, op, opt_enum;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ printf("\\fB%s\\fP", cmd->name);
+
+ if (!onereq)
+ goto ro_normal;
+
+ /*
+ * one required option in a set, print as:
+ * ( -a|--a,
+ * -b|--b,
+ * --c,
+ * --d )
+ *
+ * First loop through ro prints those with short opts,
+ * and the second loop prints those without short opts.
+ */
+
+ if (cmd->ro_count) {
+ printf("\n");
+ printf(".RS 4\n");
+ printf("(");
+
+ sep = 0;
+
+ /* print required options with a short opt */
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ opt_enum = cmd->required_opt_args[ro].opt;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ if (opt_names[opt_enum].short_opt) {
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+ } else {
+ printf(" ");
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+ }
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_opt_args[ro].def, 1);
+ }
+
+ sep = 1;
+ }
+
+ /* print required options without a short opt */
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ opt_enum = cmd->required_opt_args[ro].opt;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ printf(" ");
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_opt_args[ro].def, 1);
+ }
+
+ sep = 1;
+ }
+
+ printf(" )\n");
+ printf(".RE\n");
+ }
+
+ /* print required position args on a new line after the onereq set */
+ if (cmd->rp_count) {
+ printf(".RS 4\n");
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_pos_args[rp].def, 1);
+ }
+ }
+
+ printf("\n");
+ printf(".RE\n");
+ } else {
+ /* printf("\n"); */
+ }
+
+ printf(".br\n");
+ goto oo_count;
+
+ ro_normal:
+
+ /*
+ * all are required options, print as:
+ * -a|--aaa <val> -b|--bbb <val>
+ */
+
+ if (cmd->ro_count) {
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ opt_enum = cmd->required_opt_args[ro].opt;
+
+ if (opt_names[opt_enum].short_opt) {
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+ } else {
+ printf(" \\fB%s\\fP", opt_names[cmd->required_opt_args[ro].opt].long_opt);
+ }
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_opt_args[ro].def, 1);
+ }
+ }
+ }
+
+ /* print required position args on the same line as the required options */
+ if (cmd->rp_count) {
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_pos_args[rp].def, 1);
+ }
+ }
+
+ printf("\n");
+ } else {
+ printf("\n");
+ }
+
+ printf(".br\n");
+
+ oo_count:
+ if (!cmd->oo_count)
+ goto op_count;
+
+ sep = 0;
+
+ if (cmd->oo_count) {
+ printf(".RS 4\n");
+ printf("[");
+
+ /* print optional options with short opts */
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ opt_enum = cmd->optional_opt_args[oo].opt;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ /*
+ * Skip common opts which are in the usage_common string.
+ * The common opts are those in lvm_all and in
+ * cname->common_options.
+ */
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if ((cname->variants > 1) && cname->common_options[opt_enum])
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ /* print optional options without short opts */
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ opt_enum = cmd->optional_opt_args[oo].opt;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ /*
+ * Skip common opts which are in the usage_common string.
+ * The common opts are those in lvm_all and in
+ * cname->common_options.
+ */
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if ((cname->variants > 1) && cname->common_options[opt_enum])
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ /* space alignment without short opt */
+ printf(" ");
+ }
+ printf(" COMMON_OPTIONS");
+ printf(" ]\n");
+ printf(".RE\n");
+ printf(".br\n");
+ }
+
+ op_count:
+ if (!cmd->op_count)
+ goto done;
+
+ printf(".RS 4\n");
+ printf("[");
+
+ if (cmd->op_count) {
+ for (op = 0; op < cmd->op_count; op++) {
+ if (cmd->optional_pos_args[op].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_pos_args[op].def, 1);
+ }
+ }
+ }
+
+ printf(" ]\n");
+ printf(".RE\n");
+
+ done:
+ printf("\n");
+}
+
+/*
+ * common options listed in the usage section.
+ *
+ * For commands with only one variant, this is only
+ * the options which are common to all lvm commands
+ * (in lvm_all, see is_lvm_all_opt).
+ *
+ * For commands with more than one variant, this
+ * is the set of options common to all variants
+ * (in cname->common_options), (which obviously
+ * includes the options common to all lvm commands.)
+ *
+ * List ordering:
+ * options with short+long names, alphabetically,
+ * then options with only long names, alphabetically
+ */
+
+void print_man_usage_common(struct command *cmd)
+{
+ struct cmd_name *cname;
+ int i, sep, ro, rp, oo, op, opt_enum;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ sep = 0;
+
+ printf(".RS 4\n");
+ printf("[");
+
+ /* print those with short opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (!cname->common_options[opt_enum])
+ continue;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ break;
+ }
+
+ }
+
+ /* print those without short opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (!cname->common_options[opt_enum])
+ continue;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ break;
+ }
+ }
+
+ printf(" ]\n");
+ return;
+}
+
+/*
+ * Format of description, when different command names have
+ * different descriptions:
+ *
+ * "#cmdname1"
+ * "text foo goes here"
+ * "a second line of text."
+ * "#cmdname2"
+ * "text bar goes here"
+ * "another line of text."
+ *
+ * When called for cmdname2, this function should just print:
+ *
+ * "text bar goes here"
+ * "another line of text."
+ */
+
+static void print_man_option_desc(struct cmd_name *cname, int opt_enum)
+{
+ const char *desc = opt_names[opt_enum].desc;
+ char buf[DESC_LINE];
+ int started_cname = 0;
+ int line_count = 0;
+ int di, bi = 0;
+
+ if (desc[0] != '#') {
+ printf("%s", desc);
+ return;
+ }
+
+ for (di = 0; di < strlen(desc); di++) {
+ buf[bi++] = desc[di];
+
+ if (bi == DESC_LINE) {
+ printf("print_man_option_desc line too long\n");
+ return;
+ }
+
+ if (buf[bi-1] != '\n')
+ continue;
+
+ if (buf[0] != '#') {
+ if (started_cname) {
+ printf("%s", buf);
+ line_count++;
+ }
+
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ continue;
+ }
+
+ /* Line starting with #cmdname */
+
+ /*
+ * Must be starting a new command name.
+ * If no lines have been printed, multiple command names
+ * are using the same text. If lines have been printed,
+ * then the start of a new command name means the end
+ * of text for the current command name.
+ */
+ if (line_count && started_cname)
+ return;
+
+ if (!strncmp(buf + 1, cname->name, strlen(cname->name))) {
+ /* The start of our command name. */
+ started_cname = 1;
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ } else {
+ /* The start of another command name. */
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ }
+ }
+
+ if (bi && started_cname)
+ printf("%s", buf);
+}
+
+/*
+ * Print a list of all options names for a given
+ * command name, listed by:
+ * options with short+long names, alphabetically,
+ * then options with only long names, alphabetically
+ */
+
+void print_man_all_options_list(struct cmd_name *cname)
+{
+ int opt_enum, val_enum;
+ int sep = 0;
+ int i;
+
+ /* print those with both short and long opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+
+ if (!cname->all_options[opt_enum])
+ continue;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep)
+ printf("\n.br\n");
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cname->name, opt_enum));
+
+ val_enum = opt_names[opt_enum].val_enum;
+
+ if (!val_names[val_enum].fn) {
+ /* takes no arg */
+ } else if (!val_names[val_enum].usage) {
+ printf(" ");
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ printf(" ");
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ sep = 1;
+ }
+
+ /* print those without short opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (!cname->all_options[opt_enum])
+ continue;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep)
+ printf("\n.br\n");
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
+
+ val_enum = opt_names[opt_enum].val_enum;
+
+ if (!val_names[val_enum].fn) {
+ /* takes no arg */
+ } else if (!val_names[val_enum].usage) {
+ printf(" ");
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ printf(" ");
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ sep = 1;
+ }
+}
+
+/*
+ * All options used for a given command name, along with descriptions.
+ * listed in order of:
+ * 1. options that are not common to all lvm commands, alphabetically
+ * 2. options common to all lvm commands, alphabetically
+ */
+
+void print_man_all_options_desc(struct cmd_name *cname)
+{
+ int opt_enum, val_enum;
+ int print_common = 0;
+ int sep = 0;
+ int i;
+
+ again:
+ /*
+ * Loop 1: print options that are not common to all lvm commands.
+ * Loop 2: print options common to all lvm commands (lvm_all)
+ */
+
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (!cname->all_options[opt_enum])
+ continue;
+
+ if (!print_common && is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (print_common && !is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (sep)
+ printf("\n.br\n");
+
+ printf("\n.TP\n");
+
+ if (opt_names[opt_enum].short_opt) {
+ printf("\\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cname->name, opt_enum));
+ } else {
+ printf("\\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
+ }
+
+ val_enum = opt_names[opt_enum].val_enum;
+
+ if (!val_names[val_enum].fn) {
+ /* takes no arg */
+ } else if (!val_names[val_enum].usage) {
+ printf(" ");
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ printf(" ");
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ if (opt_names[opt_enum].desc) {
+ printf("\n");
+ printf(".br\n");
+ print_man_option_desc(cname, opt_enum);
+ }
+
+ sep = 1;
+ }
+
+ if (!print_common) {
+ print_common = 1;
+ goto again;
+ }
+}
+
+void print_desc_man(const char *desc)
+{
+ char buf[DESC_LINE] = {0};
+ int di = 0;
+ int bi = 0;
+
+ for (di = 0; di < strlen(desc); di++) {
+ if (desc[di] == '\0')
+ break;
+ if (desc[di] == '\n')
+ continue;
+
+ if (!strncmp(&desc[di], "DESC:", 5)) {
+ if (bi) {
+ printf("%s\n", buf);
+ printf(".br\n");
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ }
+ di += 5;
+ continue;
+ }
+
+ if (!bi && desc[di] == ' ')
+ continue;
+
+ buf[bi++] = desc[di];
+
+ if (bi == (DESC_LINE - 1))
+ break;
+ }
+
+ if (bi) {
+ printf("%s\n", buf);
+ printf(".br\n");
+ }
+}
+
+static char *upper_command_name(char *str)
+{
+ static char str_upper[32];
+ int i = 0;
+
+ while (*str) {
+ str_upper[i++] = toupper(*str);
+ str++;
+ }
+ str_upper[i] = '\0';
+ return str_upper;
+}
+
+void print_man(char *man_command_name, int include_primary, int include_secondary)
+{
+ struct cmd_name *cname;
+ struct command *cmd, *prev_cmd = NULL;
+ const char *desc;
+ int i, j, ro, rp, oo, op;
+
+ printf(".TH %s 8 \"LVM TOOLS #VERSION#\" \"Sistina Software UK\"\n",
+ man_command_name ? upper_command_name(man_command_name) : "LVM_COMMANDS");
+
+ for (i = 0; i < cmd_count; i++) {
+
+ cmd = &cmd_array[i];
+
+ if (prev_cmd && strcmp(prev_cmd->name, cmd->name)) {
+ printf("Common options:\n");
+ printf(".\n");
+ print_man_usage_common(prev_cmd);
+
+ printf("\n");
+ printf(".SH OPTIONS\n");
+ printf(".br\n");
+ print_man_all_options_desc(cname);
+
+ prev_cmd = NULL;
+ }
+
+ if ((cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_secondary)
+ continue;
+
+ if (!(cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_primary)
+ continue;
+
+ if (man_command_name && strcmp(man_command_name, cmd->name))
+ continue;
+
+ if (!prev_cmd || strcmp(prev_cmd->name, cmd->name)) {
+ printf(".SH NAME\n");
+ printf(".\n");
+ if ((desc = cmd_name_desc(cmd->name)))
+ printf("%s \\- %s\n", cmd->name, desc);
+ else
+ printf("%s\n", cmd->name);
+ printf(".br\n");
+ printf(".P\n");
+ printf(".\n");
+ printf(".SH SYNOPSIS\n");
+ printf(".br\n");
+ printf(".P\n");
+ printf(".\n");
+ prev_cmd = cmd;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ if (cname->variant_has_ro && cname->variant_has_rp)
+ printf("\\fB%s\\fP \\fIrequired_option_args\\fP \\fIrequired_position_args\\fP\n", cmd->name);
+ else if (cname->variant_has_ro && !cname->variant_has_rp)
+ printf("\\fB%s\\fP \\fIrequired_option_args\\fP\n", cmd->name);
+ else if (!cname->variant_has_ro && cname->variant_has_rp)
+ printf("\\fB%s\\fP \\fIrequired_position_args\\fP\n", cmd->name);
+ else if (!cname->variant_has_ro && !cname->variant_has_rp)
+ printf("\\fB%s\\fP\n", cmd->name);
+
+ printf(".br\n");
+
+ if (cname->variant_has_oo) {
+ printf(" [ \\fIoptional_option_args\\fP ]\n");
+ printf(".br\n");
+ }
+
+ if (cname->variant_has_op) {
+ printf(" [ \\fIoptional_position_args\\fP ]\n");
+ printf(".br\n");
+ }
+
+ printf(".P\n");
+ printf("\n");
+
+ /* listing them all when there's only 1 or 2 is just repetative */
+ if (cname->variants > 2) {
+ printf(".P\n");
+ print_man_all_options_list(cname);
+ printf("\n");
+ printf(".P\n");
+ printf("\n");
+ }
+
+ printf(".SH USAGE\n");
+ printf(".br\n");
+ printf(".P\n");
+ printf(".\n");
+ }
+
+ if (cmd->desc) {
+ print_desc_man(cmd->desc);
+ printf(".P\n");
+ }
+
+ print_man_usage(cmd);
+
+ if (i == (cmd_count - 1)) {
+ printf("Common options:\n");
+ printf(".\n");
+ print_man_usage_common(cmd);
+
+ printf("\n");
+ printf(".SH OPTIONS\n");
+ printf(".br\n");
+ print_man_all_options_desc(cname);
+
+ }
+
+ printf("\n");
+ continue;
+ }
+}
+
diff --git a/tools/ccmd-util.c b/tools/ccmd-util.c
new file mode 100644
index 0000000..15b2f96
--- /dev/null
+++ b/tools/ccmd-util.c
@@ -0,0 +1,936 @@
+#include <asm/types.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <sched.h>
+#include <dirent.h>
+#include <ctype.h>
+
+#include "ccmd.h"
+
+struct cmd_name *find_command_name(const char *str);
+int is_lvm_all_opt(int opt);
+
+extern struct val_name val_names[VAL_COUNT + 1];
+extern struct opt_name opt_names[ARG_COUNT + 1];
+extern struct lvp_name lvp_names[LVP_COUNT + 1];
+extern struct lvt_name lvt_names[LVT_COUNT + 1];
+extern struct cmd_name cmd_names[MAX_CMD_NAMES];
+extern struct command lvm_all;
+
+/*
+ * modifies buf, replacing the sep characters with \0
+ * argv pointers point to positions in buf
+ */
+
+char *split_line(char *buf, int *argc, char **argv, char sep)
+{
+ char *p = buf, *rp = NULL;
+ int i;
+
+ argv[0] = p;
+
+ for (i = 1; i < MAX_LINE_ARGC; i++) {
+ p = strchr(buf, sep);
+ if (!p)
+ break;
+ *p = '\0';
+
+ argv[i] = p + 1;
+ buf = p + 1;
+ }
+ *argc = i;
+
+ /* we ended by hitting \0, return the point following that */
+ if (!rp)
+ rp = strchr(buf, '\0') + 1;
+
+ return rp;
+}
+
+/* convert value string, e.g. Number, to foo_VAL enum */
+
+int val_str_to_num(char *str)
+{
+ char name[32] = { 0 };
+ char *new;
+ int i;
+
+ /* compare the name before any suffix like _new or _<lvtype> */
+
+ strncpy(name, str, 31);
+ if ((new = strstr(name, "_")))
+ *new = '\0';
+
+ for (i = 0; i < VAL_COUNT; i++) {
+ if (!val_names[i].name)
+ break;
+ if (!strncmp(name, val_names[i].name, strlen(val_names[i].name)))
+ return val_names[i].val_enum;
+ }
+
+ return 0;
+}
+
+/* convert "--option" to foo_ARG enum */
+
+int opt_str_to_num(char *str)
+{
+ char long_name[32];
+ char *p;
+ int i;
+
+ /*
+ * --foo_long means there are two args entries
+ * for --foo, one with a short option and one
+ * without, and we want the one without the
+ * short option.
+ */
+ if (strstr(str, "_long")) {
+ strcpy(long_name, str);
+ p = strstr(long_name, "_long");
+ *p = '\0';
+
+ for (i = 0; i < ARG_COUNT; i++) {
+ if (!opt_names[i].long_opt)
+ continue;
+ /* skip anything with a short opt */
+ if (opt_names[i].short_opt)
+ continue;
+ if (!strcmp(opt_names[i].long_opt, long_name))
+ return opt_names[i].opt_enum;
+ }
+
+ printf("Unknown opt str: %s %s\n", str, long_name);
+ exit(1);
+ }
+
+ for (i = 0; i < ARG_COUNT; i++) {
+ if (!opt_names[i].long_opt)
+ continue;
+ /* These are only selected using --foo_long */
+ if (strstr(opt_names[i].name, "_long_ARG"))
+ continue;
+ if (!strcmp(opt_names[i].long_opt, str))
+ return opt_names[i].opt_enum;
+ }
+
+ printf("Unknown opt str: \"%s\"\n", str);
+ exit(1);
+}
+
+/* "lv_is_prop" to is_prop_LVP */
+
+int lvp_name_to_enum(char *str)
+{
+ int i;
+
+ for (i = 1; i < LVP_COUNT; i++) {
+ if (!strcmp(str, lvp_names[i].name))
+ return lvp_names[i].lvp_enum;
+ }
+ printf("unknown lv property %s\n", str);
+ exit(1);
+}
+
+/* type_LVT to "type" */
+
+const char *lvt_enum_to_name(int lvt_enum)
+{
+ return lvt_names[lvt_enum].name;
+}
+
+/* "type" to type_LVT */
+
+static int lvt_name_to_enum(char *str)
+{
+ int i;
+
+ for (i = 1; i < LVT_COUNT; i++) {
+ if (!strcmp(str, lvt_names[i].name))
+ return lvt_names[i].lvt_enum;
+ }
+ printf("unknown lv type %s\n", str);
+ exit(1);
+}
+
+/* LV_<type> to <type>_LVT */
+
+int lv_to_enum(char *name)
+{
+ return lvt_name_to_enum(name + 3);
+}
+
+/*
+ * LV_<type1>_<type2> to lvt_bits
+ *
+ * type1 to lvt_enum
+ * lvt_bits |= lvt_enum_to_bit(lvt_enum)
+ * type2 to lvt_enum
+ * lvt_bits |= lvt_enum_to_bit(lvt_enum)
+ */
+
+uint64_t lv_to_bits(char *name)
+{
+ char buf[64];
+ char *argv[MAX_LINE_ARGC];
+ uint64_t lvt_bits = 0;
+ int lvt_enum;
+ int argc;
+ int i;
+
+ strcpy(buf, name);
+
+ split_line(buf, &argc, argv, '_');
+
+ /* 0 is "LV" */
+ for (i = 1; i < argc; i++) {
+ if (!strcmp(argv[i], "new"))
+ continue;
+ lvt_enum = lvt_name_to_enum(argv[i]);
+ lvt_bits |= lvt_enum_to_bit(lvt_enum);
+ }
+
+ return lvt_bits;
+}
+
+/* output for struct/count */
+
+static char *val_bits_to_str(uint64_t val_bits)
+{
+ static char buf[1024];
+ int i;
+ int or = 0;
+
+ memset(buf, 0, sizeof(buf));
+
+ for (i = 0; i < VAL_COUNT; i++) {
+ if (val_bits & val_enum_to_bit(i)) {
+ if (or) strcat(buf, " | ");
+ strcat(buf, "val_enum_to_bit(");
+ strcat(buf, val_names[i].enum_name);
+ strcat(buf, ")");
+ or = 1;
+ }
+ }
+
+ return buf;
+}
+
+/*
+ * When bits for foo_LVP and bar_LVP are both set in bits, print:
+ * lvp_enum_to_bit(foo_LVP) | lvp_enum_to_bit(bar_LVP)
+ */
+
+static char *lvp_bits_to_str(uint64_t bits)
+{
+ static char lvp_buf[1024];
+ int i;
+ int or = 0;
+
+ memset(lvp_buf, 0, sizeof(lvp_buf));
+
+ for (i = 0; i < LVP_COUNT; i++) {
+ if (bits & lvp_enum_to_bit(i)) {
+ if (or) strcat(lvp_buf, " | ");
+ strcat(lvp_buf, "lvp_enum_to_bit(");
+ strcat(lvp_buf, lvp_names[i].enum_name);
+ strcat(lvp_buf, ")");
+ or = 1;
+ }
+ }
+
+ return lvp_buf;
+}
+
+/*
+ * When bits for foo_LVT and bar_LVT are both set in bits, print:
+ * lvt_enum_to_bit(foo_LVT) | lvt_enum_to_bit(bar_LVT)
+ */
+
+static char *lvt_bits_to_str(uint64_t bits)
+{
+ static char lvt_buf[1024];
+ int i;
+ int or = 0;
+
+ memset(lvt_buf, 0, sizeof(lvt_buf));
+
+ for (i = 1; i < LVT_COUNT; i++) {
+ if (bits & lvt_enum_to_bit(i)) {
+ if (or) strcat(lvt_buf, " | ");
+ strcat(lvt_buf, "lvt_enum_to_bit(");
+ strcat(lvt_buf, lvt_names[i].enum_name);
+ strcat(lvt_buf, ")");
+ or = 1;
+ }
+ }
+
+ return lvt_buf;
+}
+
+static void print_def(struct arg_def *def, int usage)
+{
+ int val_enum;
+ int lvt_enum;
+ int sep = 0;
+ int i;
+
+ for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
+ if (def->val_bits & val_enum_to_bit(val_enum)) {
+
+ if (val_enum == conststr_VAL)
+ printf("%s", def->str);
+
+ else if (val_enum == constnum_VAL)
+ printf("%llu", (unsigned long long)def->num);
+
+ else {
+ if (sep) printf("|");
+
+ if (!usage || !val_names[val_enum].usage)
+ printf("%s", val_names[val_enum].name);
+ else
+ printf("%s", val_names[val_enum].usage);
+
+ sep = 1;
+ }
+
+ if (val_enum == lv_VAL && def->lvt_bits) {
+ for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
+ if (lvt_bit_is_set(def->lvt_bits, lvt_enum))
+ printf("_%s", lvt_enum_to_name(lvt_enum));
+ }
+ }
+
+ if ((val_enum == vg_VAL) && (def->flags & ARG_DEF_FLAG_NEW_VG))
+ printf("_new");
+ if ((val_enum == lv_VAL) && (def->flags & ARG_DEF_FLAG_NEW_LV))
+ printf("_new");
+ }
+ }
+
+ if (def->flags & ARG_DEF_FLAG_MAY_REPEAT)
+ printf(" ...");
+}
+
+static int opt_arg_matches(struct opt_arg *oa1, struct opt_arg *oa2)
+{
+ if (oa1->opt != oa2->opt)
+ return 0;
+
+ /* FIXME: some cases may need more specific val_bits checks */
+ if (oa1->def.val_bits != oa2->def.val_bits)
+ return 0;
+
+ if (oa1->def.str && oa2->def.str && strcmp(oa1->def.str, oa2->def.str))
+ return 0;
+
+ if (oa1->def.num != oa2->def.num)
+ return 0;
+
+ /*
+ * Do NOT compare lv_types because we are checking if two
+ * command lines are ambiguous before the LV type is known.
+ */
+
+ return 1;
+}
+
+static int pos_arg_matches(struct pos_arg *pa1, struct pos_arg *pa2)
+{
+ if (pa1->pos != pa2->pos)
+ return 0;
+
+ /* FIXME: some cases may need more specific val_bits checks */
+ if (pa1->def.val_bits != pa2->def.val_bits)
+ return 0;
+
+ if (pa1->def.str && pa2->def.str && strcmp(pa1->def.str, pa2->def.str))
+ return 0;
+
+ if (pa1->def.num != pa2->def.num)
+ return 0;
+
+ /*
+ * Do NOT compare lv_types because we are checking if two
+ * command lines are ambiguous before the LV type is known.
+ */
+
+ return 1;
+}
+
+static const char *opt_to_enum_str(int opt)
+{
+ return opt_names[opt].name;
+}
+
+static char *flags_to_str(int flags)
+{
+ static char buf_flags[32];
+
+ memset(buf_flags, 0, sizeof(buf_flags));
+
+ if (flags & ARG_DEF_FLAG_MAY_REPEAT) {
+ if (buf_flags[0])
+ strcat(buf_flags, " | ");
+ strcat(buf_flags, "ARG_DEF_FLAG_MAY_REPEAT");
+ }
+ if (flags & ARG_DEF_FLAG_NEW_VG) {
+ if (buf_flags[0])
+ strcat(buf_flags, " | ");
+ strcat(buf_flags, "ARG_DEF_FLAG_NEW_VG");
+ }
+ if (flags & ARG_DEF_FLAG_NEW_LV) {
+ if (buf_flags[0])
+ strcat(buf_flags, " | ");
+ strcat(buf_flags, "ARG_DEF_FLAG_NEW_LV");
+ }
+
+ return buf_flags;
+}
+
+static char *rule_to_define_str(int rule_type)
+{
+ switch (rule_type) {
+ case RULE_INVALID:
+ return "RULE_INVALID";
+ case RULE_REQUIRE:
+ return "RULE_REQUIRE";
+ }
+}
+
+static char *cmd_flags_to_str(uint32_t flags)
+{
+ static char buf_cmd_flags[32];
+
+ memset(buf_cmd_flags, 0, sizeof(buf_cmd_flags));
+
+ if (flags & CMD_FLAG_SECONDARY_SYNTAX) {
+ if (buf_cmd_flags[0])
+ strcat(buf_cmd_flags, " | ");
+ strcat(buf_cmd_flags, "CMD_FLAG_SECONDARY_SYNTAX");
+ }
+ if (flags & CMD_FLAG_ONE_REQUIRED_OPT) {
+ if (buf_cmd_flags[0])
+ strcat(buf_cmd_flags, " | ");
+ strcat(buf_cmd_flags, "CMD_FLAG_ONE_REQUIRED_OPT");
+ }
+
+ return buf_cmd_flags;
+}
+
+static void print_usage_common(struct command *cmd)
+{
+ struct cmd_name *cname;
+ int i, sep, ro, rp, oo, op, opt_enum;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ sep = 0;
+
+ /*
+ * when there's more than one variant, options that
+ * are common to all commands with a common name.
+ */
+
+ if (cname->variants < 2)
+ goto all;
+
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ if (!cname->common_options[opt_enum])
+ continue;
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (!sep) {
+ printf("\n");
+ printf("\" [");
+ } else {
+ printf(",");
+ }
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ printf(" %s", opt_names[opt_enum].long_opt);
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ break;
+ }
+ }
+
+ all:
+ /* options that are common to all lvm commands */
+
+ for (oo = 0; oo < lvm_all.oo_count; oo++) {
+ opt_enum = lvm_all.optional_opt_args[oo].opt;
+
+ if (!sep) {
+ printf("\n");
+ printf("\" [");
+ } else {
+ printf(",");
+ }
+
+ printf(" %s", opt_names[opt_enum].long_opt);
+ if (lvm_all.optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def(&lvm_all.optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ printf(" ]\"");
+ printf(";\n");
+}
+
+static void print_usage(struct command *cmd)
+{
+ struct cmd_name *cname;
+ int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
+ int i, sep, ro, rp, oo, op, opt_enum;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ printf("\"%s", cmd->name);
+
+ if (cmd->ro_count) {
+ if (onereq)
+ printf(" (");
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ if (ro && onereq)
+ printf(",");
+ printf(" %s", opt_names[cmd->required_opt_args[ro].opt].long_opt);
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->required_opt_args[ro].def, 1);
+ }
+ }
+ if (onereq)
+ printf(" )");
+ }
+
+ if (cmd->rp_count) {
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->required_pos_args[rp].def, 1);
+ }
+ }
+ }
+
+ printf("\"");
+
+ oo_count:
+ if (!cmd->oo_count)
+ goto op_count;
+
+ sep = 0;
+
+ if (cmd->oo_count) {
+ printf("\n");
+ printf("\" [");
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ opt_enum = cmd->optional_opt_args[oo].opt;
+
+ /*
+ * Skip common opts which are in the usage_common string.
+ * The common opts are those in lvm_all and in
+ * cname->common_options.
+ */
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if ((cname->variants > 1) && cname->common_options[opt_enum])
+ continue;
+
+ if (sep)
+ printf(",");
+
+ printf(" %s", opt_names[opt_enum].long_opt);
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ if (sep)
+ printf(",");
+ printf(" COMMON_OPTIONS");
+ printf(" ]\"");
+ }
+
+ op_count:
+ if (!cmd->op_count)
+ goto done;
+
+ printf("\n");
+ printf("\" [");
+
+ if (cmd->op_count) {
+ for (op = 0; op < cmd->op_count; op++) {
+ if (cmd->optional_pos_args[op].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->optional_pos_args[op].def, 1);
+ }
+ }
+ }
+
+ printf(" ]\"");
+
+ done:
+ printf(";\n");
+}
+
+void print_header_struct(void)
+{
+ struct command *cmd;
+ int i, j, ro, rp, oo, op, ru, ruo, io;
+
+ printf("/* Do not edit. This file is generated by tools/create-commands */\n");
+ printf("/* using command definitions from tools/command-lines.in */\n");
+ printf("\n");
+
+ for (i = 0; i < cmd_count; i++) {
+ cmd = &cmd_array[i];
+
+ printf("commands[%d].name = \"%s\";\n", i, cmd->name);
+ printf("commands[%d].command_line_id = \"%s\";\n", i, cmd->command_line_id);
+ printf("commands[%d].command_line_enum = %s_CMD;\n", i, cmd->command_line_id);
+ printf("commands[%d].fn = %s;\n", i, cmd->name);
+ printf("commands[%d].ro_count = %d;\n", i, cmd->ro_count);
+ printf("commands[%d].rp_count = %d;\n", i, cmd->rp_count);
+ printf("commands[%d].oo_count = %d;\n", i, cmd->oo_count);
+ printf("commands[%d].op_count = %d;\n", i, cmd->op_count);
+ printf("commands[%d].io_count = %d;\n", i, cmd->io_count);
+ printf("commands[%d].rule_count = %d;\n", i, cmd->rule_count);
+
+ if (cmd->cmd_flags)
+ printf("commands[%d].cmd_flags = %s;\n", i, cmd_flags_to_str(cmd->cmd_flags));
+ else
+ printf("commands[%d].cmd_flags = 0;\n", i, cmd_flags_to_str(cmd->cmd_flags));
+
+ printf("commands[%d].desc = \"%s\";\n", i, cmd->desc ?: "");
+ printf("commands[%d].usage = ", i);
+ print_usage(cmd);
+
+ if (cmd->oo_count) {
+ printf("commands[%d].usage_common = ", i);
+ print_usage_common(cmd);
+ } else {
+ printf("commands[%d].usage_common = \"NULL\";\n", i);
+ }
+
+ if (cmd->ro_count) {
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ printf("commands[%d].required_opt_args[%d].opt = %s;\n",
+ i, ro, opt_to_enum_str(cmd->required_opt_args[ro].opt));
+
+ if (!cmd->required_opt_args[ro].def.val_bits)
+ continue;
+
+ printf("commands[%d].required_opt_args[%d].def.val_bits = %s;\n",
+ i, ro, val_bits_to_str(cmd->required_opt_args[ro].def.val_bits));
+
+ if (cmd->required_opt_args[ro].def.lvt_bits)
+ printf("commands[%d].required_opt_args[%d].def.lvt_bits = %s;\n",
+ i, ro, lvt_bits_to_str(cmd->required_opt_args[ro].def.lvt_bits));
+
+ if (cmd->required_opt_args[ro].def.flags)
+ printf("commands[%d].required_opt_args[%d].def.flags = %s;\n",
+ i, ro, flags_to_str(cmd->required_opt_args[ro].def.flags));
+
+ if (val_bit_is_set(cmd->required_opt_args[ro].def.val_bits, constnum_VAL))
+ printf("commands[%d].required_opt_args[%d].def.num = %d;\n",
+ i, ro, cmd->required_opt_args[ro].def.num);
+
+ if (val_bit_is_set(cmd->required_opt_args[ro].def.val_bits, conststr_VAL))
+ printf("commands[%d].required_opt_args[%d].def.str = \"%s\";\n",
+ i, ro, cmd->required_opt_args[ro].def.str ?: "NULL");
+ }
+ }
+
+ if (cmd->rp_count) {
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ printf("commands[%d].required_pos_args[%d].pos = %d;\n",
+ i, rp, cmd->required_pos_args[rp].pos);
+
+ if (!cmd->required_pos_args[rp].def.val_bits)
+ continue;
+
+ printf("commands[%d].required_pos_args[%d].def.val_bits = %s;\n",
+ i, rp, val_bits_to_str(cmd->required_pos_args[rp].def.val_bits));
+
+ if (cmd->required_pos_args[rp].def.lvt_bits)
+ printf("commands[%d].required_pos_args[%d].def.lvt_bits = %s;\n",
+ i, rp, lvt_bits_to_str(cmd->required_pos_args[rp].def.lvt_bits));
+
+ if (cmd->required_pos_args[rp].def.flags)
+ printf("commands[%d].required_pos_args[%d].def.flags = %s;\n",
+ i, rp, flags_to_str(cmd->required_pos_args[rp].def.flags));
+
+ if (val_bit_is_set(cmd->required_pos_args[rp].def.val_bits, constnum_VAL))
+ printf("commands[%d].required_pos_args[%d].def.num = %d;\n",
+ i, rp, cmd->required_pos_args[rp].def.num);
+
+ if (val_bit_is_set(cmd->required_pos_args[rp].def.val_bits, conststr_VAL))
+ printf("commands[%d].required_pos_args[%d].def.str = \"%s\";\n",
+ i, rp, cmd->required_pos_args[rp].def.str ?: "NULL");
+ }
+ }
+
+ if (cmd->oo_count) {
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ printf("commands[%d].optional_opt_args[%d].opt = %s;\n",
+ i, oo, opt_to_enum_str(cmd->optional_opt_args[oo].opt));
+
+ if (!cmd->optional_opt_args[oo].def.val_bits)
+ continue;
+
+ printf("commands[%d].optional_opt_args[%d].def.val_bits = %s;\n",
+ i, oo, val_bits_to_str(cmd->optional_opt_args[oo].def.val_bits));
+
+ if (cmd->optional_opt_args[oo].def.lvt_bits)
+ printf("commands[%d].optional_opt_args[%d].def.lvt_bits = %s;\n",
+ i, oo, lvt_bits_to_str(cmd->optional_opt_args[oo].def.lvt_bits));
+
+ if (cmd->optional_opt_args[oo].def.flags)
+ printf("commands[%d].optional_opt_args[%d].def.flags = %s;\n",
+ i, oo, flags_to_str(cmd->optional_opt_args[oo].def.flags));
+
+ if (val_bit_is_set(cmd->optional_opt_args[oo].def.val_bits, constnum_VAL))
+ printf("commands[%d].optional_opt_args[%d].def.num = %d;\n",
+ i, oo, cmd->optional_opt_args[oo].def.num);
+
+ if (val_bit_is_set(cmd->optional_opt_args[oo].def.val_bits, conststr_VAL))
+ printf("commands[%d].optional_opt_args[%d].def.str = \"%s\";\n",
+ i, oo, cmd->optional_opt_args[oo].def.str ?: "NULL");
+ }
+ }
+
+ if (cmd->io_count) {
+ for (io = 0; io < cmd->io_count; io++) {
+ printf("commands[%d].ignore_opt_args[%d].opt = %s;\n",
+ i, io, opt_to_enum_str(cmd->ignore_opt_args[io].opt));
+
+ if (!cmd->ignore_opt_args[io].def.val_bits)
+ continue;
+
+ printf("commands[%d].ignore_opt_args[%d].def.val_bits = %s;\n",
+ i, io, val_bits_to_str(cmd->ignore_opt_args[io].def.val_bits));
+
+ if (cmd->ignore_opt_args[io].def.lvt_bits)
+ printf("commands[%d].ignore_opt_args[%d].def.lvt_bits = %s;\n",
+ i, io, lvt_bits_to_str(cmd->ignore_opt_args[io].def.lvt_bits));
+
+ if (cmd->ignore_opt_args[io].def.flags)
+ printf("commands[%d].ignore_opt_args[%d].def.flags = %s;\n",
+ i, io, flags_to_str(cmd->ignore_opt_args[io].def.flags));
+
+ if (val_bit_is_set(cmd->ignore_opt_args[io].def.val_bits, constnum_VAL))
+ printf("commands[%d].ignore_opt_args[%d].def.num = %d;\n",
+ i, io, cmd->ignore_opt_args[io].def.num);
+
+ if (val_bit_is_set(cmd->ignore_opt_args[io].def.val_bits, conststr_VAL))
+ printf("commands[%d].ignore_opt_args[%d].def.str = \"%s\";\n",
+ i, io, cmd->ignore_opt_args[io].def.str ?: "NULL");
+ }
+ }
+
+ if (cmd->op_count) {
+ for (op = 0; op < cmd->op_count; op++) {
+ printf("commands[%d].optional_pos_args[%d].pos = %d;\n",
+ i, op, cmd->optional_pos_args[op].pos);
+
+ if (!cmd->optional_pos_args[op].def.val_bits)
+ continue;
+
+ printf("commands[%d].optional_pos_args[%d].def.val_bits = %s;\n",
+ i, op, val_bits_to_str(cmd->optional_pos_args[op].def.val_bits));
+
+ if (cmd->optional_pos_args[op].def.lvt_bits)
+ printf("commands[%d].optional_pos_args[%d].def.lvt_bits = %s;\n",
+ i, op, lvt_bits_to_str(cmd->optional_pos_args[op].def.lvt_bits));
+
+ if (cmd->optional_pos_args[op].def.flags)
+ printf("commands[%d].optional_pos_args[%d].def.flags = %s;\n",
+ i, op, flags_to_str(cmd->optional_pos_args[op].def.flags));
+
+ if (val_bit_is_set(cmd->optional_pos_args[op].def.val_bits, constnum_VAL))
+ printf("commands[%d].optional_pos_args[%d].def.num = %d;\n",
+ i, op, cmd->optional_pos_args[op].def.num);
+
+ if (val_bit_is_set(cmd->optional_pos_args[op].def.val_bits, conststr_VAL))
+ printf("commands[%d].optional_pos_args[%d].def.str = \"%s\";\n",
+ i, op, cmd->optional_pos_args[op].def.str ?: "NULL");
+ }
+ }
+
+ if (cmd->rule_count) {
+ for (ru = 0; ru < cmd->rule_count; ru++) {
+
+ printf("commands[%d].rules[%d].opts_count = %d;\n", i, ru, cmd->rules[ru].opts_count);
+
+ if (cmd->rules[ru].opts_count) {
+ printf("static int _command%d_rule%d_opts[] = { ", i, ru);
+ for (ruo = 0; ruo < cmd->rules[ru].opts_count; ruo++) {
+ if (ruo)
+ printf(", ");
+ printf("%s", opt_to_enum_str(cmd->rules[ru].opts[ruo]));
+ }
+ printf(" };\n");
+ printf("commands[%d].rules[%d].opts = _command%d_rule%d_opts;\n", i, ru, i, ru);
+ } else {
+ printf("commands[%d].rules[%d].opts = NULL;\n", i, ru);
+ }
+
+ printf("commands[%d].rules[%d].check_opts_count = %d;\n", i, ru, cmd->rules[ru].check_opts_count);
+
+ if (cmd->rules[ru].check_opts_count) {
+ printf("static int _command%d_rule%d_check_opts[] = { ", i, ru);
+ for (ruo = 0; ruo < cmd->rules[ru].check_opts_count; ruo++) {
+ if (ruo)
+ printf(",");
+ printf("%s ", opt_to_enum_str(cmd->rules[ru].check_opts[ruo]));
+ }
+ printf(" };\n");
+ printf("commands[%d].rules[%d].check_opts = _command%d_rule%d_check_opts;\n", i, ru, i, ru);
+ } else {
+ printf("commands[%d].rules[%d].check_opts = NULL;\n", i, ru);
+ }
+
+ printf("commands[%d].rules[%d].lvt_bits = %s;\n", i, ru,
+ cmd->rules[ru].lvt_bits ? lvt_bits_to_str(cmd->rules[ru].lvt_bits) : "0");
+
+ printf("commands[%d].rules[%d].lvp_bits = %s;\n", i, ru,
+ cmd->rules[ru].lvp_bits ? lvp_bits_to_str(cmd->rules[ru].lvp_bits) : "0");
+
+ printf("commands[%d].rules[%d].rule = %s;\n", i, ru,
+ rule_to_define_str(cmd->rules[ru].rule));
+
+ printf("commands[%d].rules[%d].check_lvt_bits = %s;\n", i, ru,
+ cmd->rules[ru].check_lvt_bits ? lvt_bits_to_str(cmd->rules[ru].check_lvt_bits) : "0");
+
+ printf("commands[%d].rules[%d].check_lvp_bits = %s;\n", i, ru,
+ cmd->rules[ru].check_lvp_bits ? lvp_bits_to_str(cmd->rules[ru].check_lvp_bits) : "0");
+ }
+ }
+
+ printf("\n");
+ }
+}
+
+void print_header_count(void)
+{
+ struct command *cmd;
+ int i, j;
+
+ printf("/* Do not edit. This file is generated by tools/create-commands */\n");
+ printf("/* using command definitions from tools/command-lines.in */\n");
+ printf("#define COMMAND_COUNT %d\n", cmd_count);
+
+ printf("enum {\n");
+ printf("\tno_CMD,\n"); /* enum value 0 is not used */
+
+ for (i = 0; i < cmd_count; i++) {
+ cmd = &cmd_array[i];
+
+ if (!cmd->command_line_id) {
+ printf("Missing ID: at %d\n", i);
+ exit(1);
+ }
+
+ for (j = 0; j < i; j++) {
+ if (!strcmp(cmd->command_line_id, cmd_array[j].command_line_id))
+ goto next;
+ }
+
+ printf("\t%s_CMD,\n", cmd->command_line_id);
+ next:
+ ;
+ }
+ printf("\tCOMMAND_ID_COUNT,\n");
+ printf("};\n");
+}
+
+struct cmd_pair {
+ int i, j;
+};
+
+void print_ambiguous(void)
+{
+ struct command *cmd, *dup;
+ struct cmd_pair dups[64] = { 0 };
+ int found = 0;
+ int i, j, f, ro, rp;
+
+ for (i = 0; i < cmd_count; i++) {
+ cmd = &cmd_array[i];
+
+ for (j = 0; j < cmd_count; j++) {
+ dup = &cmd_array[j];
+
+ if (i == j)
+ continue;
+ if (strcmp(cmd->name, dup->name))
+ continue;
+ if (cmd->ro_count != dup->ro_count)
+ continue;
+ if (cmd->rp_count != dup->rp_count)
+ continue;
+
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ if (!opt_arg_matches(&cmd->required_opt_args[ro],
+ &dup->required_opt_args[ro]))
+ goto next;
+ }
+
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (!pos_arg_matches(&cmd->required_pos_args[rp],
+ &dup->required_pos_args[rp]))
+ goto next;
+ }
+
+ for (f = 0; f < found; f++) {
+ if ((dups[f].i == j) && (dups[f].j == i))
+ goto next;
+ }
+
+ printf("Ambiguous commands %d and %d:\n", i, j);
+ print_usage(cmd);
+ print_usage(dup);
+ printf("\n");
+
+ dups[found].i = i;
+ dups[found].j = j;
+ found++;
+next:
+ ;
+ }
+ }
+}
+
diff --git a/tools/ccmd.h b/tools/ccmd.h
new file mode 100644
index 0000000..1e18125
--- /dev/null
+++ b/tools/ccmd.h
@@ -0,0 +1,144 @@
+
+#ifndef __CCMD_H__
+#define __CCMD_H__
+
+/* needed to include args.h */
+#define ARG_COUNTABLE 0x00000001
+#define ARG_GROUPABLE 0x00000002
+struct cmd_context;
+struct arg_values;
+
+/* needed to include args.h */
+static inline int yes_no_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int activation_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int cachemode_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int discards_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int mirrorlog_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int size_kb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int size_mb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int size_mb_arg_with_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int int_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int uint32_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int int_arg_with_sign(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int int_arg_with_sign_and_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int major_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int minor_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int string_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int tag_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int permission_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int metadatatype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int units_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int segtype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int alloc_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int locktype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int readahead_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+static inline int vgmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int pvmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int metadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int polloperation_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int writemostly_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int syncaction_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int reportformat_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int configreport_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+static inline int configtype_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+
+/* also see arg_props in tools.h and args.h */
+struct opt_name {
+ const char *name; /* "foo_ARG" */
+ int opt_enum; /* foo_ARG */
+ const char short_opt; /* -f */
+ char _padding[7];
+ const char *long_opt; /* --foo */
+ int val_enum; /* xyz_VAL when --foo takes a val like "--foo xyz" */
+ uint32_t unused1;
+ uint32_t unused2;
+ const char *desc;
+};
+
+/* also see val_props in tools.h and vals.h */
+struct val_name {
+ const char *enum_name; /* "foo_VAL" */
+ int val_enum; /* foo_VAL */
+ int (*fn) (struct cmd_context *cmd, struct arg_values *av); /* foo_arg() */
+ const char *name; /* FooVal */
+ const char *usage;
+};
+
+/* also see lv_props in tools.h and lv_props.h */
+struct lvp_name {
+ const char *enum_name; /* "is_foo_LVP" */
+ int lvp_enum; /* is_foo_LVP */
+ const char *name; /* "lv_is_foo" */
+};
+
+/* also see lv_types in tools.h and lv_types.h */
+struct lvt_name {
+ const char *enum_name; /* "foo_LVT" */
+ int lvt_enum; /* foo_LVT */
+ const char *name; /* "foo" */
+};
+
+/* create foo_VAL enums for option and position values */
+
+enum {
+#define val(a, b, c, d) a ,
+#include "vals.h"
+#undef val
+};
+
+/* create foo_ARG enums for --option's */
+
+enum {
+#define arg(a, b, c, d, e, f, g) a ,
+#include "args.h"
+#undef arg
+};
+
+/* create foo_LVP enums for LV properties */
+
+enum {
+#define lvp(a, b, c) a,
+#include "lv_props.h"
+#undef lvp
+};
+
+/* create foo_LVT enums for LV types */
+
+enum {
+#define lvt(a, b, c) a,
+#include "lv_types.h"
+#undef lvt
+};
+
+/* one for each command name, see cmd_names[] */
+
+#define MAX_CMD_NAMES 128
+struct cmd_name {
+ const char *name;
+ const char *desc;
+ int common_options[ARG_COUNT + 1]; /* options common to all defs */
+ int all_options[ARG_COUNT + 1]; /* union of options from all defs */
+ int variants; /* number of command defs with this command name */
+ int variant_has_ro; /* do variants use required_opt_args ? */
+ int variant_has_rp; /* do variants use required_pos_args ? */
+ int variant_has_oo; /* do variants use optional_opt_args ? */
+ int variant_has_op; /* do variants use optional_pos_args ? */
+};
+
+/* struct command */
+
+#include "command.h"
+
+/* one for each command defininition (command-lines.in as struct command) */
+
+#define MAX_CMDS 256
+int cmd_count;
+struct command cmd_array[MAX_CMDS];
+
+#define MAX_LINE 1024
+#define MAX_LINE_ARGC 256
+
+#define DESC_LINE 256
+
+#endif
+
diff --git a/tools/create-commands.c b/tools/create-commands.c
deleted file mode 100644
index f9ff800..0000000
--- a/tools/create-commands.c
+++ /dev/null
@@ -1,3169 +0,0 @@
-#include <asm/types.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <limits.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <sched.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <getopt.h>
-
-/* needed to include args.h */
-#define ARG_COUNTABLE 0x00000001
-#define ARG_GROUPABLE 0x00000002
-struct cmd_context;
-struct arg_values;
-
-int yes_no_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int activation_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int cachemode_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int discards_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int mirrorlog_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int size_kb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int size_mb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int size_mb_arg_with_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int int_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int uint32_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int int_arg_with_sign(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int int_arg_with_sign_and_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int major_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int minor_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int string_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int tag_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int permission_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int metadatatype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int units_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int segtype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int alloc_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int locktype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int readahead_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
-int vgmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-int pvmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-int metadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-int polloperation_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-int writemostly_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-int syncaction_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-int reportformat_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-int configreport_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-int configtype_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
-
-/* also see arg_props in tools.h and args.h */
-struct opt_name {
- const char *name; /* "foo_ARG" */
- int opt_enum; /* foo_ARG */
- const char short_opt; /* -f */
- char _padding[7];
- const char *long_opt; /* --foo */
- int val_enum; /* xyz_VAL when --foo takes a val like "--foo xyz" */
- uint32_t unused1;
- uint32_t unused2;
- const char *desc;
-};
-
-/* also see val_props in tools.h and vals.h */
-struct val_name {
- const char *enum_name; /* "foo_VAL" */
- int val_enum; /* foo_VAL */
- int (*fn) (struct cmd_context *cmd, struct arg_values *av); /* foo_arg() */
- const char *name; /* FooVal */
- const char *usage;
-};
-
-/* also see lv_props in tools.h and lv_props.h */
-struct lvp_name {
- const char *enum_name; /* "is_foo_LVP" */
- int lvp_enum; /* is_foo_LVP */
- const char *name; /* "lv_is_foo" */
-};
-
-/* also see lv_types in tools.h and lv_types.h */
-struct lvt_name {
- const char *enum_name; /* "foo_LVT" */
- int lvt_enum; /* foo_LVT */
- const char *name; /* "foo" */
-};
-
-/* create foo_VAL enums for option and position values */
-
-enum {
-#define val(a, b, c, d) a ,
-#include "vals.h"
-#undef val
-};
-
-/* create foo_ARG enums for --option's */
-
-enum {
-#define arg(a, b, c, d, e, f, g) a ,
-#include "args.h"
-#undef arg
-};
-
-/* create foo_LVP enums for LV properties */
-
-enum {
-#define lvp(a, b, c) a,
-#include "lv_props.h"
-#undef lvp
-};
-
-/* create foo_LVT enums for LV types */
-
-enum {
-#define lvt(a, b, c) a,
-#include "lv_types.h"
-#undef lvt
-};
-
-/* create table of value names, e.g. String, and corresponding enum from vals.h */
-
-static struct val_name val_names[VAL_COUNT + 1] = {
-#define val(a, b, c, d) { # a, a, b, c, d },
-#include "vals.h"
-#undef val
-};
-
-/* create table of option names, e.g. --foo, and corresponding enum from args.h */
-
-static struct opt_name opt_names[ARG_COUNT + 1] = {
-#define arg(a, b, c, d, e, f, g) { # a, a, b, "", "--" c, d, e, f, g },
-#include "args.h"
-#undef arg
-};
-
-/* create table of lv property names, e.g. lv_is_foo, and corresponding enum from lv_props.h */
-
-static struct lvp_name lvp_names[LVP_COUNT + 1] = {
-#define lvp(a, b, c) { # a, a, b },
-#include "lv_props.h"
-#undef lvp
-};
-
-/* create table of lv type names, e.g. linear and corresponding enum from lv_types.h */
-
-static struct lvt_name lvt_names[LVT_COUNT + 1] = {
-#define lvt(a, b, c) { # a, a, b },
-#include "lv_types.h"
-#undef lvt
-};
-
-#include "command.h"
-
-#define MAX_CMD_NAMES 128
-struct cmd_name {
- const char *name;
- const char *desc;
- int common_options[ARG_COUNT + 1];
- int all_options[ARG_COUNT + 1];
- int variants;
- int variant_has_ro;
- int variant_has_rp;
- int variant_has_oo;
- int variant_has_op;
-};
-
-/* create table of command names, e.g. vgcreate */
-
-static struct cmd_name cmd_names[MAX_CMD_NAMES] = {
-#define xx(a, b, c) { # a , b } ,
-#include "commands.h"
-#undef xx
-};
-
-/* array of pointers into opt_names[] that is sorted alphabetically (by long opt name) */
-
-static struct opt_name *opt_names_alpha[ARG_COUNT + 1];
-
-#define MAX_LINE 1024
-#define MAX_LINE_ARGC 256
-
-#define DESC_LINE 256
-
-#define REQUIRED 1 /* required option */
-#define OPTIONAL 0 /* optional option */
-#define IGNORE -1 /* ignore option */
-
-struct oo_line {
- char *name;
- char *line;
-};
-
-#define MAX_CMDS 256
-int cmd_count;
-struct command cmd_array[MAX_CMDS];
-
-struct command lvm_all; /* for printing common options for all lvm commands */
-
-#define MAX_OO_LINES 256
-int oo_line_count;
-struct oo_line oo_lines[MAX_OO_LINES];
-
-static int include_man_secondary = 1;
-static int include_man_primary = 1;
-static char *man_command_name = NULL;
-
-static void add_optional_opt_line(struct command *cmd, int argc, char *argv[]);
-
-/*
- * modifies buf, replacing the sep characters with \0
- * argv pointers point to positions in buf
- */
-
-static char *split_line(char *buf, int *argc, char **argv, char sep)
-{
- char *p = buf, *rp = NULL;
- int i;
-
- argv[0] = p;
-
- for (i = 1; i < MAX_LINE_ARGC; i++) {
- p = strchr(buf, sep);
- if (!p)
- break;
- *p = '\0';
-
- argv[i] = p + 1;
- buf = p + 1;
- }
- *argc = i;
-
- /* we ended by hitting \0, return the point following that */
- if (!rp)
- rp = strchr(buf, '\0') + 1;
-
- return rp;
-}
-
-/* convert value string, e.g. Number, to foo_VAL enum */
-
-static int val_str_to_num(char *str)
-{
- char name[32] = { 0 };
- char *new;
- int i;
-
- /* compare the name before any suffix like _new or _<lvtype> */
-
- strncpy(name, str, 31);
- if ((new = strstr(name, "_")))
- *new = '\0';
-
- for (i = 0; i < VAL_COUNT; i++) {
- if (!val_names[i].name)
- break;
- if (!strncmp(name, val_names[i].name, strlen(val_names[i].name)))
- return val_names[i].val_enum;
- }
-
- return 0;
-}
-
-/* convert "--option" to foo_ARG enum */
-
-static int opt_str_to_num(char *str)
-{
- char long_name[32];
- char *p;
- int i;
-
- /*
- * --foo_long means there are two args entries
- * for --foo, one with a short option and one
- * without, and we want the one without the
- * short option.
- */
- if (strstr(str, "_long")) {
- strcpy(long_name, str);
- p = strstr(long_name, "_long");
- *p = '\0';
-
- for (i = 0; i < ARG_COUNT; i++) {
- if (!opt_names[i].long_opt)
- continue;
- /* skip anything with a short opt */
- if (opt_names[i].short_opt)
- continue;
- if (!strcmp(opt_names[i].long_opt, long_name))
- return opt_names[i].opt_enum;
- }
-
- printf("Unknown opt str: %s %s\n", str, long_name);
- exit(1);
- }
-
- for (i = 0; i < ARG_COUNT; i++) {
- if (!opt_names[i].long_opt)
- continue;
- /* These are only selected using --foo_long */
- if (strstr(opt_names[i].name, "_long_ARG"))
- continue;
- if (!strcmp(opt_names[i].long_opt, str))
- return opt_names[i].opt_enum;
- }
-
- printf("Unknown opt str: \"%s\"\n", str);
- exit(1);
-}
-
-static char *val_bits_to_str(uint64_t val_bits)
-{
- static char buf[1024];
- int i;
- int or = 0;
-
- memset(buf, 0, sizeof(buf));
-
- for (i = 0; i < VAL_COUNT; i++) {
- if (val_bits & val_enum_to_bit(i)) {
- if (or) strcat(buf, " | ");
- strcat(buf, "val_enum_to_bit(");
- strcat(buf, val_names[i].enum_name);
- strcat(buf, ")");
- or = 1;
- }
- }
-
- return buf;
-}
-
-/*
- * When bits for foo_LVP and bar_LVP are both set in bits, print:
- * lvp_enum_to_bit(foo_LVP) | lvp_enum_to_bit(bar_LVP)
- */
-
-static char *lvp_bits_to_str(uint64_t bits)
-{
- static char lvp_buf[1024];
- int i;
- int or = 0;
-
- memset(lvp_buf, 0, sizeof(lvp_buf));
-
- for (i = 0; i < LVP_COUNT; i++) {
- if (bits & lvp_enum_to_bit(i)) {
- if (or) strcat(lvp_buf, " | ");
- strcat(lvp_buf, "lvp_enum_to_bit(");
- strcat(lvp_buf, lvp_names[i].enum_name);
- strcat(lvp_buf, ")");
- or = 1;
- }
- }
-
- return lvp_buf;
-}
-
-/*
- * When bits for foo_LVT and bar_LVT are both set in bits, print:
- * lvt_enum_to_bit(foo_LVT) | lvt_enum_to_bit(bar_LVT)
- */
-
-static char *lvt_bits_to_str(uint64_t bits)
-{
- static char lvt_buf[1024];
- int i;
- int or = 0;
-
- memset(lvt_buf, 0, sizeof(lvt_buf));
-
- for (i = 1; i < LVT_COUNT; i++) {
- if (bits & lvt_enum_to_bit(i)) {
- if (or) strcat(lvt_buf, " | ");
- strcat(lvt_buf, "lvt_enum_to_bit(");
- strcat(lvt_buf, lvt_names[i].enum_name);
- strcat(lvt_buf, ")");
- or = 1;
- }
- }
-
- return lvt_buf;
-}
-
-/* "lv_is_prop" to is_prop_LVP */
-
-static int lvp_name_to_enum(char *str)
-{
- int i;
-
- for (i = 1; i < LVP_COUNT; i++) {
- if (!strcmp(str, lvp_names[i].name))
- return lvp_names[i].lvp_enum;
- }
- printf("unknown lv property %s\n", str);
- exit(1);
-}
-
-/* type_LVT to "type" */
-
-static const char *lvt_enum_to_name(int lvt_enum)
-{
- return lvt_names[lvt_enum].name;
-}
-
-/* "type" to type_LVT */
-
-static int lvt_name_to_enum(char *str)
-{
- int i;
-
- for (i = 1; i < LVT_COUNT; i++) {
- if (!strcmp(str, lvt_names[i].name))
- return lvt_names[i].lvt_enum;
- }
- printf("unknown lv type %s\n", str);
- exit(1);
-}
-
-/* LV_<type> to <type>_LVT */
-
-int lv_to_enum(char *name)
-{
- return lvt_name_to_enum(name + 3);
-}
-
-/*
- * LV_<type1>_<type2> to lvt_bits
- *
- * type1 to lvt_enum
- * lvt_bits |= lvt_enum_to_bit(lvt_enum)
- * type2 to lvt_enum
- * lvt_bits |= lvt_enum_to_bit(lvt_enum)
- */
-
-uint64_t lv_to_bits(char *name)
-{
- char buf[64];
- char *argv[MAX_LINE_ARGC];
- uint64_t lvt_bits = 0;
- int lvt_enum;
- int argc;
- int i;
-
- strcpy(buf, name);
-
- split_line(buf, &argc, argv, '_');
-
- /* 0 is "LV" */
- for (i = 1; i < argc; i++) {
- if (!strcmp(argv[i], "new"))
- continue;
- lvt_enum = lvt_name_to_enum(argv[i]);
- lvt_bits |= lvt_enum_to_bit(lvt_enum);
- }
-
- return lvt_bits;
-}
-
-static const char *is_command_name(char *str)
-{
- int i;
-
- for (i = 0; i < MAX_CMD_NAMES; i++) {
- if (!cmd_names[i].name)
- break;
- if (!strcmp(cmd_names[i].name, str))
- return cmd_names[i].name;
- }
- return NULL;
-}
-
-static const char *cmd_name_desc(const char *name)
-{
- int i;
-
- for (i = 0; i < MAX_CMD_NAMES; i++) {
- if (!cmd_names[i].name)
- break;
- if (!strcmp(cmd_names[i].name, name))
- return cmd_names[i].desc;
- }
- return NULL;
-}
-
-static struct cmd_name *find_command_name(const char *str)
-{
- int i;
-
- for (i = 0; i < MAX_CMD_NAMES; i++) {
- if (!cmd_names[i].name)
- break;
- if (!strcmp(cmd_names[i].name, str))
- return &cmd_names[i];
- }
- return NULL;
-}
-
-static int is_opt_name(char *str)
-{
- if (!strncmp(str, "--", 2))
- return 1;
-
- if ((str[0] == '-') && (str[1] != '-')) {
- printf("Options must be specified in long form: %s\n", str);
- exit(1);
- }
-
- return 0;
-}
-
-/*
- * "Select" as a pos name means that the position
- * can be empty if the --select option is used.
- */
-
-static int is_pos_name(char *str)
-{
- if (!strncmp(str, "VG", 2))
- return 1;
- if (!strncmp(str, "LV", 2))
- return 1;
- if (!strncmp(str, "PV", 2))
- return 1;
- if (!strncmp(str, "Tag", 3))
- return 1;
- if (!strncmp(str, "String", 6))
- return 1;
- if (!strncmp(str, "Select", 6))
- return 1;
- return 0;
-}
-
-static int is_oo_definition(char *str)
-{
- if (!strncmp(str, "OO_", 3) && strstr(str, ":"))
- return 1;
- return 0;
-}
-
-static int is_oo_line(char *str)
-{
- if (!strncmp(str, "OO:", 3))
- return 1;
- return 0;
-}
-
-static int is_io_line(char *str)
-{
- if (!strncmp(str, "IO:", 3))
- return 1;
- return 0;
-}
-
-static int is_op_line(char *str)
-{
- if (!strncmp(str, "OP:", 3))
- return 1;
- return 0;
-}
-
-static int is_desc_line(char *str)
-{
- if (!strncmp(str, "DESC:", 5))
- return 1;
- return 0;
-}
-
-static int is_flags_line(char *str)
-{
- if (!strncmp(str, "FLAGS:", 6))
- return 1;
- return 0;
-}
-
-static int is_rule_line(char *str)
-{
- if (!strncmp(str, "RULE:", 5))
- return 1;
- return 0;
-}
-
-static int is_id_line(char *str)
-{
- if (!strncmp(str, "ID:", 3))
- return 1;
- return 0;
-}
-
-/*
- * parse str for anything that can appear in a position,
- * like VG, VG|LV, VG|LV_linear|LV_striped, etc
- */
-
-static void set_pos_def(struct command *cmd, char *str, struct arg_def *def)
-{
- char *argv[MAX_LINE_ARGC];
- int argc;
- char *name;
- int val_enum;
- int i;
-
- split_line(str, &argc, argv, '|');
-
- for (i = 0; i < argc; i++) {
- name = argv[i];
-
- val_enum = val_str_to_num(name);
-
- if (!val_enum) {
- printf("Unknown pos arg: %s\n", name);
- exit(1);
- }
-
- def->val_bits |= val_enum_to_bit(val_enum);
-
- if ((val_enum == lv_VAL) && strstr(name, "_"))
- def->lvt_bits = lv_to_bits(name);
-
- if (strstr(name, "_new")) {
- if (val_enum == lv_VAL)
- def->flags |= ARG_DEF_FLAG_NEW_LV;
- else if (val_enum == vg_VAL)
- def->flags |= ARG_DEF_FLAG_NEW_VG;
- }
- }
-}
-
-/*
- * parse str for anything that can follow --option
- */
-
-static void set_opt_def(struct command *cmd, char *str, struct arg_def *def)
-{
- char *argv[MAX_LINE_ARGC];
- int argc;
- char *name;
- int val_enum;
- int i, j;
-
- split_line(str, &argc, argv, '|');
-
- for (i = 0; i < argc; i++) {
- name = argv[i];
-
- val_enum = val_str_to_num(name);
-
- if (!val_enum) {
- /* a literal number or string */
-
- if (isdigit(name[0]))
- val_enum = constnum_VAL;
-
- else if (isalpha(name[0]))
- val_enum = conststr_VAL;
-
- else {
- printf("Unknown opt arg: %s\n", name);
- exit(0);
- }
- }
-
-
- def->val_bits |= val_enum_to_bit(val_enum);
-
- if (val_enum == constnum_VAL)
- def->num = (uint64_t)atoi(name);
-
- if (val_enum == conststr_VAL)
- def->str = strdup(name);
-
- if (val_enum == lv_VAL) {
- if (strstr(name, "_"))
- def->lvt_bits = lv_to_bits(name);
- }
-
- if (strstr(name, "_new")) {
- if (val_enum == lv_VAL)
- def->flags |= ARG_DEF_FLAG_NEW_LV;
- else if (val_enum == vg_VAL)
- def->flags |= ARG_DEF_FLAG_NEW_VG;
-
- }
- }
-}
-
-
-/*
- * OO_FOO: --opt1 ...
- *
- * oo->name = "OO_FOO";
- * oo->line = "--opt1 ...";
- */
-
-static void add_oo_definition_line(const char *name, const char *line)
-{
- struct oo_line *oo;
- char *colon;
- char *start;
-
- oo = &oo_lines[oo_line_count++];
- oo->name = strdup(name);
-
- if ((colon = strstr(oo->name, ":")))
- *colon = '\0';
- else {
- printf("invalid OO definition\n");
- exit(1);
- }
-
- start = strstr(line, ":") + 2;
- oo->line = strdup(start);
-}
-
-/* when OO_FOO: continues on multiple lines */
-
-static void append_oo_definition_line(const char *new_line)
-{
- struct oo_line *oo;
- char *old_line;
- char *line;
- int len;
-
- oo = &oo_lines[oo_line_count-1];
-
- old_line = oo->line;
-
- /* +2 = 1 space between old and new + 1 terminating \0 */
- len = strlen(old_line) + strlen(new_line) + 2;
- line = malloc(len);
- memset(line, 0, len);
-
- strcat(line, old_line);
- strcat(line, " ");
- strcat(line, new_line);
-
- free(oo->line);
- oo->line = line;
-}
-
-char *get_oo_line(char *str)
-{
- char *name;
- char *end;
- char str2[64];
- int i;
-
- strcpy(str2, str);
- if ((end = strstr(str2, ":")))
- *end = '\0';
- if ((end = strstr(str2, ",")))
- *end = '\0';
-
- for (i = 0; i < oo_line_count; i++) {
- name = oo_lines[i].name;
- if (!strcmp(name, str2))
- return oo_lines[i].line;
- }
- return NULL;
-}
-
-/* add optional_opt_args entries when OO_FOO appears on OO: line */
-
-static void include_optional_opt_args(struct command *cmd, char *str)
-{
- char *oo_line;
- char *line;
- char *line_argv[MAX_LINE_ARGC];
- int line_argc;
-
- if (!(oo_line = get_oo_line(str))) {
- printf("No OO line found for %s\n", str);
- exit(1);
- }
-
- if (!(line = strdup(oo_line)))
- exit(1);
-
- split_line(line, &line_argc, line_argv, ' ');
- add_optional_opt_line(cmd, line_argc, line_argv);
- free(line);
-}
-
-static void add_opt_arg(struct command *cmd, char *str, int *takes_arg, int required)
-{
- char *comma;
- int opt;
-
- /* opt_arg.opt set here */
- /* opt_arg.def will be set in update_prev_opt_arg() if needed */
-
- if ((comma = strstr(str, ",")))
- *comma = '\0';
-
- /*
- * Work around nasty hack where --uuid is used for both uuid_ARG
- * and uuidstr_ARG. The input uses --uuidstr, where an actual
- * command uses --uuid string.
- */
- if (!strcmp(str, "--uuidstr")) {
- opt = uuidstr_ARG;
- goto skip;
- }
-
- opt = opt_str_to_num(str);
-skip:
- if (required > 0)
- cmd->required_opt_args[cmd->ro_count++].opt = opt;
- else if (!required)
- cmd->optional_opt_args[cmd->oo_count++].opt = opt;
- else if (required < 0)
- cmd->ignore_opt_args[cmd->io_count++].opt = opt;
- else
- exit(1);
-
- *takes_arg = opt_names[opt].val_enum ? 1 : 0;
-}
-
-static void update_prev_opt_arg(struct command *cmd, char *str, int required)
-{
- struct arg_def def = { 0 };
- char *comma;
-
- if (str[0] == '-') {
- printf("Option %s must be followed by an arg.\n", str);
- exit(1);
- }
-
- /* opt_arg.def set here */
- /* opt_arg.opt was previously set in add_opt_arg() when --foo was read */
-
- if ((comma = strstr(str, ",")))
- *comma = '\0';
-
- set_opt_def(cmd, str, &def);
-
- if (required > 0)
- cmd->required_opt_args[cmd->ro_count-1].def = def;
- else if (!required)
- cmd->optional_opt_args[cmd->oo_count-1].def = def;
- else if (required < 0)
- cmd->ignore_opt_args[cmd->io_count-1].def = def;
- else
- exit(1);
-}
-
-static void add_pos_arg(struct command *cmd, char *str, int required)
-{
- struct arg_def def = { 0 };
-
- /* pos_arg.pos and pos_arg.def are set here */
-
- set_pos_def(cmd, str, &def);
-
- if (required) {
- cmd->required_pos_args[cmd->rp_count].pos = cmd->pos_count++;
- cmd->required_pos_args[cmd->rp_count].def = def;
- cmd->rp_count++;
- } else {
- cmd->optional_pos_args[cmd->op_count].pos = cmd->pos_count++;;
- cmd->optional_pos_args[cmd->op_count].def = def;
- cmd->op_count++;
- }
-}
-
-/* process something that follows a pos arg, which is not a new pos arg */
-
-static void update_prev_pos_arg(struct command *cmd, char *str, int required)
-{
- struct arg_def *def;
-
- /* a previous pos_arg.def is modified here */
-
- if (required)
- def = &cmd->required_pos_args[cmd->rp_count-1].def;
- else
- def = &cmd->optional_pos_args[cmd->op_count-1].def;
-
- if (!strcmp(str, "..."))
- def->flags |= ARG_DEF_FLAG_MAY_REPEAT;
- else {
- printf("Unknown pos arg: %s\n", str);
- exit(1);
- }
-}
-
-/* process what follows OO:, which are optional opt args */
-
-static void add_optional_opt_line(struct command *cmd, int argc, char *argv[])
-{
- int takes_arg;
- int i;
-
- for (i = 0; i < argc; i++) {
- if (!i && !strncmp(argv[i], "OO:", 3))
- continue;
- if (is_opt_name(argv[i]))
- add_opt_arg(cmd, argv[i], &takes_arg, OPTIONAL);
- else if (!strncmp(argv[i], "OO_", 3))
- include_optional_opt_args(cmd, argv[i]);
- else if (takes_arg)
- update_prev_opt_arg(cmd, argv[i], OPTIONAL);
- else
- printf("Can't parse argc %d argv %s prev %s\n",
- i, argv[i], argv[i-1]);
- }
-}
-
-static void add_ignore_opt_line(struct command *cmd, int argc, char *argv[])
-{
- int takes_arg;
- int i;
-
- for (i = 0; i < argc; i++) {
- if (!i && !strncmp(argv[i], "IO:", 3))
- continue;
- if (is_opt_name(argv[i]))
- add_opt_arg(cmd, argv[i], &takes_arg, IGNORE);
- else if (takes_arg)
- update_prev_opt_arg(cmd, argv[i], IGNORE);
- else
- printf("Can't parse argc %d argv %s prev %s\n",
- i, argv[i], argv[i-1]);
- }
-}
-
-/* process what follows OP:, which are optional pos args */
-
-static void add_optional_pos_line(struct command *cmd, int argc, char *argv[])
-{
- int i;
-
- for (i = 0; i < argc; i++) {
- if (!i && !strncmp(argv[i], "OP:", 3))
- continue;
- if (is_pos_name(argv[i]))
- add_pos_arg(cmd, argv[i], OPTIONAL);
- else
- update_prev_pos_arg(cmd, argv[i], OPTIONAL);
- }
-}
-
-/* add required opt args from OO_FOO definition */
-
-static void add_required_opt_line(struct command *cmd, int argc, char *argv[])
-{
- int takes_arg;
- int i;
-
- for (i = 0; i < argc; i++) {
- if (is_opt_name(argv[i]))
- add_opt_arg(cmd, argv[i], &takes_arg, REQUIRED);
- else if (takes_arg)
- update_prev_opt_arg(cmd, argv[i], REQUIRED);
- else
- printf("Can't parse argc %d argv %s prev %s\n",
- i, argv[i], argv[i-1]);
- }
-}
-
-/* add to required_opt_args when OO_FOO appears on required line */
-
-static void include_required_opt_args(struct command *cmd, char *str)
-{
- char *oo_line;
- char *line;
- char *line_argv[MAX_LINE_ARGC];
- int line_argc;
-
- if (!(oo_line = get_oo_line(str))) {
- printf("No OO line found for %s\n", str);
- exit(1);
- }
-
- if (!(line = strdup(oo_line)))
- exit(1);
-
- split_line(line, &line_argc, line_argv, ' ');
- add_required_opt_line(cmd, line_argc, line_argv);
- free(line);
-}
-
-/* process what follows command_name, which are required opt/pos args */
-
-static void add_required_line(struct command *cmd, int argc, char *argv[])
-{
- int i;
- int takes_arg;
- int prev_was_opt = 0, prev_was_pos = 0;
-
- /* argv[0] is command name */
-
- for (i = 1; i < argc; i++) {
- if (is_opt_name(argv[i])) {
- add_opt_arg(cmd, argv[i], &takes_arg, REQUIRED);
- prev_was_opt = 1;
- prev_was_pos = 0;
- } else if (prev_was_opt && takes_arg) {
- update_prev_opt_arg(cmd, argv[i], REQUIRED);
- prev_was_opt = 0;
- prev_was_pos = 0;
- } else if (is_pos_name(argv[i])) {
- add_pos_arg(cmd, argv[i], REQUIRED);
- prev_was_opt = 0;
- prev_was_pos = 1;
- } else if (!strncmp(argv[i], "OO_", 3)) {
- cmd->cmd_flags |= CMD_FLAG_ONE_REQUIRED_OPT;
- include_required_opt_args(cmd, argv[i]);
- } else if (prev_was_pos) {
- update_prev_pos_arg(cmd, argv[i], REQUIRED);
- } else
- printf("Can't parse argc %d argv %s prev %s\n",
- i, argv[i], argv[i-1]);
-
- }
-}
-
-static void print_def(struct arg_def *def, int usage)
-{
- int val_enum;
- int lvt_enum;
- int sep = 0;
- int i;
-
- for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
- if (def->val_bits & val_enum_to_bit(val_enum)) {
-
- if (val_enum == conststr_VAL)
- printf("%s", def->str);
-
- else if (val_enum == constnum_VAL)
- printf("%llu", (unsigned long long)def->num);
-
- else {
- if (sep) printf("|");
-
- if (!usage || !val_names[val_enum].usage)
- printf("%s", val_names[val_enum].name);
- else
- printf("%s", val_names[val_enum].usage);
-
- sep = 1;
- }
-
- if (val_enum == lv_VAL && def->lvt_bits) {
- for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
- if (lvt_bit_is_set(def->lvt_bits, lvt_enum))
- printf("_%s", lvt_enum_to_name(lvt_enum));
- }
- }
-
- if ((val_enum == vg_VAL) && (def->flags & ARG_DEF_FLAG_NEW_VG))
- printf("_new");
- if ((val_enum == lv_VAL) && (def->flags & ARG_DEF_FLAG_NEW_LV))
- printf("_new");
- }
- }
-
- if (def->flags & ARG_DEF_FLAG_MAY_REPEAT)
- printf(" ...");
-}
-
-void print_expanded(void)
-{
- struct command *cmd;
- int onereq;
- int i, ro, rp, oo, op;
-
- for (i = 0; i < cmd_count; i++) {
- cmd = &cmd_array[i];
- printf("%s", cmd->name);
-
- onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
-
- if (cmd->ro_count) {
- if (onereq)
- printf(" (");
-
- for (ro = 0; ro < cmd->ro_count; ro++) {
- if (ro && onereq)
- printf(",");
- printf(" %s", opt_names[cmd->required_opt_args[ro].opt].long_opt);
- if (cmd->required_opt_args[ro].def.val_bits) {
- printf(" ");
- print_def(&cmd->required_opt_args[ro].def, 0);
- }
- }
- if (onereq)
- printf(" )");
- }
-
- if (cmd->rp_count) {
- for (rp = 0; rp < cmd->rp_count; rp++) {
- if (cmd->required_pos_args[rp].def.val_bits) {
- printf(" ");
- print_def(&cmd->required_pos_args[rp].def, 0);
- }
- }
- }
-
- if (cmd->oo_count) {
- printf("\n");
- printf("OO:");
- for (oo = 0; oo < cmd->oo_count; oo++) {
- if (oo)
- printf(",");
- printf(" %s", opt_names[cmd->optional_opt_args[oo].opt].long_opt);
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def(&cmd->optional_opt_args[oo].def, 0);
- }
- }
- }
-
- if (cmd->op_count) {
- printf("\n");
- printf("OP:");
- for (op = 0; op < cmd->op_count; op++) {
- if (cmd->optional_pos_args[op].def.val_bits) {
- printf(" ");
- print_def(&cmd->optional_pos_args[op].def, 0);
- }
- }
- }
-
- printf("\n\n");
- }
-}
-
-static int opt_arg_matches(struct opt_arg *oa1, struct opt_arg *oa2)
-{
- if (oa1->opt != oa2->opt)
- return 0;
-
- /* FIXME: some cases may need more specific val_bits checks */
- if (oa1->def.val_bits != oa2->def.val_bits)
- return 0;
-
- if (oa1->def.str && oa2->def.str && strcmp(oa1->def.str, oa2->def.str))
- return 0;
-
- if (oa1->def.num != oa2->def.num)
- return 0;
-
- /*
- * Do NOT compare lv_types because we are checking if two
- * command lines are ambiguous before the LV type is known.
- */
-
- return 1;
-}
-
-static int pos_arg_matches(struct pos_arg *pa1, struct pos_arg *pa2)
-{
- if (pa1->pos != pa2->pos)
- return 0;
-
- /* FIXME: some cases may need more specific val_bits checks */
- if (pa1->def.val_bits != pa2->def.val_bits)
- return 0;
-
- if (pa1->def.str && pa2->def.str && strcmp(pa1->def.str, pa2->def.str))
- return 0;
-
- if (pa1->def.num != pa2->def.num)
- return 0;
-
- /*
- * Do NOT compare lv_types because we are checking if two
- * command lines are ambiguous before the LV type is known.
- */
-
- return 1;
-}
-
-static const char *opt_to_enum_str(int opt)
-{
- return opt_names[opt].name;
-}
-
-static char *flags_to_str(int flags)
-{
- static char buf_flags[32];
-
- memset(buf_flags, 0, sizeof(buf_flags));
-
- if (flags & ARG_DEF_FLAG_MAY_REPEAT) {
- if (buf_flags[0])
- strcat(buf_flags, " | ");
- strcat(buf_flags, "ARG_DEF_FLAG_MAY_REPEAT");
- }
- if (flags & ARG_DEF_FLAG_NEW_VG) {
- if (buf_flags[0])
- strcat(buf_flags, " | ");
- strcat(buf_flags, "ARG_DEF_FLAG_NEW_VG");
- }
- if (flags & ARG_DEF_FLAG_NEW_LV) {
- if (buf_flags[0])
- strcat(buf_flags, " | ");
- strcat(buf_flags, "ARG_DEF_FLAG_NEW_LV");
- }
-
- return buf_flags;
-}
-
-static void add_flags(struct command *cmd, char *line)
-{
- if (strstr(line, "SECONDARY_SYNTAX"))
- cmd->cmd_flags |= CMD_FLAG_SECONDARY_SYNTAX;
-}
-
-#define MAX_RULE_OPTS 64
-
-static void add_rule(struct command *cmd, char *line)
-{
- struct cmd_rule *rule;
- char *line_argv[MAX_LINE_ARGC];
- char *arg;
- int line_argc;
- int i, lvt_enum, lvp_enum;
- int check = 0;
-
- if (cmd->rule_count == CMD_MAX_RULES) {
- printf("too many rules for cmd\n");
- exit(1);
- }
-
- rule = &cmd->rules[cmd->rule_count++];
-
- split_line(line, &line_argc, line_argv, ' ');
-
- for (i = 0; i < line_argc; i++) {
- arg = line_argv[i];
-
- if (!strcmp(arg, "not")) {
- rule->rule = RULE_INVALID;
- check = 1;
- }
-
- else if (!strcmp(arg, "and")) {
- rule->rule = RULE_REQUIRE;
- check = 1;
- }
-
- else if (!strncmp(arg, "all", 3)) {
- /* opt/lvt_bits/lvp_bits all remain 0 to mean all */
- continue;
- }
-
- else if (!strncmp(arg, "--", 2)) {
- if (!rule->opts) {
- if (!(rule->opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
- printf("no mem\n");
- exit(1);
- }
- memset(rule->opts, 0, MAX_RULE_OPTS * sizeof(int));
- }
-
- if (!rule->check_opts) {
- if (!(rule->check_opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
- printf("no mem\n");
- exit(1);
- }
- memset(rule->check_opts, 0, MAX_RULE_OPTS * sizeof(int));
- }
-
- if (check)
- rule->check_opts[rule->check_opts_count++] = opt_str_to_num(arg);
- else
- rule->opts[rule->opts_count++] = opt_str_to_num(arg);
- }
-
- else if (!strncmp(arg, "LV_", 3)) {
- lvt_enum = lv_to_enum(arg);
-
- if (check)
- rule->check_lvt_bits |= lvt_enum_to_bit(lvt_enum);
- else
- rule->lvt_bits |= lvt_enum_to_bit(lvt_enum);
- }
-
- else if (!strncmp(arg, "lv_is_", 6)) {
- lvp_enum = lvp_name_to_enum(arg);
-
- if (check)
- rule->check_lvp_bits |= lvp_enum_to_bit(lvp_enum);
- else
- rule->lvp_bits |= lvp_enum_to_bit(lvp_enum);
- }
- }
-}
-
-static char *rule_to_define_str(int rule_type)
-{
- switch (rule_type) {
- case RULE_INVALID:
- return "RULE_INVALID";
- case RULE_REQUIRE:
- return "RULE_REQUIRE";
- }
-}
-
-static char *cmd_flags_to_str(uint32_t flags)
-{
- static char buf_cmd_flags[32];
-
- memset(buf_cmd_flags, 0, sizeof(buf_cmd_flags));
-
- if (flags & CMD_FLAG_SECONDARY_SYNTAX) {
- if (buf_cmd_flags[0])
- strcat(buf_cmd_flags, " | ");
- strcat(buf_cmd_flags, "CMD_FLAG_SECONDARY_SYNTAX");
- }
- if (flags & CMD_FLAG_ONE_REQUIRED_OPT) {
- if (buf_cmd_flags[0])
- strcat(buf_cmd_flags, " | ");
- strcat(buf_cmd_flags, "CMD_FLAG_ONE_REQUIRED_OPT");
- }
-
- return buf_cmd_flags;
-}
-
-void print_command_count(void)
-{
- struct command *cmd;
- int i, j;
-
- printf("/* Do not edit. This file is generated by tools/create-commands */\n");
- printf("/* using command definitions from tools/command-lines.in */\n");
- printf("#define COMMAND_COUNT %d\n", cmd_count);
-
- printf("enum {\n");
- printf("\tno_CMD,\n"); /* enum value 0 is not used */
-
- for (i = 0; i < cmd_count; i++) {
- cmd = &cmd_array[i];
-
- if (!cmd->command_line_id) {
- printf("Missing ID: at %d\n", i);
- exit(1);
- }
-
- for (j = 0; j < i; j++) {
- if (!strcmp(cmd->command_line_id, cmd_array[j].command_line_id))
- goto next;
- }
-
- printf("\t%s_CMD,\n", cmd->command_line_id);
- next:
- ;
- }
- printf("\tCOMMAND_ID_COUNT,\n");
- printf("};\n");
-}
-
-static int is_lvm_all_opt(int opt)
-{
- int oo;
-
- for (oo = 0; oo < lvm_all.oo_count; oo++) {
- if (lvm_all.optional_opt_args[oo].opt == opt)
- return 1;
- }
- return 0;
-}
-
-static void factor_common_options(void)
-{
- int cn, opt_enum, ci, oo, ro, found;
- struct command *cmd;
-
- for (cn = 0; cn < MAX_CMD_NAMES; cn++) {
- if (!cmd_names[cn].name)
- break;
-
- for (ci = 0; ci < cmd_count; ci++) {
- cmd = &cmd_array[ci];
-
- if (strcmp(cmd->name, cmd_names[cn].name))
- continue;
-
- cmd_names[cn].variants++;
- }
-
- for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
-
- for (ci = 0; ci < cmd_count; ci++) {
- cmd = &cmd_array[ci];
-
- if (strcmp(cmd->name, cmd_names[cn].name))
- continue;
-
- if (cmd->ro_count)
- cmd_names[cn].variant_has_ro = 1;
- if (cmd->rp_count)
- cmd_names[cn].variant_has_rp = 1;
- if (cmd->oo_count)
- cmd_names[cn].variant_has_oo = 1;
- if (cmd->op_count)
- cmd_names[cn].variant_has_op = 1;
-
- for (ro = 0; ro < cmd->ro_count; ro++) {
- cmd_names[cn].all_options[cmd->required_opt_args[ro].opt] = 1;
-
- if ((cmd->required_opt_args[ro].opt == size_ARG) && !strncmp(cmd->name, "lv", 2))
- cmd_names[cn].all_options[extents_ARG] = 1;
- }
- for (oo = 0; oo < cmd->oo_count; oo++)
- cmd_names[cn].all_options[cmd->optional_opt_args[oo].opt] = 1;
-
- found = 0;
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- if (cmd->optional_opt_args[oo].opt == opt_enum) {
- found = 1;
- break;
- }
- }
-
- if (!found)
- goto next_opt;
- }
-
- /* all commands starting with this name use this option */
- cmd_names[cn].common_options[opt_enum] = 1;
- next_opt:
- ;
- }
- }
-
- /*
- for (cn = 0; cn < MAX_CMD_NAMES; cn++) {
- if (!cmd_names[cn].name)
- break;
-
- printf("%s (%d)\n", cmd_names[cn].name, cmd_names[cn].variants);
- for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
- if (cmd_names[cn].common_options[opt_enum])
- printf(" %s\n", opt_names[opt_enum].long_opt);
- }
- }
- */
-}
-
-void print_usage_common(struct command *cmd)
-{
- struct cmd_name *cname;
- int i, sep, ro, rp, oo, op, opt_enum;
-
- if (!(cname = find_command_name(cmd->name)))
- return;
-
- sep = 0;
-
- /*
- * when there's more than one variant, options that
- * are common to all commands with a common name.
- */
-
- if (cname->variants < 2)
- goto all;
-
- for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
- if (!cname->common_options[opt_enum])
- continue;
-
- if (is_lvm_all_opt(opt_enum))
- continue;
-
- if (!sep) {
- printf("\n");
- printf("\" [");
- } else {
- printf(",");
- }
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- if (cmd->optional_opt_args[oo].opt != opt_enum)
- continue;
-
- printf(" %s", opt_names[opt_enum].long_opt);
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- break;
- }
- }
-
- all:
- /* options that are common to all lvm commands */
-
- for (oo = 0; oo < lvm_all.oo_count; oo++) {
- opt_enum = lvm_all.optional_opt_args[oo].opt;
-
- if (!sep) {
- printf("\n");
- printf("\" [");
- } else {
- printf(",");
- }
-
- printf(" %s", opt_names[opt_enum].long_opt);
- if (lvm_all.optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def(&lvm_all.optional_opt_args[oo].def, 1);
- }
- sep = 1;
- }
-
- printf(" ]\"");
- printf(";\n");
-}
-
-void print_usage(struct command *cmd)
-{
- struct cmd_name *cname;
- int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
- int i, sep, ro, rp, oo, op, opt_enum;
-
- if (!(cname = find_command_name(cmd->name)))
- return;
-
- printf("\"%s", cmd->name);
-
- if (cmd->ro_count) {
- if (onereq)
- printf(" (");
- for (ro = 0; ro < cmd->ro_count; ro++) {
- if (ro && onereq)
- printf(",");
- printf(" %s", opt_names[cmd->required_opt_args[ro].opt].long_opt);
-
- if (cmd->required_opt_args[ro].def.val_bits) {
- printf(" ");
- print_def(&cmd->required_opt_args[ro].def, 1);
- }
- }
- if (onereq)
- printf(" )");
- }
-
- if (cmd->rp_count) {
- for (rp = 0; rp < cmd->rp_count; rp++) {
- if (cmd->required_pos_args[rp].def.val_bits) {
- printf(" ");
- print_def(&cmd->required_pos_args[rp].def, 1);
- }
- }
- }
-
- printf("\"");
-
- oo_count:
- if (!cmd->oo_count)
- goto op_count;
-
- sep = 0;
-
- if (cmd->oo_count) {
- printf("\n");
- printf("\" [");
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- opt_enum = cmd->optional_opt_args[oo].opt;
-
- /*
- * Skip common opts which are in the usage_common string.
- * The common opts are those in lvm_all and in
- * cname->common_options.
- */
-
- if (is_lvm_all_opt(opt_enum))
- continue;
-
- if ((cname->variants > 1) && cname->common_options[opt_enum])
- continue;
-
- if (sep)
- printf(",");
-
- printf(" %s", opt_names[opt_enum].long_opt);
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- }
-
- if (sep)
- printf(",");
- printf(" COMMON_OPTIONS");
- printf(" ]\"");
- }
-
- op_count:
- if (!cmd->op_count)
- goto done;
-
- printf("\n");
- printf("\" [");
-
- if (cmd->op_count) {
- for (op = 0; op < cmd->op_count; op++) {
- if (cmd->optional_pos_args[op].def.val_bits) {
- printf(" ");
- print_def(&cmd->optional_pos_args[op].def, 1);
- }
- }
- }
-
- printf(" ]\"");
-
- done:
- printf(";\n");
-}
-
-static void print_val_man(const char *str)
-{
- char *line;
- char *line_argv[MAX_LINE_ARGC];
- int line_argc;
- int i;
-
- if (!strcmp(str, "Number") ||
- !strcmp(str, "String") ||
- !strncmp(str, "VG", 2) ||
- !strncmp(str, "LV", 2) ||
- !strncmp(str, "PV", 2) ||
- !strcmp(str, "Tag")) {
- printf("\\fI%s\\fP", str);
- return;
- }
-
- if (strstr(str, "Number[") || strstr(str, "]Number")) {
- for (i = 0; i < strlen(str); i++) {
- if (str[i] == 'N')
- printf("\\fI");
- if (str[i] == 'r') {
- printf("%c", str[i]);
- printf("\\fP");
- continue;
- }
- printf("%c", str[i]);
- }
- return;
- }
-
- if (strstr(str, "|")) {
- int len = strlen(str);
- line = strdup(str);
- split_line(line, &line_argc, line_argv, '|');
- for (i = 0; i < line_argc; i++) {
- if (i) {
- printf("|");
-
- /* this is a hack to add a line break for
- a long string of opt values */
- if ((len > 40) && (i >= (line_argc / 2) + 1)) {
- printf("\n");
- printf(" ");
- len = 0;
- }
- }
- if (strstr(line_argv[i], "Number"))
- printf("\\fI%s\\fP", line_argv[i]);
- else
- printf("\\fB%s\\fP", line_argv[i]);
- }
- return;
- }
-
- printf("\\fB%s\\fP", str);
-}
-
-static void print_def_man(struct arg_def *def, int usage)
-{
- int val_enum;
- int lvt_enum;
- int sep = 0;
- int i;
-
- for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
- if (def->val_bits & val_enum_to_bit(val_enum)) {
-
- if (val_enum == conststr_VAL) {
- printf("\\fB");
- printf("%s", def->str);
- printf("\\fP");
- }
-
- else if (val_enum == constnum_VAL) {
- printf("\\fB");
- printf("%llu", (unsigned long long)def->num);
- printf("\\fP");
- }
-
- else {
- if (sep) printf("|");
-
- if (!usage || !val_names[val_enum].usage) {
- printf("\\fI");
- printf("%s", val_names[val_enum].name);
- printf("\\fP");
- } else {
- print_val_man(val_names[val_enum].usage);
- }
-
- sep = 1;
- }
-
- if (val_enum == lv_VAL && def->lvt_bits) {
- printf("\\fI");
- for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
- if (lvt_bit_is_set(def->lvt_bits, lvt_enum))
- printf("_%s", lvt_enum_to_name(lvt_enum));
- }
- printf("\\fP");
- }
-
- if ((val_enum == vg_VAL) && (def->flags & ARG_DEF_FLAG_NEW_VG)) {
- printf("\\fI");
- printf("_new");
- printf("\\fP");
- }
- if ((val_enum == lv_VAL) && (def->flags & ARG_DEF_FLAG_NEW_LV)) {
- printf("\\fI");
- printf("_new");
- printf("\\fP");
- }
- }
- }
-
- if (def->flags & ARG_DEF_FLAG_MAY_REPEAT)
- printf(" ...");
-}
-
-static char *man_long_opt_name(const char *cmdname, int opt_enum)
-{
- static char long_opt_name[64];
-
- memset(&long_opt_name, 0, sizeof(long_opt_name));
-
- switch (opt_enum) {
- case syncaction_ARG:
- strncpy(long_opt_name, "--[raid]syncaction", 63);
- break;
- case writemostly_ARG:
- strncpy(long_opt_name, "--[raid]writemostly", 63);
- break;
- case minrecoveryrate_ARG:
- strncpy(long_opt_name, "--[raid]minrecoveryrate", 63);
- break;
- case maxrecoveryrate_ARG:
- strncpy(long_opt_name, "--[raid]maxrecoveryrate", 63);
- break;
- case writebehind_ARG:
- strncpy(long_opt_name, "--[raid]writebehind", 63);
- break;
- case vgmetadatacopies_ARG:
- if (!strncmp(cmdname, "vg", 2))
- strncpy(long_opt_name, "--[vg]metadatacopies", 63);
- else
- strncpy(long_opt_name, "--vgmetadatacopies", 63);
- break;
- case pvmetadatacopies_ARG:
- if (!strncmp(cmdname, "pv", 2))
- strncpy(long_opt_name, "--[pv]metadatacopies", 63);
- else
- strncpy(long_opt_name, "--pvmetadatacopies", 63);
- break;
- default:
- strncpy(long_opt_name, opt_names[opt_enum].long_opt, 63);
- break;
- }
-
- return long_opt_name;
-}
-
-void print_man_usage(struct command *cmd)
-{
- struct cmd_name *cname;
- int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
- int i, sep, ro, rp, oo, op, opt_enum;
-
- if (!(cname = find_command_name(cmd->name)))
- return;
-
- printf("\\fB%s\\fP", cmd->name);
-
- if (!onereq)
- goto ro_normal;
-
- /*
- * one required option in a set, print as:
- * ( -a|--a,
- * -b|--b,
- * --c,
- * --d )
- *
- * First loop through ro prints those with short opts,
- * and the second loop prints those without short opts.
- */
-
- if (cmd->ro_count) {
- printf("\n");
- printf(".RS 4\n");
- printf("(");
-
- sep = 0;
-
- /* print required options with a short opt */
- for (ro = 0; ro < cmd->ro_count; ro++) {
- opt_enum = cmd->required_opt_args[ro].opt;
-
- if (!opt_names[opt_enum].short_opt)
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- if (opt_names[opt_enum].short_opt) {
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cmd->name, opt_enum));
- } else {
- printf(" ");
- printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
- }
-
- if (cmd->required_opt_args[ro].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->required_opt_args[ro].def, 1);
- }
-
- sep = 1;
- }
-
- /* print required options without a short opt */
- for (ro = 0; ro < cmd->ro_count; ro++) {
- opt_enum = cmd->required_opt_args[ro].opt;
-
- if (opt_names[opt_enum].short_opt)
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- printf(" ");
- printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
-
- if (cmd->required_opt_args[ro].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->required_opt_args[ro].def, 1);
- }
-
- sep = 1;
- }
-
- printf(" )\n");
- printf(".RE\n");
- }
-
- /* print required position args on a new line after the onereq set */
- if (cmd->rp_count) {
- printf(".RS 4\n");
- for (rp = 0; rp < cmd->rp_count; rp++) {
- if (cmd->required_pos_args[rp].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->required_pos_args[rp].def, 1);
- }
- }
-
- printf("\n");
- printf(".RE\n");
- } else {
- /* printf("\n"); */
- }
-
- printf(".br\n");
- goto oo_count;
-
- ro_normal:
-
- /*
- * all are required options, print as:
- * -a|--aaa <val> -b|--bbb <val>
- */
-
- if (cmd->ro_count) {
- for (ro = 0; ro < cmd->ro_count; ro++) {
- opt_enum = cmd->required_opt_args[ro].opt;
-
- if (opt_names[opt_enum].short_opt) {
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cmd->name, opt_enum));
- } else {
- printf(" \\fB%s\\fP", opt_names[cmd->required_opt_args[ro].opt].long_opt);
- }
-
- if (cmd->required_opt_args[ro].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->required_opt_args[ro].def, 1);
- }
- }
- }
-
- /* print required position args on the same line as the required options */
- if (cmd->rp_count) {
- for (rp = 0; rp < cmd->rp_count; rp++) {
- if (cmd->required_pos_args[rp].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->required_pos_args[rp].def, 1);
- }
- }
-
- printf("\n");
- } else {
- printf("\n");
- }
-
- printf(".br\n");
-
- oo_count:
- if (!cmd->oo_count)
- goto op_count;
-
- sep = 0;
-
- if (cmd->oo_count) {
- printf(".RS 4\n");
- printf("[");
-
- /* print optional options with short opts */
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- opt_enum = cmd->optional_opt_args[oo].opt;
-
- if (!opt_names[opt_enum].short_opt)
- continue;
-
- /*
- * Skip common opts which are in the usage_common string.
- * The common opts are those in lvm_all and in
- * cname->common_options.
- */
-
- if (is_lvm_all_opt(opt_enum))
- continue;
-
- if ((cname->variants > 1) && cname->common_options[opt_enum])
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cmd->name, opt_enum));
-
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- }
-
- /* print optional options without short opts */
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- opt_enum = cmd->optional_opt_args[oo].opt;
-
- if (opt_names[opt_enum].short_opt)
- continue;
-
- /*
- * Skip common opts which are in the usage_common string.
- * The common opts are those in lvm_all and in
- * cname->common_options.
- */
-
- if (is_lvm_all_opt(opt_enum))
- continue;
-
- if ((cname->variants > 1) && cname->common_options[opt_enum])
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- /* space alignment without short opt */
- printf(" ");
-
- printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
-
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- }
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- /* space alignment without short opt */
- printf(" ");
- }
- printf(" COMMON_OPTIONS");
- printf(" ]\n");
- printf(".RE\n");
- printf(".br\n");
- }
-
- op_count:
- if (!cmd->op_count)
- goto done;
-
- printf(".RS 4\n");
- printf("[");
-
- if (cmd->op_count) {
- for (op = 0; op < cmd->op_count; op++) {
- if (cmd->optional_pos_args[op].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->optional_pos_args[op].def, 1);
- }
- }
- }
-
- printf(" ]\n");
- printf(".RE\n");
-
- done:
- printf("\n");
-}
-
-/*
- * common options listed in the usage section.
- *
- * For commands with only one variant, this is only
- * the options which are common to all lvm commands
- * (in lvm_all, see is_lvm_all_opt).
- *
- * For commands with more than one variant, this
- * is the set of options common to all variants
- * (in cname->common_options), (which obviously
- * includes the options common to all lvm commands.)
- *
- * List ordering:
- * options with short+long names, alphabetically,
- * then options with only long names, alphabetically
- */
-
-void print_man_usage_common(struct command *cmd)
-{
- struct cmd_name *cname;
- int i, sep, ro, rp, oo, op, opt_enum;
-
- if (!(cname = find_command_name(cmd->name)))
- return;
-
- sep = 0;
-
- printf(".RS 4\n");
- printf("[");
-
- /* print those with short opts */
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
- if (!cname->common_options[opt_enum])
- continue;
-
- if (!opt_names[opt_enum].short_opt)
- continue;
-
- if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- if (cmd->optional_opt_args[oo].opt != opt_enum)
- continue;
-
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cmd->name, opt_enum));
-
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- break;
- }
-
- }
-
- /* print those without short opts */
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
- if (!cname->common_options[opt_enum])
- continue;
-
- if (opt_names[opt_enum].short_opt)
- continue;
-
- if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
- continue;
-
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
-
- for (oo = 0; oo < cmd->oo_count; oo++) {
- if (cmd->optional_opt_args[oo].opt != opt_enum)
- continue;
-
- /* space alignment without short opt */
- printf(" ");
-
- printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
-
- if (cmd->optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def_man(&cmd->optional_opt_args[oo].def, 1);
- }
- sep = 1;
- break;
- }
- }
-
- printf(" ]\n");
- return;
-}
-
-/*
- * Format of description, when different command names have
- * different descriptions:
- *
- * "#cmdname1"
- * "text foo goes here"
- * "a second line of text."
- * "#cmdname2"
- * "text bar goes here"
- * "another line of text."
- *
- * When called for cmdname2, this function should just print:
- *
- * "text bar goes here"
- * "another line of text."
- */
-
-static void print_man_option_desc(struct cmd_name *cname, int opt_enum)
-{
- const char *desc = opt_names[opt_enum].desc;
- char buf[DESC_LINE];
- int started_cname = 0;
- int line_count = 0;
- int di, bi;
-
- if (desc[0] != '#') {
- printf("%s", desc);
- return;
- }
-
- for (di = 0; di < strlen(desc); di++) {
- buf[bi++] = desc[di];
-
- if (bi == DESC_LINE) {
- printf("print_man_option_desc line too long\n");
- return;
- }
-
- if (buf[bi-1] != '\n')
- continue;
-
- if (buf[0] != '#') {
- if (started_cname) {
- printf("%s", buf);
- line_count++;
- }
-
- memset(buf, 0, sizeof(buf));
- bi = 0;
- continue;
- }
-
- /* Line starting with #cmdname */
-
- /*
- * Must be starting a new command name.
- * If no lines have been printed, multiple command names
- * are using the same text. If lines have been printed,
- * then the start of a new command name means the end
- * of text for the current command name.
- */
- if (line_count && started_cname)
- return;
-
- if (!strncmp(buf + 1, cname->name, strlen(cname->name))) {
- /* The start of our command name. */
- started_cname = 1;
- memset(buf, 0, sizeof(buf));
- bi = 0;
- } else {
- /* The start of another command name. */
- memset(buf, 0, sizeof(buf));
- bi = 0;
- }
- }
-
- if (bi && started_cname)
- printf("%s", buf);
-}
-
-/*
- * Print a list of all options names for a given
- * command name, listed by:
- * options with short+long names, alphabetically,
- * then options with only long names, alphabetically
- */
-
-void print_man_all_options_list(struct cmd_name *cname)
-{
- int opt_enum, val_enum;
- int sep = 0;
- int i;
-
- /* print those with both short and long opts */
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
- if (!cname->all_options[opt_enum])
- continue;
-
- if (!opt_names[opt_enum].short_opt)
- continue;
-
- if (sep)
- printf("\n.br\n");
-
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cname->name, opt_enum));
-
- val_enum = opt_names[opt_enum].val_enum;
-
- if (!val_names[val_enum].fn) {
- /* takes no arg */
- } else if (!val_names[val_enum].usage) {
- printf(" ");
- printf("\\fI");
- printf("%s", val_names[val_enum].name);
- printf("\\fP");
- } else {
- printf(" ");
- print_val_man(val_names[val_enum].usage);
- }
-
- sep = 1;
- }
-
- /* print those without short opts */
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
- if (!cname->all_options[opt_enum])
- continue;
-
- if (opt_names[opt_enum].short_opt)
- continue;
-
- if (sep)
- printf("\n.br\n");
-
- /* space alignment without short opt */
- printf(" ");
-
- printf(" \\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
-
- val_enum = opt_names[opt_enum].val_enum;
-
- if (!val_names[val_enum].fn) {
- /* takes no arg */
- } else if (!val_names[val_enum].usage) {
- printf(" ");
- printf("\\fI");
- printf("%s", val_names[val_enum].name);
- printf("\\fP");
- } else {
- printf(" ");
- print_val_man(val_names[val_enum].usage);
- }
-
- sep = 1;
- }
-}
-
-/*
- * All options used for a given command name, along with descriptions.
- * listed in order of:
- * 1. options that are not common to all lvm commands, alphabetically
- * 2. options common to all lvm commands, alphabetically
- */
-
-void print_man_all_options_desc(struct cmd_name *cname)
-{
- int opt_enum, val_enum;
- int print_common = 0;
- int sep = 0;
- int i;
-
- again:
- /*
- * Loop 1: print options that are not common to all lvm commands.
- * Loop 2: print options common to all lvm commands (lvm_all)
- */
-
- for (i = 0; i < ARG_COUNT; i++) {
- opt_enum = opt_names_alpha[i]->opt_enum;
-
- if (!cname->all_options[opt_enum])
- continue;
-
- if (!print_common && is_lvm_all_opt(opt_enum))
- continue;
-
- if (print_common && !is_lvm_all_opt(opt_enum))
- continue;
-
- if (sep)
- printf("\n.br\n");
-
- printf("\n.TP\n");
-
- if (opt_names[opt_enum].short_opt) {
- printf("\\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cname->name, opt_enum));
- } else {
- printf("\\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
- }
-
- val_enum = opt_names[opt_enum].val_enum;
-
- if (!val_names[val_enum].fn) {
- /* takes no arg */
- } else if (!val_names[val_enum].usage) {
- printf(" ");
- printf("\\fI");
- printf("%s", val_names[val_enum].name);
- printf("\\fP");
- } else {
- printf(" ");
- print_val_man(val_names[val_enum].usage);
- }
-
- if (opt_names[opt_enum].desc) {
- printf("\n");
- printf(".br\n");
- print_man_option_desc(cname, opt_enum);
- }
-
- sep = 1;
- }
-
- if (!print_common) {
- print_common = 1;
- goto again;
- }
-}
-
-void print_desc_man(const char *desc)
-{
- char buf[DESC_LINE] = {0};
- int di = 0;
- int bi = 0;
-
- for (di = 0; di < strlen(desc); di++) {
- if (desc[di] == '\0')
- break;
- if (desc[di] == '\n')
- continue;
-
- if (!strncmp(&desc[di], "DESC:", 5)) {
- if (bi) {
- printf("%s\n", buf);
- printf(".br\n");
- memset(buf, 0, sizeof(buf));
- bi = 0;
- }
- di += 5;
- continue;
- }
-
- if (!bi && desc[di] == ' ')
- continue;
-
- buf[bi++] = desc[di];
-
- if (bi == (DESC_LINE - 1))
- break;
- }
-
- if (bi) {
- printf("%s\n", buf);
- printf(".br\n");
- }
-}
-
-static char *upper_command_name(char *str)
-{
- static char str_upper[32];
- int i = 0;
-
- while (*str) {
- str_upper[i++] = toupper(*str);
- str++;
- }
- str_upper[i] = '\0';
- return str_upper;
-}
-
-void print_man_command(void)
-{
- struct cmd_name *cname;
- struct command *cmd, *prev_cmd = NULL;
- const char *desc;
- int i, j, ro, rp, oo, op;
-
- include_optional_opt_args(&lvm_all, "OO_USAGE_COMMON");
-
- printf(".TH %s 8 \"LVM TOOLS #VERSION#\" \"Sistina Software UK\"\n",
- man_command_name ? upper_command_name(man_command_name) : "LVM_COMMANDS");
-
- for (i = 0; i < cmd_count; i++) {
-
- cmd = &cmd_array[i];
-
- if (prev_cmd && strcmp(prev_cmd->name, cmd->name)) {
- printf("Common options:\n");
- printf(".\n");
- print_man_usage_common(prev_cmd);
-
- printf("\n");
- printf(".SH OPTIONS\n");
- printf(".br\n");
- print_man_all_options_desc(cname);
-
- prev_cmd = NULL;
- }
-
- if ((cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_man_secondary)
- continue;
-
- if (!(cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_man_primary)
- continue;
-
- if (man_command_name && strcmp(man_command_name, cmd->name))
- continue;
-
- if (!prev_cmd || strcmp(prev_cmd->name, cmd->name)) {
- printf(".SH NAME\n");
- printf(".\n");
- if ((desc = cmd_name_desc(cmd->name)))
- printf("%s \\- %s\n", cmd->name, desc);
- else
- printf("%s\n", cmd->name);
- printf(".br\n");
- printf(".P\n");
- printf(".\n");
- printf(".SH SYNOPSIS\n");
- printf(".br\n");
- printf(".P\n");
- printf(".\n");
- prev_cmd = cmd;
-
- if (!(cname = find_command_name(cmd->name)))
- return;
-
- if (cname->variant_has_ro && cname->variant_has_rp)
- printf("\\fB%s\\fP \\fIrequired_option_args\\fP \\fIrequired_position_args\\fP\n", cmd->name);
- else if (cname->variant_has_ro && !cname->variant_has_rp)
- printf("\\fB%s\\fP \\fIrequired_option_args\\fP\n", cmd->name);
- else if (!cname->variant_has_ro && cname->variant_has_rp)
- printf("\\fB%s\\fP \\fIrequired_position_args\\fP\n", cmd->name);
- else if (!cname->variant_has_ro && !cname->variant_has_rp)
- printf("\\fB%s\\fP\n", cmd->name);
-
- printf(".br\n");
-
- if (cname->variant_has_oo) {
- printf(" [ \\fIoptional_option_args\\fP ]\n");
- printf(".br\n");
- }
-
- if (cname->variant_has_op) {
- printf(" [ \\fIoptional_position_args\\fP ]\n");
- printf(".br\n");
- }
-
- printf(".P\n");
- printf("\n");
-
- /* listing them all when there's only 1 or 2 is just repetative */
- if (cname->variants > 2) {
- printf(".P\n");
- print_man_all_options_list(cname);
- printf("\n");
- printf(".P\n");
- printf("\n");
- }
-
- printf(".SH USAGE\n");
- printf(".br\n");
- printf(".P\n");
- printf(".\n");
- }
-
- if (cmd->desc) {
- print_desc_man(cmd->desc);
- printf(".P\n");
- }
-
- print_man_usage(cmd);
-
- if (i == (cmd_count - 1)) {
- printf("Common options:\n");
- printf(".\n");
- print_man_usage_common(cmd);
-
- printf("\n");
- printf(".SH OPTIONS\n");
- printf(".br\n");
- print_man_all_options_desc(cname);
-
- }
-
- printf("\n");
- continue;
- }
-}
-
-void print_command_struct(int only_usage)
-{
- struct command *cmd;
- int i, j, ro, rp, oo, op, ru, ruo, io;
-
- include_optional_opt_args(&lvm_all, "OO_USAGE_COMMON");
-
- printf("/* Do not edit. This file is generated by tools/create-commands */\n");
- printf("/* using command definitions from tools/command-lines.in */\n");
- printf("\n");
-
- for (i = 0; i < cmd_count; i++) {
- cmd = &cmd_array[i];
-
- if (only_usage) {
- print_usage(cmd);
- print_usage_common(cmd);
- printf("\n");
- continue;
- }
-
- printf("commands[%d].name = \"%s\";\n", i, cmd->name);
- printf("commands[%d].command_line_id = \"%s\";\n", i, cmd->command_line_id);
- printf("commands[%d].command_line_enum = %s_CMD;\n", i, cmd->command_line_id);
- printf("commands[%d].fn = %s;\n", i, cmd->name);
- printf("commands[%d].ro_count = %d;\n", i, cmd->ro_count);
- printf("commands[%d].rp_count = %d;\n", i, cmd->rp_count);
- printf("commands[%d].oo_count = %d;\n", i, cmd->oo_count);
- printf("commands[%d].op_count = %d;\n", i, cmd->op_count);
- printf("commands[%d].io_count = %d;\n", i, cmd->io_count);
- printf("commands[%d].rule_count = %d;\n", i, cmd->rule_count);
-
- if (cmd->cmd_flags)
- printf("commands[%d].cmd_flags = %s;\n", i, cmd_flags_to_str(cmd->cmd_flags));
- else
- printf("commands[%d].cmd_flags = 0;\n", i, cmd_flags_to_str(cmd->cmd_flags));
-
- printf("commands[%d].desc = \"%s\";\n", i, cmd->desc ?: "");
- printf("commands[%d].usage = ", i);
- print_usage(cmd);
-
- if (cmd->oo_count) {
- printf("commands[%d].usage_common = ", i);
- print_usage_common(cmd);
- } else {
- printf("commands[%d].usage_common = \"NULL\";\n", i);
- }
-
- if (cmd->ro_count) {
- for (ro = 0; ro < cmd->ro_count; ro++) {
- printf("commands[%d].required_opt_args[%d].opt = %s;\n",
- i, ro, opt_to_enum_str(cmd->required_opt_args[ro].opt));
-
- if (!cmd->required_opt_args[ro].def.val_bits)
- continue;
-
- printf("commands[%d].required_opt_args[%d].def.val_bits = %s;\n",
- i, ro, val_bits_to_str(cmd->required_opt_args[ro].def.val_bits));
-
- if (cmd->required_opt_args[ro].def.lvt_bits)
- printf("commands[%d].required_opt_args[%d].def.lvt_bits = %s;\n",
- i, ro, lvt_bits_to_str(cmd->required_opt_args[ro].def.lvt_bits));
-
- if (cmd->required_opt_args[ro].def.flags)
- printf("commands[%d].required_opt_args[%d].def.flags = %s;\n",
- i, ro, flags_to_str(cmd->required_opt_args[ro].def.flags));
-
- if (val_bit_is_set(cmd->required_opt_args[ro].def.val_bits, constnum_VAL))
- printf("commands[%d].required_opt_args[%d].def.num = %d;\n",
- i, ro, cmd->required_opt_args[ro].def.num);
-
- if (val_bit_is_set(cmd->required_opt_args[ro].def.val_bits, conststr_VAL))
- printf("commands[%d].required_opt_args[%d].def.str = \"%s\";\n",
- i, ro, cmd->required_opt_args[ro].def.str ?: "NULL");
- }
- }
-
- if (cmd->rp_count) {
- for (rp = 0; rp < cmd->rp_count; rp++) {
- printf("commands[%d].required_pos_args[%d].pos = %d;\n",
- i, rp, cmd->required_pos_args[rp].pos);
-
- if (!cmd->required_pos_args[rp].def.val_bits)
- continue;
-
- printf("commands[%d].required_pos_args[%d].def.val_bits = %s;\n",
- i, rp, val_bits_to_str(cmd->required_pos_args[rp].def.val_bits));
-
- if (cmd->required_pos_args[rp].def.lvt_bits)
- printf("commands[%d].required_pos_args[%d].def.lvt_bits = %s;\n",
- i, rp, lvt_bits_to_str(cmd->required_pos_args[rp].def.lvt_bits));
-
- if (cmd->required_pos_args[rp].def.flags)
- printf("commands[%d].required_pos_args[%d].def.flags = %s;\n",
- i, rp, flags_to_str(cmd->required_pos_args[rp].def.flags));
-
- if (val_bit_is_set(cmd->required_pos_args[rp].def.val_bits, constnum_VAL))
- printf("commands[%d].required_pos_args[%d].def.num = %d;\n",
- i, rp, cmd->required_pos_args[rp].def.num);
-
- if (val_bit_is_set(cmd->required_pos_args[rp].def.val_bits, conststr_VAL))
- printf("commands[%d].required_pos_args[%d].def.str = \"%s\";\n",
- i, rp, cmd->required_pos_args[rp].def.str ?: "NULL");
- }
- }
-
- if (cmd->oo_count) {
- for (oo = 0; oo < cmd->oo_count; oo++) {
- printf("commands[%d].optional_opt_args[%d].opt = %s;\n",
- i, oo, opt_to_enum_str(cmd->optional_opt_args[oo].opt));
-
- if (!cmd->optional_opt_args[oo].def.val_bits)
- continue;
-
- printf("commands[%d].optional_opt_args[%d].def.val_bits = %s;\n",
- i, oo, val_bits_to_str(cmd->optional_opt_args[oo].def.val_bits));
-
- if (cmd->optional_opt_args[oo].def.lvt_bits)
- printf("commands[%d].optional_opt_args[%d].def.lvt_bits = %s;\n",
- i, oo, lvt_bits_to_str(cmd->optional_opt_args[oo].def.lvt_bits));
-
- if (cmd->optional_opt_args[oo].def.flags)
- printf("commands[%d].optional_opt_args[%d].def.flags = %s;\n",
- i, oo, flags_to_str(cmd->optional_opt_args[oo].def.flags));
-
- if (val_bit_is_set(cmd->optional_opt_args[oo].def.val_bits, constnum_VAL))
- printf("commands[%d].optional_opt_args[%d].def.num = %d;\n",
- i, oo, cmd->optional_opt_args[oo].def.num);
-
- if (val_bit_is_set(cmd->optional_opt_args[oo].def.val_bits, conststr_VAL))
- printf("commands[%d].optional_opt_args[%d].def.str = \"%s\";\n",
- i, oo, cmd->optional_opt_args[oo].def.str ?: "NULL");
- }
- }
-
- if (cmd->io_count) {
- for (io = 0; io < cmd->io_count; io++) {
- printf("commands[%d].ignore_opt_args[%d].opt = %s;\n",
- i, io, opt_to_enum_str(cmd->ignore_opt_args[io].opt));
-
- if (!cmd->ignore_opt_args[io].def.val_bits)
- continue;
-
- printf("commands[%d].ignore_opt_args[%d].def.val_bits = %s;\n",
- i, io, val_bits_to_str(cmd->ignore_opt_args[io].def.val_bits));
-
- if (cmd->ignore_opt_args[io].def.lvt_bits)
- printf("commands[%d].ignore_opt_args[%d].def.lvt_bits = %s;\n",
- i, io, lvt_bits_to_str(cmd->ignore_opt_args[io].def.lvt_bits));
-
- if (cmd->ignore_opt_args[io].def.flags)
- printf("commands[%d].ignore_opt_args[%d].def.flags = %s;\n",
- i, io, flags_to_str(cmd->ignore_opt_args[io].def.flags));
-
- if (val_bit_is_set(cmd->ignore_opt_args[io].def.val_bits, constnum_VAL))
- printf("commands[%d].ignore_opt_args[%d].def.num = %d;\n",
- i, io, cmd->ignore_opt_args[io].def.num);
-
- if (val_bit_is_set(cmd->ignore_opt_args[io].def.val_bits, conststr_VAL))
- printf("commands[%d].ignore_opt_args[%d].def.str = \"%s\";\n",
- i, io, cmd->ignore_opt_args[io].def.str ?: "NULL");
- }
- }
-
- if (cmd->op_count) {
- for (op = 0; op < cmd->op_count; op++) {
- printf("commands[%d].optional_pos_args[%d].pos = %d;\n",
- i, op, cmd->optional_pos_args[op].pos);
-
- if (!cmd->optional_pos_args[op].def.val_bits)
- continue;
-
- printf("commands[%d].optional_pos_args[%d].def.val_bits = %s;\n",
- i, op, val_bits_to_str(cmd->optional_pos_args[op].def.val_bits));
-
- if (cmd->optional_pos_args[op].def.lvt_bits)
- printf("commands[%d].optional_pos_args[%d].def.lvt_bits = %s;\n",
- i, op, lvt_bits_to_str(cmd->optional_pos_args[op].def.lvt_bits));
-
- if (cmd->optional_pos_args[op].def.flags)
- printf("commands[%d].optional_pos_args[%d].def.flags = %s;\n",
- i, op, flags_to_str(cmd->optional_pos_args[op].def.flags));
-
- if (val_bit_is_set(cmd->optional_pos_args[op].def.val_bits, constnum_VAL))
- printf("commands[%d].optional_pos_args[%d].def.num = %d;\n",
- i, op, cmd->optional_pos_args[op].def.num);
-
- if (val_bit_is_set(cmd->optional_pos_args[op].def.val_bits, conststr_VAL))
- printf("commands[%d].optional_pos_args[%d].def.str = \"%s\";\n",
- i, op, cmd->optional_pos_args[op].def.str ?: "NULL");
- }
- }
-
- if (cmd->rule_count) {
- for (ru = 0; ru < cmd->rule_count; ru++) {
-
- printf("commands[%d].rules[%d].opts_count = %d;\n", i, ru, cmd->rules[ru].opts_count);
-
- if (cmd->rules[ru].opts_count) {
- printf("static int _command%d_rule%d_opts[] = { ", i, ru);
- for (ruo = 0; ruo < cmd->rules[ru].opts_count; ruo++) {
- if (ruo)
- printf(", ");
- printf("%s", opt_to_enum_str(cmd->rules[ru].opts[ruo]));
- }
- printf(" };\n");
- printf("commands[%d].rules[%d].opts = _command%d_rule%d_opts;\n", i, ru, i, ru);
- } else {
- printf("commands[%d].rules[%d].opts = NULL;\n", i, ru);
- }
-
- printf("commands[%d].rules[%d].check_opts_count = %d;\n", i, ru, cmd->rules[ru].check_opts_count);
-
- if (cmd->rules[ru].check_opts_count) {
- printf("static int _command%d_rule%d_check_opts[] = { ", i, ru);
- for (ruo = 0; ruo < cmd->rules[ru].check_opts_count; ruo++) {
- if (ruo)
- printf(",");
- printf("%s ", opt_to_enum_str(cmd->rules[ru].check_opts[ruo]));
- }
- printf(" };\n");
- printf("commands[%d].rules[%d].check_opts = _command%d_rule%d_check_opts;\n", i, ru, i, ru);
- } else {
- printf("commands[%d].rules[%d].check_opts = NULL;\n", i, ru);
- }
-
- printf("commands[%d].rules[%d].lvt_bits = %s;\n", i, ru,
- cmd->rules[ru].lvt_bits ? lvt_bits_to_str(cmd->rules[ru].lvt_bits) : "0");
-
- printf("commands[%d].rules[%d].lvp_bits = %s;\n", i, ru,
- cmd->rules[ru].lvp_bits ? lvp_bits_to_str(cmd->rules[ru].lvp_bits) : "0");
-
- printf("commands[%d].rules[%d].rule = %s;\n", i, ru,
- rule_to_define_str(cmd->rules[ru].rule));
-
- printf("commands[%d].rules[%d].check_lvt_bits = %s;\n", i, ru,
- cmd->rules[ru].check_lvt_bits ? lvt_bits_to_str(cmd->rules[ru].check_lvt_bits) : "0");
-
- printf("commands[%d].rules[%d].check_lvp_bits = %s;\n", i, ru,
- cmd->rules[ru].check_lvp_bits ? lvp_bits_to_str(cmd->rules[ru].check_lvp_bits) : "0");
- }
- }
-
- printf("\n");
- }
-}
-
-struct cmd_pair {
- int i, j;
-};
-
-static void print_ambiguous(void)
-{
- struct command *cmd, *dup;
- struct cmd_pair dups[64] = { 0 };
- int found = 0;
- int i, j, f, ro, rp;
-
- for (i = 0; i < cmd_count; i++) {
- cmd = &cmd_array[i];
-
- for (j = 0; j < cmd_count; j++) {
- dup = &cmd_array[j];
-
- if (i == j)
- continue;
- if (strcmp(cmd->name, dup->name))
- continue;
- if (cmd->ro_count != dup->ro_count)
- continue;
- if (cmd->rp_count != dup->rp_count)
- continue;
-
- for (ro = 0; ro < cmd->ro_count; ro++) {
- if (!opt_arg_matches(&cmd->required_opt_args[ro],
- &dup->required_opt_args[ro]))
- goto next;
- }
-
- for (rp = 0; rp < cmd->rp_count; rp++) {
- if (!pos_arg_matches(&cmd->required_pos_args[rp],
- &dup->required_pos_args[rp]))
- goto next;
- }
-
- for (f = 0; f < found; f++) {
- if ((dups[f].i == j) && (dups[f].j == i))
- goto next;
- }
-
- printf("Ambiguous commands %d and %d:\n", i, j);
- print_usage(cmd);
- print_usage(dup);
- printf("\n");
-
- dups[found].i = i;
- dups[found].j = j;
- found++;
-next:
- ;
- }
- }
-}
-
-static int long_name_compare(const void *on1, const void *on2)
-{
- struct opt_name **optname1 = (void *)on1;
- struct opt_name **optname2 = (void *)on2;
- return strcmp((*optname1)->long_opt + 2, (*optname2)->long_opt + 2);
-}
-
-static void create_opt_names_alpha(void)
-{
- int i;
-
- for (i = 0; i < ARG_COUNT; i++)
- opt_names_alpha[i] = &opt_names[i];
-
- qsort(opt_names_alpha, ARG_COUNT, sizeof(long), long_name_compare);
-}
-
-void print_command_list(void)
-{
- int i;
-
- for (i = 0; i < MAX_CMD_NAMES; i++) {
- if (!cmd_names[i].name) {
- printf("found %d command names\n", i);
- break;
- }
- printf("%s\n", cmd_names[i].name);
- }
-}
-
-void print_option_list(void)
-{
- int i;
-
- for (i = 0; i < ARG_COUNT; i++)
- printf("%d %s %s %c (%d)\n",
- opt_names[i].opt_enum, opt_names[i].name,
- opt_names[i].long_opt, opt_names[i].short_opt ?: ' ',
- opt_names[i].short_opt ? opt_names[i].short_opt : 0);
-}
-
-void print_option_alpha_list(void)
-{
- int i;
-
- for (i = 0; i < ARG_COUNT; i++)
- printf("%d %s %s %c (%d)\n",
- opt_names_alpha[i]->opt_enum, opt_names_alpha[i]->name,
- opt_names_alpha[i]->long_opt, opt_names_alpha[i]->short_opt ?: ' ',
- opt_names_alpha[i]->short_opt ? opt_names_alpha[i]->short_opt : 0);
-}
-
-static void print_help(int argc, char *argv[])
-{
- printf("%s [options] --output <format> <filename>\n", argv[0]);
- printf("\n");
- printf("output formats:\n");
- printf("struct: print C structures for command-lines.h\n");
- printf("count: print defines and enums for command-lines-count.h\n");
- printf("ambiguous: print commands differing only by LV types\n");
- printf("usage: print usage format.\n");
- printf("expanded: print expanded input format.\n");
- printf("man: print man page format.\n");
- printf("\n");
- printf("options:\n");
- printf("-c|--man-command <commandname> man output for one command name\n");
-}
-
-int main(int argc, char *argv[])
-{
- char *outputformat = NULL;
- char *inputfile = NULL;
- FILE *file;
- struct command *cmd;
- char line[MAX_LINE];
- char line_orig[MAX_LINE];
- const char *name;
- char *line_argv[MAX_LINE_ARGC];
- char *n;
- int line_argc;
- int prev_was_oo_def = 0;
- int prev_was_oo = 0;
- int prev_was_op = 0;
-
- if (argc < 2) {
- print_help(argc, argv);
- exit(EXIT_FAILURE);
- }
-
- create_opt_names_alpha();
-
- if (!strcmp(argv[1], "debug")) {
- print_command_list();
- print_option_list();
- print_option_alpha_list();
- return 0;
- }
-
- static struct option long_options[] = {
- {"help", no_argument, 0, 'h' },
- {"output", required_argument, 0, 'o' },
- {"man-primary", required_argument, 0, 'p' },
- {"man-secondary", required_argument, 0, 's' },
- {"man-command", required_argument, 0, 'c' },
- {0, 0, 0, 0 }
- };
-
- while (1) {
- int c;
- int option_index = 0;
-
- c = getopt_long(argc, argv, "ho:p:s:c:",
- long_options, &option_index);
- if (c == -1)
- break;
-
- switch (c) {
- case '0':
- break;
- case 'h':
- print_help(argc, argv);
- exit(EXIT_SUCCESS);
- case 'o':
- outputformat = strdup(optarg);
- break;
- case 'p':
- include_man_primary = atoi(optarg);
- break;
- case 's':
- include_man_secondary = atoi(optarg);
- break;
- case 'c':
- man_command_name = strdup(optarg);
- break;
- }
- }
-
- if (optind < argc)
- inputfile = argv[optind];
- else {
- printf("Missing filename.\n");
- return 0;
- }
-
- if (!(file = fopen(inputfile, "r"))) {
- printf("Cannot open %s\n", argv[1]);
- return -1;
- }
-
- while (fgets(line, MAX_LINE, file)) {
- if (line[0] == '#')
- continue;
- if (line[0] == '\n')
- continue;
- if (line[0] == '-' && line[1] == '-' && line[2] == '-')
- continue;
-
- if ((n = strchr(line, '\n')))
- *n = '\0';
-
- memcpy(line_orig, line, sizeof(line));
- split_line(line, &line_argc, line_argv, ' ');
-
- if (!line_argc)
- continue;
-
- /* command ... */
- if ((name = is_command_name(line_argv[0]))) {
- if (cmd_count >= MAX_CMDS) {
- printf("MAX_CMDS too small\n");
- return -1;
- }
- cmd = &cmd_array[cmd_count++];
- cmd->name = name;
- cmd->pos_count = 1;
- add_required_line(cmd, line_argc, line_argv);
-
- /* Every cmd gets the OO_ALL options */
- include_optional_opt_args(cmd, "OO_ALL:");
- continue;
- }
-
- if (is_desc_line(line_argv[0])) {
- char *desc = strdup(line_orig);
- if (cmd->desc) {
- int newlen = strlen(cmd->desc) + strlen(desc) + 2;
- char *newdesc = malloc(newlen);
- memset(newdesc, 0, newlen);
- snprintf(newdesc, newlen, "%s %s", cmd->desc, desc);
- cmd->desc = newdesc;
- free(desc);
- } else
- cmd->desc = desc;
- continue;
- }
-
- if (is_flags_line(line_argv[0])) {
- add_flags(cmd, line_orig);
- continue;
- }
-
- if (is_rule_line(line_argv[0])) {
- add_rule(cmd, line_orig);
- continue;
- }
-
- if (is_id_line(line_argv[0])) {
- cmd->command_line_id = strdup(line_argv[1]);
- continue;
- }
-
- /* OO_FOO: ... */
- if (is_oo_definition(line_argv[0])) {
- add_oo_definition_line(line_argv[0], line_orig);
- prev_was_oo_def = 1;
- prev_was_oo = 0;
- prev_was_op = 0;
- continue;
- }
-
- /* OO: ... */
- if (is_oo_line(line_argv[0])) {
- add_optional_opt_line(cmd, line_argc, line_argv);
- prev_was_oo_def = 0;
- prev_was_oo = 1;
- prev_was_op = 0;
- continue;
- }
-
- /* OP: ... */
- if (is_op_line(line_argv[0])) {
- add_optional_pos_line(cmd, line_argc, line_argv);
- prev_was_oo_def = 0;
- prev_was_oo = 0;
- prev_was_op = 1;
- continue;
- }
-
- /* IO: ... */
- if (is_io_line(line_argv[0])) {
- add_ignore_opt_line(cmd, line_argc, line_argv);
- prev_was_oo = 0;
- prev_was_op = 0;
- continue;
- }
-
- /* handle OO_FOO:, OO:, OP: continuing on multiple lines */
-
- if (prev_was_oo_def) {
- append_oo_definition_line(line_orig);
- continue;
- }
-
- if (prev_was_oo) {
- add_optional_opt_line(cmd, line_argc, line_argv);
- continue;
- }
-
- if (prev_was_op) {
- add_optional_pos_line(cmd, line_argc, line_argv);
- continue;
- }
- }
-
- fclose(file);
-
- factor_common_options();
-
- if (!outputformat)
- print_command_struct(1);
- else if (!strcmp(outputformat, "struct")) {
- print_command_struct(0);
- print_ambiguous();
- }
- else if (!strcmp(outputformat, "count"))
- print_command_count();
- else if (!strcmp(outputformat, "usage"))
- print_command_struct(1);
- else if (!strcmp(outputformat, "expanded"))
- print_expanded();
- else if (!strcmp(outputformat, "ambiguous"))
- print_ambiguous();
- else if (!strcmp(outputformat, "man"))
- print_man_command();
- else
- print_help(argc, argv);
-
- return 0;
-}
-
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=013c080756dcc2fa…
Commit: 013c080756dcc2faaecc80b489d85d7ab1384cbf
Parent: d9d5b8414bb5ead7dbd223606a735497c0c069f9
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Jan 13 15:08:51 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
command struct: remove command name refs
Change run time access to the command_name struct
cmd->cname instead of indirectly through
cmd->command->cname. This removes the two run time
fields from struct command.
---
lib/commands/toolcontext.h | 1 +
tools/command.h | 4 ----
tools/lvconvert.c | 4 ++--
tools/lvmcmdline.c | 23 +++++++++++------------
tools/pvscan.c | 2 +-
tools/toollib.c | 18 +++++++++---------
tools/vgchange.c | 2 +-
tools/vgimportclone.c | 2 +-
8 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
index 2dc1c28..20b24f9 100644
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -89,6 +89,7 @@ struct cmd_context {
*/
const char *cmd_line;
const char *name; /* needed before cmd->command is set */
+ struct command_name *cname;
struct command *command;
char **argv;
struct arg_values *opt_arg_values;
diff --git a/tools/command.h b/tools/command.h
index d66ec52..c9be260 100644
--- a/tools/command.h
+++ b/tools/command.h
@@ -164,13 +164,9 @@ struct command {
const char *command_line_id;
int command_line_enum; /* <command_line_id>_CMD */
- struct command_name *cname;
-
command_fn fn; /* old style */
struct command_function *functions; /* new style */
- unsigned int flags; /* copied from command_name.flags from commands.h */
-
unsigned int cmd_flags; /* CMD_FLAG_ */
/* definitions of opt/pos args */
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 757e8b4..1d7dc1b 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -4512,7 +4512,7 @@ static int _lvconvert_merge_mirror_images_single(struct cmd_context *cmd,
int lvconvert_merge_mirror_images_cmd(struct cmd_context *cmd, int argc, char **argv)
{
/* arg can be a VG name, which is the standard option usage */
- cmd->command->flags &= ~GET_VGNAME_FROM_OPTIONS;
+ cmd->cname->flags &= ~GET_VGNAME_FROM_OPTIONS;
return process_each_lv(cmd, cmd->position_argc, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
NULL, &_lvconvert_visible_check, &_lvconvert_merge_mirror_images_single);
@@ -4552,7 +4552,7 @@ int lvconvert_merge_cmd(struct cmd_context *cmd, int argc, char **argv)
handle->custom_handle = &lr;
- cmd->command->flags &= ~GET_VGNAME_FROM_OPTIONS;
+ cmd->cname->flags &= ~GET_VGNAME_FROM_OPTIONS;
ret = process_each_lv(cmd, cmd->position_argc, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
handle, NULL, &_lvconvert_merge_generic_single);
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index ddc87f9..dda4b16 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1092,7 +1092,6 @@ static void _define_commands(void)
void lvm_register_commands(void)
{
- struct command_name *cname;
int i;
memset(&commands, 0, sizeof(commands));
@@ -1102,13 +1101,8 @@ void lvm_register_commands(void)
_cmdline.commands = commands;
_cmdline.num_commands = COMMAND_COUNT;
- for (i = 0; i < COMMAND_COUNT; i++) {
- if (!(cname = _find_command_name(commands[i].name)))
- log_error(INTERNAL_ERROR "Failed to find command name %s.", commands[i].name);
- commands[i].cname = cname;
- commands[i].flags = cname->flags;
+ for (i = 0; i < COMMAND_COUNT; i++)
commands[i].functions = _find_command_function(commands[i].command_line_enum);
- }
_cmdline.command_names = command_names;
@@ -2193,7 +2187,7 @@ static int _get_settings(struct cmd_context *cmd)
cmd->current_settings.archive = arg_int_value(cmd, autobackup_ARG, cmd->current_settings.archive);
cmd->current_settings.backup = arg_int_value(cmd, autobackup_ARG, cmd->current_settings.backup);
- cmd->current_settings.cache_vgmetadata = cmd->command->flags & CACHE_VGMETADATA ? 1 : 0;
+ cmd->current_settings.cache_vgmetadata = cmd->cname->flags & CACHE_VGMETADATA ? 1 : 0;
if (arg_is_set(cmd, readonly_ARG)) {
cmd->current_settings.activation = 0;
@@ -2201,7 +2195,7 @@ static int _get_settings(struct cmd_context *cmd)
cmd->current_settings.backup = 0;
}
- if (cmd->command->flags & LOCKD_VG_SH)
+ if (cmd->cname->flags & LOCKD_VG_SH)
cmd->lockd_vg_default_sh = 1;
cmd->partial_activation = 0;
@@ -2613,7 +2607,7 @@ static int _init_lvmlockd(struct cmd_context *cmd)
static int _cmd_no_meta_proc(struct cmd_context *cmd)
{
- return cmd->command->flags & NO_METADATA_PROCESSING;
+ return cmd->cname->flags & NO_METADATA_PROCESSING;
}
int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
@@ -2688,6 +2682,11 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
log_debug("Parsing: %s", cmd->cmd_line);
+ if (!(cmd->cname = _find_command_name(cmd->name))) {
+ log_error("Command name not found.\n");
+ return EINVALID_CMD_LINE;
+ }
+
if (!(cmd->command = _find_command(cmd, cmd->name, &argc, argv)))
return EINVALID_CMD_LINE;
@@ -2772,7 +2771,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
}
if (cmd->metadata_read_only &&
- !(cmd->command->flags & PERMITTED_READ_ONLY)) {
+ !(cmd->cname->flags & PERMITTED_READ_ONLY)) {
log_error("%s: Command not permitted while global/metadata_read_only "
"is set.", cmd->cmd_line);
goto out;
@@ -2832,7 +2831,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
* In this case, disable the *use* of lvmetad by this command, reverting to
* disk scanning.
*/
- if (lvmetad_used() && !(cmd->command->flags & NO_LVMETAD_AUTOSCAN)) {
+ if (lvmetad_used() && !(cmd->cname->flags & NO_LVMETAD_AUTOSCAN)) {
if (cmd->include_foreign_vgs || !lvmetad_token_matches(cmd)) {
if (lvmetad_used() && !lvmetad_pvscan_all_devs(cmd, cmd->include_foreign_vgs ? 1 : 0)) {
log_warn("WARNING: Not using lvmetad because cache update failed.");
diff --git a/tools/pvscan.c b/tools/pvscan.c
index e2b0a83..ca33a2a 100644
--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -284,7 +284,7 @@ static int _pvscan_autoactivate(struct cmd_context *cmd, struct pvscan_aa_params
handle->custom_handle = pp;
if (all_vgs) {
- cmd->command->flags |= ALL_VGS_IS_DEFAULT;
+ cmd->cname->flags |= ALL_VGS_IS_DEFAULT;
pp->refresh_all = 1;
}
diff --git a/tools/toollib.c b/tools/toollib.c
index 36599e0..2c0096f 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -2093,7 +2093,7 @@ static void _choose_vgs_to_process(struct cmd_context *cmd,
* matches the UUID of a VG. (--select should generally
* be used to select a VG by uuid instead.)
*/
- if (!found && (cmd->command->flags & ALLOW_UUID_AS_NAME))
+ if (!found && (cmd->cname->flags & ALLOW_UUID_AS_NAME))
arg_is_uuid = id_read_format_try(&id, sl->str);
if (!found && arg_is_uuid) {
@@ -2162,7 +2162,7 @@ int process_each_vg(struct cmd_context *cmd,
struct dm_list arg_vgnames; /* str_list */
struct dm_list vgnameids_on_system; /* vgnameid_list */
struct dm_list vgnameids_to_process; /* vgnameid_list */
- int enable_all_vgs = (cmd->command->flags & ALL_VGS_IS_DEFAULT);
+ int enable_all_vgs = (cmd->cname->flags & ALL_VGS_IS_DEFAULT);
int process_all_vgs_on_system = 0;
int ret_max = ECMD_PROCESSED;
int ret;
@@ -2209,7 +2209,7 @@ int process_each_vg(struct cmd_context *cmd,
* label scan to be done. get_vgnameids() will scan labels
* (when not using lvmetad).
*/
- if (cmd->command->flags & REQUIRES_FULL_LABEL_SCAN) {
+ if (cmd->cname->flags & REQUIRES_FULL_LABEL_SCAN) {
dev_cache_full_scan(cmd->full_filter);
lvmcache_force_next_label_scan();
}
@@ -3655,7 +3655,7 @@ int process_each_lv(struct cmd_context *cmd,
struct dm_list arg_lvnames; /* str_list */
struct dm_list vgnameids_on_system; /* vgnameid_list */
struct dm_list vgnameids_to_process; /* vgnameid_list */
- int enable_all_vgs = (cmd->command->flags & ALL_VGS_IS_DEFAULT);
+ int enable_all_vgs = (cmd->cname->flags & ALL_VGS_IS_DEFAULT);
int process_all_vgs_on_system = 0;
int ret_max = ECMD_PROCESSED;
int ret;
@@ -3674,7 +3674,7 @@ int process_each_lv(struct cmd_context *cmd,
/*
* Find any LVs, VGs or tags explicitly provided on the command line.
*/
- if (cmd->command->flags & GET_VGNAME_FROM_OPTIONS)
+ if (cmd->cname->flags & GET_VGNAME_FROM_OPTIONS)
ret = _get_arg_lvnames_using_options(cmd, argc, argv, &arg_vgnames, &arg_lvnames, &arg_tags);
else
ret = _get_arg_lvnames(cmd, argc, argv, one_vgname, one_lvname, &arg_vgnames, &arg_lvnames, &arg_tags);
@@ -4032,7 +4032,7 @@ static int _process_duplicate_pvs(struct cmd_context *cmd,
if (!process_all_devices && !dil)
continue;
- if (!(cmd->command->flags & ENABLE_DUPLICATE_DEVS))
+ if (!(cmd->cname->flags & ENABLE_DUPLICATE_DEVS))
continue;
/*
@@ -4387,7 +4387,7 @@ int process_each_pv(struct cmd_context *cmd,
goto_out;
}
- if ((cmd->command->flags & DISALLOW_TAG_ARGS) && !dm_list_empty(&arg_tags)) {
+ if ((cmd->cname->flags & DISALLOW_TAG_ARGS) && !dm_list_empty(&arg_tags)) {
log_error("Tags cannot be used with this command.");
return ECMD_FAILED;
}
@@ -4396,7 +4396,7 @@ int process_each_pv(struct cmd_context *cmd,
process_all_pvs = dm_list_empty(&arg_pvnames) && dm_list_empty(&arg_tags);
- process_all_devices = process_all_pvs && (cmd->command->flags & ENABLE_ALL_DEVS) && all_is_set;
+ process_all_devices = process_all_pvs && (cmd->cname->flags & ENABLE_ALL_DEVS) && all_is_set;
/* Needed for a current listing of the global VG namespace. */
if (!only_this_vgname && !lockd_gl(cmd, "sh", 0)) {
@@ -5285,7 +5285,7 @@ int pvcreate_each_device(struct cmd_context *cmd,
struct pv_list *vgpvl;
const char *pv_name;
int consistent = 0;
- int must_use_all = (cmd->command->flags & MUST_USE_ALL_ARGS);
+ int must_use_all = (cmd->cname->flags & MUST_USE_ALL_ARGS);
int found;
unsigned i;
diff --git a/tools/vgchange.c b/tools/vgchange.c
index 4cf8a3c..2a8f868 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -1095,7 +1095,7 @@ static int _lockd_vgchange(struct cmd_context *cmd, int argc, char **argv)
*/
if (arg_is_set(cmd, systemid_ARG) || arg_is_set(cmd, locktype_ARG))
- cmd->command->flags &= ~ALL_VGS_IS_DEFAULT;
+ cmd->cname->flags &= ~ALL_VGS_IS_DEFAULT;
if (arg_is_set(cmd, systemid_ARG) || arg_is_set(cmd, locktype_ARG)) {
/*
diff --git a/tools/vgimportclone.c b/tools/vgimportclone.c
index b23b14e..1f86ad6 100644
--- a/tools/vgimportclone.c
+++ b/tools/vgimportclone.c
@@ -240,7 +240,7 @@ int vgimportclone(struct cmd_context *cmd, int argc, char **argv)
*/
log_debug("Finding devices to import.");
- cmd->command->flags |= ENABLE_DUPLICATE_DEVS;
+ cmd->cname->flags |= ENABLE_DUPLICATE_DEVS;
process_each_pv(cmd, argc, argv, NULL, 0, READ_ALLOW_EXPORTED, handle, _vgimportclone_pv_single);
if (vp.found_args != argc) {
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d9d5b8414bb5ead7…
Commit: d9d5b8414bb5ead7dbd223606a735497c0c069f9
Parent: 9a0f0c70bf59a5cd07828ff39e5ff04b4a5411ad
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Jan 13 14:51:50 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
command.h comment tidying
---
tools/command.h | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/tools/command.h b/tools/command.h
index e4ce989..d66ec52 100644
--- a/tools/command.h
+++ b/tools/command.h
@@ -110,7 +110,6 @@ struct pos_arg {
};
/*
- *
* Commands using a given command definition must follow a set
* of rules. If a given command+LV matches the conditions in
* opts/lvt_bits/lvp_bits, then the checks are applied.
@@ -133,10 +132,11 @@ struct cmd_rule {
uint32_t rule; /* RULE_INVALID, RULE_REQUIRE: check values must [not] be true */
int opts_count; /* entries in opts[] */
int check_opts_count; /* entries in check_opts[] */
-
};
/*
+ * Array sizes
+ *
* CMD_RO_ARGS needs to accomodate a list of options,
* of which one is required after which the rest are
* optional.
@@ -152,8 +152,8 @@ struct cmd_rule {
* one or more from required_opt_args is required,
* then the rest are optional.
*/
-#define CMD_FLAG_ONE_REQUIRED_OPT 1
-#define CMD_FLAG_SECONDARY_SYNTAX 2
+#define CMD_FLAG_ONE_REQUIRED_OPT 1 /* lvchange/vgchage require one item from required_opt_args */
+#define CMD_FLAG_SECONDARY_SYNTAX 2 /* allows syntax variants to be suppressed in certain output */
/* a register of the lvm commands */
struct command {
@@ -197,11 +197,9 @@ struct command {
int rp_count;
int op_count;
int io_count;
-
- /* used for processing current position */
- int pos_count;
-
int rule_count;
+
+ int pos_count; /* temp counter used by create-command */
};
#endif
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9a0f0c70bf59a5cd…
Commit: 9a0f0c70bf59a5cd07828ff39e5ff04b4a5411ad
Parent: 23a1ced4397b699ae572570ec772683d7003de6f
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Jan 13 12:02:06 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvm shell: clear argv for each command
---
tools/lvm.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/tools/lvm.c b/tools/lvm.c
index aae6da0..5fd9918 100644
--- a/tools/lvm.c
+++ b/tools/lvm.c
@@ -210,7 +210,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline)
{
log_report_t saved_log_report_state = log_get_report_state();
char *orig_command_log_selection = NULL;
- int is_lastlog_cmd = 0, argc, ret;
+ int is_lastlog_cmd = 0, argc, ret, i;
char *input = NULL, *args[MAX_ARGS], **argv;
rl_readline_name = "lvm";
@@ -262,6 +262,9 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline)
add_history(input);
+ for (i = 0; i < MAX_ARGS; i++)
+ args[i] = NULL;
+
argv = args;
if (lvm_split(input, &argc, argv, MAX_ARGS) == MAX_ARGS) {
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=23a1ced4397b699a…
Commit: 23a1ced4397b699ae572570ec772683d7003de6f
Parent: 3642deb4f3b7ade1109aeb0ef2cffb38f31ff7c6
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Jan 13 11:31:49 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
help: accept positional args
lvm help <commandname> ...
---
tools/command-lines.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index f99cb8c..81c70ba 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -1589,6 +1589,7 @@ formats
ID: formats_general
help
+OP: String ...
ID: help_general
version
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3642deb4f3b7ade1…
Commit: 3642deb4f3b7ade1109aeb0ef2cffb38f31ff7c6
Parent: 4d2c3502e79e34a5cf0fdb65c2a4df23aa1b2ecb
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Jan 12 14:36:31 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
fix lvmcmdline warning
declaration of ���usage��� shadows a globa
---
tools/lvmcmdline.c | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index afc941b..ddc87f9 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1288,7 +1288,7 @@ static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp
#define HELP_LINE_SIZE 1024
-static void _print_usage(const char *usage, int only_required)
+static void _print_usage(const char *usage_str, int only_required)
{
char buf[HELP_LINE_SIZE];
int optional_ui = 0;
@@ -1296,7 +1296,7 @@ static void _print_usage(const char *usage, int only_required)
int ui;
int bi;
- if (!usage || !strlen(usage))
+ if (!usage_str || !strlen(usage_str))
return;
/*
@@ -1313,32 +1313,32 @@ static void _print_usage(const char *usage, int only_required)
memset(buf, 0, sizeof(buf));
bi = 0;
- for (ui = 0; ui < strlen(usage); ui++) {
- if (!bi && ((usage[ui] == ' ') || (usage[ui] == '\n')))
+ for (ui = 0; ui < strlen(usage_str); ui++) {
+ if (!bi && ((usage_str[ui] == ' ') || (usage_str[ui] == '\n')))
continue;
/* The first "[ " indicates the start of the optional opt_args. */
- if ((usage[ui] == '[') && (usage[ui+1] == ' ')) {
+ if ((usage_str[ui] == '[') && (usage_str[ui+1] == ' ')) {
optional_ui = ui;
break;
}
- if (usage[ui] == '\0')
+ if (usage_str[ui] == '\0')
break;
- if (usage[ui] == '(') {
+ if (usage_str[ui] == '(') {
buf[bi++] = '\n';
buf[bi++] = '\t';
}
- buf[bi++] = usage[ui];
+ buf[bi++] = usage_str[ui];
- if (usage[ui] == ')') {
+ if (usage_str[ui] == ')') {
buf[bi++] = '\n';
buf[bi++] = '\t';
}
- if (usage[ui] == ',') {
+ if (usage_str[ui] == ',') {
buf[bi++] = '\n';
buf[bi++] = '\t';
buf[bi++] = ' ';
@@ -1368,25 +1368,25 @@ static void _print_usage(const char *usage, int only_required)
memset(buf, 0, sizeof(buf));
bi = 0;
- for (ui = optional_ui; ui < strlen(usage); ui++) {
+ for (ui = optional_ui; ui < strlen(usage_str); ui++) {
/* The second "[ " indicates the start of the optional pos_args. */
- if ((ui > optional_ui) && (usage[ui] == '[') && (usage[ui+1] == ' ')) {
+ if ((ui > optional_ui) && (usage_str[ui] == '[') && (usage_str[ui+1] == ' ')) {
optional_pos_ui = ui;
break;
}
- if (usage[ui] == '\0')
+ if (usage_str[ui] == '\0')
break;
- if (usage[ui] == '\n')
+ if (usage_str[ui] == '\n')
break;
if (!bi)
buf[bi++] = '\t';
- buf[bi++] = usage[ui];
+ buf[bi++] = usage_str[ui];
- if (usage[ui] == ',') {
+ if (usage_str[ui] == ',') {
buf[bi++] = '\n';
buf[bi++] = '\t';
buf[bi++] = ' ';
@@ -1413,16 +1413,16 @@ static void _print_usage(const char *usage, int only_required)
memset(buf, 0, sizeof(buf));
bi = 0;
- for (ui = optional_pos_ui; ui < strlen(usage); ui++) {
- if (usage[ui] == '\0')
+ for (ui = optional_pos_ui; ui < strlen(usage_str); ui++) {
+ if (usage_str[ui] == '\0')
break;
- if (usage[ui] == '\n')
+ if (usage_str[ui] == '\n')
break;
if (!bi)
buf[bi++] = '\t';
- buf[bi++] = usage[ui];
+ buf[bi++] = usage_str[ui];
if (bi == (HELP_LINE_SIZE - 1))
break;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4d2c3502e79e34a5…
Commit: 4d2c3502e79e34a5cf0fdb65c2a4df23aa1b2ecb
Parent: 5c779b323132bfd2ddc5cf639a6fcd3e9b10a309
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Jan 12 16:08:53 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
man lvm: remove options
all options are now included in commands
---
man/lvm.8.in | 258 +---------------------------------------------------------
1 files changed, 3 insertions(+), 255 deletions(-)
diff --git a/man/lvm.8.in b/man/lvm.8.in
index cad724b..0a64e4f 100644
--- a/man/lvm.8.in
+++ b/man/lvm.8.in
@@ -45,6 +45,9 @@ A file containing a simple script with one command per line
can also be given on the command line. The script can also be
executed directly if the first line is #! followed by the absolute
path of \fBlvm\fP.
+.P
+Additional hyphens within option names are ignored. For example,
+\fB\-\-readonly\fP and \fB\-\-read\-only\fP are both accepted.
.
.SH BUILT-IN COMMANDS
.
@@ -238,261 +241,6 @@ The following commands are not implemented in LVM2 but might be
in the future:
.BR lvmsadc ", " lvmsar ", " pvdata .
.
-.SH OPTIONS
-.
-The following options are available for many of the commands.
-They are implemented generically and documented here rather
-than repeated on individual manual pages.
-.P
-Additional hyphens within option names are ignored. For example,
-\fB\-\-readonly\fP and \fB\-\-read\-only\fP are both accepted.
-.
-.HP
-.BR \-h | \-? | \-\-help
-.br
-Display the help text.
-.
-.HP
-.BR \-\-version
-.br
-Display version information.
-.
-.HP
-.BR \-v | \-\-verbose
-.br
-Set verbose level. Repeat from 1 to 3 times to increase the detail
-of messages sent to stdout and stderr. Overrides config file setting.
-.
-.HP
-.BR \-d | \-\-debug
-.br
-Set debug level. Repeat from 1 to 6 times to increase the detail of
-messages sent to the log file and/or syslog (if configured).
-Overrides config file setting.
-.
-.HP
-.BR \-q | \-\-quiet
-.br
-Suppress output and log messages.
-Overrides \fB\-d\fP and \fB\-v\fP.
-Repeat once to also suppress any prompts with answer 'no'.
-.
-.HP
-.BR \-\-yes
-.br
-Don't prompt for confirmation interactively but instead always assume the
-answer is 'yes'. Take great care if you use this!
-.
-.HP
-.BR \-t | \-\-test
-.br
-Run in test mode. Commands will not update metadata.
-This is implemented by disabling all metadata writing but nevertheless
-returning success to the calling function. This may lead to unusual
-error messages in multi-stage operations if a tool relies on reading
-back metadata it believes has changed but hasn't.
-.
-.HP
-.BR \-\-driverloaded
-.RB { y | n }
-.br
-Whether or not the device-mapper kernel driver is loaded.
-If you set this to \fBn\fP, no attempt will be made to contact the driver.
-.
-.HP
-.BR \-A | \-\-autobackup
-.RB { y | n }
-.br
-Whether or not to metadata should be backed up automatically after a change.
-You are strongly advised not to disable this!
-See \fBvgcfgbackup\fP(8).
-.
-.HP
-.BR \-P | \-\-partial
-.br
-When set, the tools will do their best to provide access to Volume Groups
-that are only partially available (one or more Physical Volumes belonging
-to the Volume Group are missing from the system). Where part of a logical
-volume is missing, \fI\%/dev/ioerror\fP will be substituted, and you could use
-\fBdmsetup\fP(8) to set this up to return I/O errors when accessed,
-or create it as a large block device of nulls. Metadata may not be
-changed with this option. To insert a replacement Physical Volume
-of the same or large size use \fBpvcreate \-u\fP to set the uuid to
-match the original followed by \fBvgcfgrestore\fP(8).
-.
-.HP
-.BR \-S | \-\-select
-.IR Selection
-.br
-For reporting commands, display only rows that match \fISelection\fP criteria.
-All rows are displayed with the additional "selected" column (\fB-o selected\fP)
-showing 1 if the row matches the \fISelection\fP and 0 otherwise. For non-reporting
-commands which process LVM entities, the selection can be used to match items
-to process. See \fBSelection\fP section in \fBlvmreport\fP(7) man page for more
-information about the way the selection criteria are constructed.
-.
-.HP
-.BR \-M | \-\-metadatatype
-.IR Type
-.br
-Specifies which \fItype\fP of on-disk metadata to use, such as \fBlvm1\fP
-or \fBlvm2\fP, which can be abbreviated to \fB1\fP or \fB2\fP respectively.
-The default (\fBlvm2\fP) can be changed by setting \fBformat\fP
-in the \fBglobal\fP section of the config file \fBlvm.conf\fP(5).
-.
-.HP
-.BR \-\-ignorelockingfailure
-.br
-This lets you proceed with read-only metadata operations such as
-\fBlvchange \-ay\fP and \fBvgchange \-ay\fP even if the locking module fails.
-One use for this is in a system init script if the lock directory
-is mounted read-only when the script runs.
-.
-.HP
-.BR \-\-ignoreskippedcluster
-.br
-Use to avoid exiting with an non-zero status code if the command is run
-without clustered locking and some clustered Volume Groups have to be
-skipped over.
-.
-.HP
-.BR \-\-readonly
-.br
-Run the command in a special read-only mode which will read on-disk
-metadata without needing to take any locks. This can be used to peek
-inside metadata used by a virtual machine image while the virtual
-machine is running.
-It can also be used to peek inside the metadata of clustered Volume
-Groups when clustered locking is not configured or running. No attempt
-will be made to communicate with the device-mapper kernel driver, so
-this option is unable to report whether or not Logical Volumes are
-actually in use.
-.
-.HP
-.BR \-\-foreign
-.br
-Cause the command to access foreign VGs, that would otherwise be skipped.
-It can be used to report or display a VG that is owned by another host.
-This option can cause a command to perform poorly because lvmetad caching
-is not used and metadata is read from disks.
-.
-.HP
-.BR \-\-shared
-.br
-Cause the command to access shared VGs, that would otherwise be skipped
-when lvmlockd is not being used. It can be used to report or display a
-lockd VG without locking. Applicable only if LVM is compiled with lockd
-support.
-.
-.HP
-.BR \-\-addtag
-.IR Tag
-.br
-Add the tag \fITag\fP to a PV, VG or LV.
-Supply this argument multiple times to add more than one tag at once.
-A tag is a word that can be used to group LVM2 objects of the same type
-together.
-Tags can be given on the command line in place of PV, VG or LV
-arguments. Tags should be prefixed with @ to avoid ambiguity.
-Each tag is expanded by replacing it with all objects possessing
-that tag which are of the type expected by its position on the command line.
-PVs can only possess tags while they are part of a Volume Group:
-PV tags are discarded if the PV is removed from the VG.
-As an example, you could tag some LVs as \fBdatabase\fP and others
-as \fBuserdata\fP and then activate the database ones
-with \fBlvchange \-ay @database\fP.
-Objects can possess multiple tags simultaneously.
-Only the new LVM2 metadata format supports tagging: objects using the
-LVM1 metadata format cannot be tagged because the on-disk format does not
-support it.
-Characters allowed in tags are:
-.BR A - Z
-.BR a - z
-.BR 0 - 9
-.BR "_ + . -"
-and as of version 2.02.78 the following characters are also accepted:
-.BR "/ = ! : # &" .
-.
-.HP
-.BR \-\-deltag
-.IR Tag
-.br
-Delete the tag \fITag\fP from a PV, VG or LV, if it's present.
-Supply this argument multiple times to remove more than one tag at once.
-.
-.HP
-.BR \-\-alloc
-.RB { anywhere | contiguous | cling | inherit | normal }
-.br
-Selects the allocation policy when a command needs to allocate
-Physical Extents from the Volume Group.
-Each Volume Group and Logical Volume has an allocation policy defined.
-The default for a Volume Group is \fBnormal\fP which applies
-common-sense rules such as not placing parallel stripes on the same
-Physical Volume. The default for a Logical Volume is \fBinherit\fP
-which applies the same policy as for the Volume Group. These policies can
-be changed using \fBlvchange\fP(8) and \fBvgchange\fP(8) or overridden
-on the command line of any command that performs allocation.
-The \fBcontiguous\fP policy requires that new Physical Extents be placed adjacent
-to existing Physical Extents.
-The \fBcling\fP policy places new Physical Extents on the same Physical
-Volume as existing Physical Extents in the same stripe of the Logical Volume.
-If there are sufficient free Physical Extents to satisfy
-an allocation request but \fBnormal\fP doesn't use them,
-\fBanywhere\fP will - even if that reduces performance by
-placing two stripes on the same Physical Volume.
-.
-.HP
-.BR \-\-commandprofile
-.IR ProfileName
-.br
-Selects the command configuration profile to use when processing an LVM command.
-See also \fBlvm.conf\fP(5) for more information about \fBcommand profile config\fP and
-the way it fits with other LVM configuration methods. Using \fB\-\-commandprofile\fP
-option overrides any command profile specified via \fBLVM_COMMAND_PROFILE\fP
-environment variable.
-.
-.HP
-.BR \-\-metadataprofile
-.IR ProfileName
-.br
-Selects the metadata configuration profile to use when processing an LVM command.
-When using metadata profile during Volume Group or Logical Volume creation,
-the metadata profile name is saved in metadata. When such Volume Group or Logical
-Volume is processed next time, the metadata profile is automatically applied
-and the use of \fB\-\-metadataprofile\fP option is not necessary. See also
-\fBlvm.conf\fP(5) for more information about \fBmetadata profile config\fP and the
-way it fits with other LVM configuration methods.
-.
-.HP
-.BR \-\-profile
-.IR ProfileName
-.br
-A short form of \fB\-\-metadataprofile\fP for \fBvgcreate\fP, \fBlvcreate\fP,
-\fBvgchange\fP and \fBlvchange\fP command and a short form of \fB\-\-commandprofile\fP
-for any other command (with the exception of \fBlvmconfig\fP command where the
-\fB\-\-profile\fP has special meaning, see \fBlvmconfig\fP(8) for more information).
-.
-.HP
-.BR \-\-reportformat
-.IR {basic|json}
-.br
-Overrides current output format for reports which is defined globally by
-\fBreport/output_format\fP configuration setting in \fBlvm.conf\fP(5).
-The \fBbasic\fP format is the original format with columns and rows and
-if there is more than one report per command, each report is prefixed
-with report's name for identification. The \fBjson\fP stands for report
-output in JSON format.
-.HP
-.BR \-\-config
-.IR ConfigurationString
-.br
-Uses the ConfigurationString as direct string representation of the configuration
-to override the existing configuration. The ConfigurationString is of exactly
-the same format as used in any LVM configuration file. See \fBlvm.conf\fP(5)
-for more information about \fBdirect config override on command line\fP and the
-way it fits with other LVM configuration methods.
-.
.SH VALID NAMES
.
The valid characters for VG and LV names are:
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5c779b323132bfd2…
Commit: 5c779b323132bfd2ddc5cf639a6fcd3e9b10a309
Parent: db26a82f2f464d0f710229c24d67c83818fd8f3c
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Jan 6 16:56:59 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
args: add man page descriptions
---
tools/args.h | 1582 ++++++++++++++++++++++++++++++++++++++++-------
tools/create-commands.c | 292 +++++++--
tools/lvmcmdline.c | 2 +-
tools/tools.h | 3 +-
4 files changed, 1611 insertions(+), 268 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index 690b4ee..8802cd7 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -17,221 +17,1385 @@
* Put all long args that don't have a corresponding short option first.
*/
/* *INDENT-OFF* */
-arg(ARG_UNUSED, '-', "", 0, 0, 0) /* place holder for unused 0 value */
-
-arg(abort_ARG, '\0', "abort", 0, 0, 0)
-arg(activationmode_ARG, '\0', "activationmode", activationmode_VAL, 0, 0)
-arg(addtag_ARG, '\0', "addtag", tag_VAL, ARG_GROUPABLE, 0)
-arg(aligned_ARG, '\0', "aligned", 0, 0, 0)
-arg(alloc_ARG, '\0', "alloc", alloc_VAL, 0, 0)
-arg(atomic_ARG, '\0', "atomic", 0, 0, 0)
-arg(atversion_ARG, '\0', "atversion", string_VAL, 0, 0)
-arg(binary_ARG, '\0', "binary", 0, 0, 0)
-arg(bootloaderareasize_ARG, '\0', "bootloaderareasize", sizemb_VAL, 0, 0)
-arg(cache_long_ARG, '\0', "cache", 0, 0, 0)
-arg(cachemode_ARG, '\0', "cachemode", cachemode_VAL, 0, 0)
-arg(cachepool_ARG, '\0', "cachepool", lv_VAL, 0, 0)
-arg(commandprofile_ARG, '\0', "commandprofile", string_VAL, 0, 0)
-arg(config_ARG, '\0', "config", string_VAL, 0, 0)
-arg(configreport_ARG, '\0', "configreport", configreport_VAL, ARG_GROUPABLE, 1)
-arg(configtype_ARG, '\0', "typeconfig", configtype_VAL, 0, 0)
-arg(corelog_ARG, '\0', "corelog", 0, 0, 0)
-arg(dataalignment_ARG, '\0', "dataalignment", sizekb_VAL, 0, 0)
-arg(dataalignmentoffset_ARG, '\0', "dataalignmentoffset", sizekb_VAL, 0, 0)
-arg(deltag_ARG, '\0', "deltag", tag_VAL, ARG_GROUPABLE, 0)
-arg(detachprofile_ARG, '\0', "detachprofile", 0, 0, 0)
-arg(discards_ARG, '\0', "discards", discards_VAL, 0, 0)
-arg(driverloaded_ARG, '\0', "driverloaded", bool_VAL, 0, 0)
-arg(errorwhenfull_ARG, '\0', "errorwhenfull", bool_VAL, 0, 0)
-arg(force_long_ARG, '\0', "force", 0, ARG_COUNTABLE, 0)
-arg(foreign_ARG, '\0', "foreign", 0, 0, 0)
-arg(handlemissingpvs_ARG, '\0', "handlemissingpvs", 0, 0, 0)
-arg(ignoreadvanced_ARG, '\0', "ignoreadvanced", 0, 0, 0)
-arg(ignorelocal_ARG, '\0', "ignorelocal", 0, 0, 0)
-arg(ignorelockingfailure_ARG, '\0', "ignorelockingfailure", 0, 0, 0)
-arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", 0, 0, 0)
-arg(ignoreskippedcluster_ARG, '\0', "ignoreskippedcluster", 0, 0, 0)
-arg(ignoreunsupported_ARG, '\0', "ignoreunsupported", 0, 0, 0)
-arg(labelsector_ARG, '\0', "labelsector", number_VAL, 0, 0)
-arg(lockopt_ARG, '\0', "lockopt", string_VAL, 0, 0)
-arg(lockstart_ARG, '\0', "lockstart", 0, 0, 0)
-arg(lockstop_ARG, '\0', "lockstop", 0, 0, 0)
-arg(locktype_ARG, '\0', "locktype", locktype_VAL, 0, 0)
-arg(logonly_ARG, '\0', "logonly", 0, 0, 0)
-arg(maxrecoveryrate_ARG, '\0', "maxrecoveryrate", sizekb_VAL, 0, 0)
-arg(merge_ARG, '\0', "merge", 0, 0, 0)
-arg(mergemirrors_ARG, '\0', "mergemirrors", 0, 0, 0)
-arg(mergesnapshot_ARG, '\0', "mergesnapshot", 0, 0, 0)
-arg(mergethin_ARG, '\0', "mergethin", 0, 0, 0)
-arg(mergedconfig_ARG, '\0', "mergedconfig", 0, 0, 0)
-arg(metadatacopies_ARG, '\0', "metadatacopies", metadatacopies_VAL, 0, 0)
-arg(metadataignore_ARG, '\0', "metadataignore", bool_VAL, 0, 0)
-arg(metadataprofile_ARG, '\0', "metadataprofile", string_VAL, 0, 0)
-arg(metadatasize_ARG, '\0', "metadatasize", sizemb_VAL, 0, 0)
-arg(minor_ARG, '\0', "minor", number_VAL, ARG_GROUPABLE, 0)
-arg(minrecoveryrate_ARG, '\0', "minrecoveryrate", sizekb_VAL, 0, 0)
-arg(mirrorlog_ARG, '\0', "mirrorlog", mirrorlog_VAL, 0, 0)
-arg(mirrorsonly_ARG, '\0', "mirrorsonly", 0, 0, 0)
-arg(mknodes_ARG, '\0', "mknodes", 0, 0, 0)
-arg(monitor_ARG, '\0', "monitor", bool_VAL, 0, 0)
-arg(nameprefixes_ARG, '\0', "nameprefixes", 0, 0, 0)
-arg(noheadings_ARG, '\0', "noheadings", 0, 0, 0)
-arg(nohistory_ARG, '\0', "nohistory", 0, 0, 0)
-arg(nolocking_ARG, '\0', "nolocking", 0, 0, 0)
-arg(norestorefile_ARG, '\0', "norestorefile", 0, 0, 0)
-arg(nosuffix_ARG, '\0', "nosuffix", 0, 0, 0)
-arg(nosync_ARG, '\0', "nosync", 0, 0, 0)
-arg(notifydbus_ARG, '\0', "notifydbus", 0, 0, 0)
-arg(noudevsync_ARG, '\0', "noudevsync", 0, 0, 0)
-arg(originname_ARG, '\0', "originname", lv_VAL, 0, 0)
-arg(physicalvolumesize_ARG, '\0', "setphysicalvolumesize", sizemb_VAL, 0, 0)
-arg(poll_ARG, '\0', "poll", bool_VAL, 0, 0)
-arg(polloperation_ARG, '\0', "polloperation", polloperation_VAL, 0, 0)
-arg(pooldatasize_ARG, '\0', "pooldatasize", sizemb_VAL, 0, 0)
-arg(poolmetadata_ARG, '\0', "poolmetadata", lv_VAL, 0, 0)
-arg(poolmetadatasize_ARG, '\0', "poolmetadatasize", sizemb_VAL, 0, 0)
-arg(poolmetadataspare_ARG, '\0', "poolmetadataspare", bool_VAL, 0, 0)
-arg(profile_ARG, '\0', "profile", string_VAL, 0, 0)
-arg(pvmetadatacopies_ARG, '\0', "pvmetadatacopies", pvmetadatacopies_VAL, 0, 0)
-arg(raidrebuild_ARG, '\0', "raidrebuild", pv_VAL, ARG_GROUPABLE, 0)
-arg(raidmaxrecoveryrate_ARG, '\0', "raidmaxrecoveryrate", sizekb_VAL, 0, 0)
-arg(raidminrecoveryrate_ARG, '\0', "raidminrecoveryrate", sizekb_VAL, 0, 0)
-arg(raidsyncaction_ARG, '\0', "raidsyncaction", syncaction_VAL, 0, 0)
-arg(raidwritebehind_ARG, '\0', "raidwritebehind", number_VAL, 0, 0)
-arg(raidwritemostly_ARG, '\0', "raidwritemostly", writemostly_VAL, ARG_GROUPABLE, 0)
-arg(readonly_ARG, '\0', "readonly", 0, 0, 0)
-arg(refresh_ARG, '\0', "refresh", 0, 0, 0)
-arg(removemissing_ARG, '\0', "removemissing", 0, 0, 0)
-arg(rebuild_ARG, '\0', "rebuild", pv_VAL, ARG_GROUPABLE, 0)
-arg(repair_ARG, '\0', "repair", 0, 0, 0)
-arg(replace_ARG, '\0', "replace", pv_VAL, ARG_GROUPABLE, 0)
-arg(reportformat_ARG, '\0', "reportformat", reportformat_VAL, 0, 0)
-arg(restorefile_ARG, '\0', "restorefile", string_VAL, 0, 0)
-arg(restoremissing_ARG, '\0', "restoremissing", 0, 0, 0)
-arg(resync_ARG, '\0', "resync", 0, 0, 0)
-arg(rows_ARG, '\0', "rows", 0, 0, 0)
-arg(segments_ARG, '\0', "segments", 0, 0, 0)
-arg(separator_ARG, '\0', "separator", string_VAL, 0, 0)
-arg(shared_ARG, '\0', "shared", 0, 0, 0)
-arg(sinceversion_ARG, '\0', "sinceversion", string_VAL, 0, 0)
-arg(split_ARG, '\0', "split", 0, 0, 0)
-arg(splitcache_ARG, '\0', "splitcache", 0, 0, 0)
-arg(splitmirrors_ARG, '\0', "splitmirrors", number_VAL, 0, 0)
-arg(splitsnapshot_ARG, '\0', "splitsnapshot", 0, 0, 0)
-arg(showdeprecated_ARG, '\0', "showdeprecated", 0, 0, 0)
-arg(showunsupported_ARG, '\0', "showunsupported", 0, 0, 0)
-arg(startpoll_ARG, '\0', "startpoll", 0, 0, 0)
-arg(stripes_long_ARG, '\0', "stripes", number_VAL, 0, 0)
-arg(swapmetadata_ARG, '\0', "swapmetadata", 0, 0, 0)
-arg(syncaction_ARG, '\0', "syncaction", syncaction_VAL, 0, 0)
-arg(sysinit_ARG, '\0', "sysinit", 0, 0, 0)
-arg(systemid_ARG, '\0', "systemid", string_VAL, 0, 0)
-arg(thinpool_ARG, '\0', "thinpool", lv_VAL, 0, 0)
-arg(trackchanges_ARG, '\0', "trackchanges", 0, 0, 0)
-arg(trustcache_ARG, '\0', "trustcache", 0, 0, 0)
-arg(type_ARG, '\0', "type", segtype_VAL, 0, 0)
-arg(unbuffered_ARG, '\0', "unbuffered", 0, 0, 0)
-arg(uncache_ARG, '\0', "uncache", 0, 0, 0)
-arg(cachepolicy_ARG, '\0', "cachepolicy", string_VAL, 0, 0)
-arg(cachesettings_ARG, '\0', "cachesettings", string_VAL, ARG_GROUPABLE, 0)
-arg(unconfigured_ARG, '\0', "unconfigured", 0, 0, 0)
-arg(units_ARG, '\0', "units", units_VAL, 0, 0)
-arg(unquoted_ARG, '\0', "unquoted", 0, 0, 0)
-arg(usepolicies_ARG, '\0', "usepolicies", 0, 0, 0)
-arg(validate_ARG, '\0', "validate", 0, 0, 0)
-arg(version_ARG, '\0', "version", 0, 0, 0)
-arg(vgmetadatacopies_ARG, '\0', "vgmetadatacopies", vgmetadatacopies_VAL, 0, 0)
-arg(virtualoriginsize_ARG, '\0', "virtualoriginsize", sizemb_VAL, 0, 0)
-arg(withsummary_ARG, '\0', "withsummary", 0, 0, 0)
-arg(withcomments_ARG, '\0', "withcomments", 0, 0, 0)
-arg(withspaces_ARG, '\0', "withspaces", 0, 0, 0)
-arg(withversions_ARG, '\0', "withversions", 0, 0, 0)
-arg(writebehind_ARG, '\0', "writebehind", number_VAL, 0, 0)
-arg(writemostly_ARG, '\0', "writemostly", writemostly_VAL, ARG_GROUPABLE, 0)
+arg(ARG_UNUSED, '-', "", 0, 0, 0, NULL) /* place holder for unused 0 value */
+
+arg(abort_ARG, '\0', "abort", 0, 0, 0,
+ "#pvmove\n"
+ "Abort any pvmove operations in progress. If a pvmove was started\n"
+ "with the --atomic option, then all LVs will remain on the source PV.\n"
+ "Otherwise, segments that have been moved will remain on the\n"
+ "destination PV, while unmoved segments will remain on the source PV.\n"
+ "#lvpoll\n"
+ "Stop processing a poll operation in lvmpolld.\n")
+
+arg(activationmode_ARG, '\0', "activationmode", activationmode_VAL, 0, 0,
+ "Determines if LV activation is allowed when PVs are missing,\n"
+ "e.g. because of a device failure.\n"
+ "\\fBcomplete\\fP only allows LVs with no missing PVs to be activated,\n"
+ "and is the most restrictive mode.\n"
+ "\\fBdegraded\\fP allows RAID LVs with missing PVs to be activated.\n"
+ "(This does not include the \"mirror\" type, see \"raid1\" instead.)\n"
+ "\\fBpartial\\fP allows any LV with missing PVs to be activated, and\n"
+ "should only be used for recovery or repair.\n"
+ "For default, see lvm.conf/activation_mode.\n")
+
+arg(addtag_ARG, '\0', "addtag", tag_VAL, ARG_GROUPABLE, 0,
+ "Adds a tag to a PV, VG or LV. This option can be repeated to add\n"
+ "multiple tags at once. See lvm(8) for information about tags.\n")
+
+arg(aligned_ARG, '\0', "aligned", 0, 0, 0,
+ "Use with --separator to align the output columns\n")
+
+arg(alloc_ARG, '\0', "alloc", alloc_VAL, 0, 0,
+ "Determines the allocation policy when a command needs to allocate\n"
+ "Physical Extents (PEs) from the VG. Each VG and LV has an allocation policy\n"
+ "which can be changed with vgchange/lvchange, or overriden on the\n"
+ "command line.\n"
+ "\\fBnormal\\fP applies common sense rules such as not placing parallel stripes\n"
+ "on the same PV.\n"
+ "\\fBinherit\\fP applies the VG policy to an LV.\n"
+ "\\fBcontiguous\\fP requires new PEs be placed adjacent to existing PEs.\n"
+ "\\fBcling\\fP places new PEs on the same PV as existing PEs in the same\n"
+ "stripe of the LV.\n"
+ "If there are sufficient PEs for an allocation, but normal does not\n"
+ "use them, \\fBanywhere\\fP will use them even if it reduces performance,\n"
+ "e.g. by placing two stripes on the same PV.\n"
+ "Optional positional PV args on the command line can also be used to limit\n"
+ "which PVs the command will use for allocation.\n"
+ "See lvm(8) for more information about allocation.\n")
+
+arg(atomic_ARG, '\0', "atomic", 0, 0, 0,
+ "Makes a pvmove operation atomic, ensuring that all affected LVs are\n"
+ "moved to the destination PV, or none are if the operation is aborted.\n")
+
+arg(atversion_ARG, '\0', "atversion", string_VAL, 0, 0,
+ "Specify an LVM version in x.y.z format where x is the major version,\n"
+ "the y is the minor version and z is the patchlevel (e.g. 2.2.106).\n"
+ "When configuration is displayed, the configuration settings recognized\n"
+ "at this LVM version will be considered only. This can be used\n"
+ "to display a configuration that a certain LVM version understands and\n"
+ "which does not contain any newer settings for which LVM would\n"
+ "issue a warning message when checking the configuration.\n")
+
+arg(binary_ARG, '\0', "binary", 0, 0, 0,
+ "Use binary values \"0\" or \"1\" instead of descriptive literal values\n"
+ "for columns that have exactly two valid values to report (not counting\n"
+ "the \"unknown\" value which denotes that the value could not be determined).\n")
+
+arg(bootloaderareasize_ARG, '\0', "bootloaderareasize", sizemb_VAL, 0, 0,
+ "Create a separate bootloader area of specified size besides PV's data\n"
+ "area. The bootloader area is an area of reserved space on the PV from\n"
+ "which LVM will not allocate any extents and it's kept untouched. This is\n"
+ "primarily aimed for use with bootloaders to embed their own data or metadata.\n"
+ "The start of the bootloader area is always aligned, see also --dataalignment\n"
+ "and --dataalignmentoffset. The bootloader area size may eventually\n"
+ "end up increased due to the alignment, but it's never less than the\n"
+ "size that is requested. To see the bootloader area start and size of\n"
+ "an existing PV use pvs -o +pv_ba_start,pv_ba_size.\n")
+
+arg(cache_long_ARG, '\0', "cache", 0, 0, 0,
+ "#pvscan\n"
+ "Scan one or more devices and send the metadata to lvmetad.\n"
+ "#vgscan\n"
+ "Scan all devices and send the metadata to lvmetad.\n"
+ "#lvscan\n"
+ "Scan the devices used by an LV and send the metadata to lvmetad.\n")
+
+arg(cachemode_ARG, '\0', "cachemode", cachemode_VAL, 0, 0,
+ "Specifies when writes to a cache LV should be considered complete.\n"
+ "\\fBwriteback\\fP considers a write complete as soon as it is\n"
+ "stored in the cache pool.\n"
+ "\\fBwritethough\\fP considers a write complete only when it has\n"
+ "been stored in both the cache pool and on the origin LV.\n"
+ "While writethrough may be slower for writes, it is more\n"
+ "resilient if something should happen to a device associated with the\n"
+ "cache pool LV. With writethrough, all reads are served\n"
+ "from the origin LV (all reads miss the cache) and all writes are\n"
+ "forwarded to the origin LV; additionally, write hits cause cache\n"
+ "block invalidates. See lvmcache(7) for more information.\n")
+
+arg(cachepool_ARG, '\0', "cachepool", lv_VAL, 0, 0,
+ "The name of a cache pool LV.\n")
+
+arg(commandprofile_ARG, '\0', "commandprofile", string_VAL, 0, 0,
+ "The command profile to use for command configuration.\n"
+ "See lvm.conf(5) for more information about profiles.\n")
+
+arg(config_ARG, '\0', "config", string_VAL, 0, 0,
+ "Config settings for the command. These override lvm.conf settings.\n"
+ "The String arg uses the same format as lvm.conf,\n"
+ "or may use section/field syntax.\n"
+ "See lvm.conf(5) for more information about config.\n")
+
+arg(configreport_ARG, '\0', "configreport", configreport_VAL, ARG_GROUPABLE, 1,
+ "See lvmreport(7).\n")
+
+arg(configtype_ARG, '\0', "typeconfig", configtype_VAL, 0, 0,
+ "See lvmreport(7).\n")
+
+arg(corelog_ARG, '\0', "corelog", 0, 0, 0,
+ "An alias for --mirrorlog core.\n")
+
+arg(dataalignment_ARG, '\0', "dataalignment", sizekb_VAL, 0, 0,
+ "Align the start of the data to a multiple of this number.\n"
+ "Also specify an appropriate Physical Extent size when creating a VG.\n"
+ "To see the location of the first Physical Extent of an existing PV,\n"
+ "use pvs -o +pe_start. In addition, it may be shifted by an alignment offset.\n"
+ "See lvm.conf/data_alignment_offset_detection and --dataalignmentoffset.\n")
+
+arg(dataalignmentoffset_ARG, '\0', "dataalignmentoffset", sizekb_VAL, 0, 0,
+ "Shift the start of the data area by this additional offset.\n")
+
+arg(deltag_ARG, '\0', "deltag", tag_VAL, ARG_GROUPABLE, 0,
+ "Deletes a tag from a PV, VG or LV. This option can be repeated to delete\n"
+ "multiple tags at once. See lvm(8) for information about tags.\n")
+
+arg(detachprofile_ARG, '\0', "detachprofile", 0, 0, 0,
+ "Detaches a metadata profile from a VG or LV.\n"
+ "See lvm.conf(5) for more information about profiles.\n")
+
+arg(discards_ARG, '\0', "discards", discards_VAL, 0, 0,
+ "Specifies how the device-mapper thin pool layer in the kernel should\n"
+ "handle discards.\n"
+ "\\fBignore\\fP causes the thin pool to ignore discards.\n"
+ "\\fBnopassdown\\fP causes the thin pool to process discards itself to\n"
+ "allow reuse of unneeded extents in the thin pool.\n"
+ "\\fBpassdown\\fP causes the thin pool to process discards itself\n"
+ "(like nopassdown) and pass the discards to the underlying device.\n")
+
+arg(driverloaded_ARG, '\0', "driverloaded", bool_VAL, 0, 0,
+ "If set to no, the command will not attempt to use device-mapper.\n"
+ "For testing and debugging.\n")
+
+arg(errorwhenfull_ARG, '\0', "errorwhenfull", bool_VAL, 0, 0,
+ "Specifies thin pool behavior when data space is exhausted.\n"
+ "When yes, device-mapper will immediately return an error\n"
+ "when a thin pool is full and an I/O request requires space.\n"
+ "When no, device-mapper will queue these I/O requests for a\n"
+ "period of time to allow the thin pool to be extended.\n"
+ "Errors are returned if no space is available after the timeout.\n"
+ "(Also see dm-thin-pool kernel module option no_space_timeout.)\n")
+
+arg(force_long_ARG, '\0', "force", 0, ARG_COUNTABLE, 0,
+ "Force metadata restore even with thin pool LVs.\n"
+ "Use with extreme caution. Most changes to thin metadata\n"
+ "cannot be reverted.\n"
+ "You may lose data if you restore metadata that does not match the\n"
+ "thin pool kernel metadata precisely.\n")
+
+arg(foreign_ARG, '\0', "foreign", 0, 0, 0,
+ "Report/display foreign VGs that would otherwise be skipped.\n"
+ "See lvmsystemid(7) for more information about foreign VGs.\n")
+
+arg(handlemissingpvs_ARG, '\0', "handlemissingpvs", 0, 0, 0,
+ "Allows a polling operation to continue when PVs are missing,\n"
+ "e.g. for repairs due to faulty devices.\n")
+
+arg(ignoreadvanced_ARG, '\0', "ignoreadvanced", 0, 0, 0,
+ "Exclude advanced configuration settings from the output.\n")
+
+arg(ignorelocal_ARG, '\0', "ignorelocal", 0, 0, 0,
+ "Ignore local section.\n")
+
+arg(ignorelockingfailure_ARG, '\0', "ignorelockingfailure", 0, 0, 0,
+ "Allows a command to continue with read-only metadata\n"
+ "operations after locking failures.\n")
+
+arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", 0, 0, 0,
+ "Do not interact with dmeventd unless --monitor is specified.\n"
+ "Do not use this if dmeventd is already monitoring a device.\n")
+
+arg(ignoreskippedcluster_ARG, '\0', "ignoreskippedcluster", 0, 0, 0,
+ "Use to avoid exiting with an non-zero status code if the command is run\n"
+ "without clustered locking and clustered VGs are skipped.\n")
+
+arg(ignoreunsupported_ARG, '\0', "ignoreunsupported", 0, 0, 0,
+ "Exclude unsupported configuration settings from the output. These settings are\n"
+ "either used for debugging and development purposes only or their support is not\n"
+ "yet complete and they are not meant to be used in production. The \\fBcurrent\\fP\n"
+ "and \\fBdiff\\fP types include unsupported settings in their output by default,\n"
+ "all the other types ignore unsupported settings.\n")
+
+arg(labelsector_ARG, '\0', "labelsector", number_VAL, 0, 0,
+ "By default the PV is labelled with an LVM2 identifier in its second\n"
+ "sector (sector 1). This lets you use a different sector near the\n"
+ "start of the disk (between 0 and 3 inclusive - see LABEL_SCAN_SECTORS\n"
+ "in the source). Use with care.\n")
+
+arg(lockopt_ARG, '\0', "lockopt", string_VAL, 0, 0,
+ "Used to pass options for special cases to lvmlockd.\n"
+ "See lvmlockd(8) for more information.\n")
+
+arg(lockstart_ARG, '\0', "lockstart", 0, 0, 0,
+ "Start the lockspace of a shared VG in lvmlockd.\n"
+ "lvmlockd locks becomes available for the VG, allowing LVM to use the VG.\n"
+ "See lvmlockd(8) for more information.\n")
+
+arg(lockstop_ARG, '\0', "lockstop", 0, 0, 0,
+ "Stop the lockspace of a shared VG in lvmlockd.\n"
+ "lvmlockd locks become unavailable for the VG, preventing LVM from using the VG.\n"
+ "See lvmlockd(8) for more information.\n")
+
+arg(locktype_ARG, '\0', "locktype", locktype_VAL, 0, 0,
+ "#vgchange\n"
+ "Change the VG lock type to or from a shared lock type used with lvmlockd.\n"
+ "See lvmlockd(8) for more information.\n"
+ "#vgcreate\n"
+ "Specify the VG lock type directly in place of using --shared.\n"
+ "See lvmlockd(8) for more information.\n")
+
+arg(logonly_ARG, '\0', "logonly", 0, 0, 0,
+ "Suppress command report and display only log report.\n")
+
+arg(maxrecoveryrate_ARG, '\0', "maxrecoveryrate", sizekb_VAL, 0, 0,
+ "Sets the maximum recovery rate for a RAID LV. The rate value\n"
+ "is an amount of data per second for each device in the array.\n"
+ "Setting the rate to 0 means it will be unbounded.\n")
+
+arg(merge_ARG, '\0', "merge", 0, 0, 0,
+ "An alias for --mergethin, --mergemirrors, or --mergesnapshot,\n"
+ "depending on the type of LV.\n")
+
+arg(mergemirrors_ARG, '\0', "mergemirrors", 0, 0, 0,
+ "Merge LV images that were split from a raid1 LV.\n"
+ "See --splitmirrors with --trackchanges.\n")
+
+arg(mergesnapshot_ARG, '\0', "mergesnapshot", 0, 0, 0,
+ "Merge COW snapshot LV into its origin.\n"
+ "When merging a snapshot, if both the origin and snapshot LVs are not open,\n"
+ "the merge will start immediately. Otherwise, the merge will start the\n"
+ "first time either the origin or snapshot LV are activated and both are\n"
+ "closed. Merging a snapshot into an origin that cannot be closed, for\n"
+ "example a root filesystem, is deferred until the next time the origin\n"
+ "volume is activated. When merging starts, the resulting LV will have the\n"
+ "origin's name, minor number and UUID. While the merge is in progress,\n"
+ "reads or writes to the origin appear as being directed to the snapshot\n"
+ "being merged. When the merge finishes, the merged snapshot is removed.\n"
+ "Multiple snapshots may be specified on the command line or a @tag may be\n"
+ "used to specify multiple snapshots be merged to their respective origin.\n")
+
+arg(mergethin_ARG, '\0', "mergethin", 0, 0, 0,
+ "Merge thin LV into its origin LV.\n"
+ "The origin thin LV takes the content of the thin snapshot,\n"
+ "and the thin snapshot LV is removed.\n")
+
+arg(mergedconfig_ARG, '\0', "mergedconfig", 0, 0, 0,
+ "When the command is run with --config\n"
+ "and/or --commandprofile (or using LVM_COMMAND_PROFILE\n"
+ "environment variable), --profile, or --metadataprofile,\n"
+ "merge all the contents of the \"config cascade\" before displaying it.\n"
+ "Without merging, only the configuration at the front of the\n"
+ "cascade is displayed.\n"
+ "See lvm.conf(5) for more information about config.\n")
+
+arg(metadatacopies_ARG, '\0', "metadatacopies", metadatacopies_VAL, 0, 0,
+ "For commands starting with 'pv', this is an alias for --pvmetadatacopies.\n"
+ "For commands starting with 'vg', this is an alias for --vgmetadatacopies.\n")
+
+arg(metadataignore_ARG, '\0', "metadataignore", bool_VAL, 0, 0,
+ "Specifies the metadataignore property of a PV.\n"
+ "If yes, metadata areas on the PV are ignored, and lvm will\n"
+ "not store metadata in the metadata areas of the PV.\n"
+ "If no, lvm will store metadata on the PV.\n")
+
+arg(metadataprofile_ARG, '\0', "metadataprofile", string_VAL, 0, 0,
+ "The metadata profile to use for command configuration.\n"
+ "See lvm.conf(5) for more information about profiles.\n")
+
+arg(metadatasize_ARG, '\0', "metadatasize", sizemb_VAL, 0, 0,
+ "The approximate amount of space used for each VG metadata area.\n"
+ "The size may be rounded.\n")
+
+arg(minor_ARG, '\0', "minor", number_VAL, ARG_GROUPABLE, 0,
+ "#lvcreate\n"
+ "#lvchange\n"
+ "Sets the minor number of an LV block device.\n"
+ "#pvscan\n"
+ "The minor number of a device.\n")
+
+arg(minrecoveryrate_ARG, '\0', "minrecoveryrate", sizekb_VAL, 0, 0,
+ "Sets the minimum recovery rate for a RAID LV. The rate value\n"
+ "is an amount of data per second for each device in the array.\n"
+ "Setting the rate to 0 means it will be unbounded.\n")
+
+arg(mirrorlog_ARG, '\0', "mirrorlog", mirrorlog_VAL, 0, 0,
+ "Specifies the type of mirror log for LVs with the \"mirror\" type\n"
+ "(does not apply to the \"raid1\" type.)\n"
+ "\\fBdisk\\fP is a persistent log and requires a small amount of\n"
+ "storage space, usually on a separate device from the data being mirrored.\n"
+ "\\fBcore\\fP is not persistent; the log is kept only in memory.\n"
+ "In this case, the mirror must be synchronized (by copying LV data from\n"
+ "the first device to others) each time the LV is activated, e.g. after reboot.\n"
+ "\\fBmirrored\\fP is a persistent log that is itself mirrored.\n")
+
+arg(mirrorsonly_ARG, '\0', "mirrorsonly", 0, 0, 0,
+ "Only remove missing PVs from mirror LVs.\n")
+
+arg(mknodes_ARG, '\0', "mknodes", 0, 0, 0,
+ "Also checks the LVM special files in /dev that are needed for active\n"
+ "LVs and creates any missing ones and removes unused ones.\n")
+
+arg(monitor_ARG, '\0', "monitor", bool_VAL, 0, 0,
+ "Start (yes) or stop (no) monitoring an LV with dmeventd.\n"
+ "dmeventd monitors kernel events for an LV, and performs\n"
+ "automated maintenance for the LV in reponse to specific events.\n"
+ "See dmeventd(8) for more information.\n")
+
+arg(nameprefixes_ARG, '\0', "nameprefixes", 0, 0, 0,
+ "Add an \"LVM2_\" prefix plus the field name to the output. Useful\n"
+ "with --noheadings to produce a list of field=value pairs that can\n"
+ "be used to set environment variables (for example, in udev rules).\n")
+
+arg(noheadings_ARG, '\0', "noheadings", 0, 0, 0,
+ "Suppress the headings line that is normally the first line of output.\n"
+ "Useful if grepping the output.\n")
+
+arg(nohistory_ARG, '\0', "nohistory", 0, 0, 0,
+ "Do not record history of LVs being removed.\n"
+ "This has no effect unless the configuration setting\n"
+ "metadata/record_lvs_history is enabled.\n")
+
+arg(nolocking_ARG, '\0', "nolocking", 0, 0, 0,
+ "Disable locking.\n")
+
+arg(norestorefile_ARG, '\0', "norestorefile", 0, 0, 0,
+ "In conjunction with --uuid, this allows a uuid to be specified\n"
+ "without also requiring that a backup of the metadata be provided.\n")
+
+arg(nosuffix_ARG, '\0', "nosuffix", 0, 0, 0,
+ "Suppress the suffix on output sizes. Use with --units\n"
+ "(except h and H) if processing the output.\n")
+
+arg(nosync_ARG, '\0', "nosync", 0, 0, 0,
+ "Causes the creation of mirror, raid1, raid4, raid5 and raid10 to skip the\n"
+ "initial synchronization. In case of mirror, raid1 and raid10, any data\n"
+ "written afterwards will be mirrored, but the original contents will not be\n"
+ "copied. In case of raid4 and raid5, no parity blocks will be written,\n"
+ "though any data written afterwards will cause parity blocks to be stored.\n"
+ "This is useful for skipping a potentially long and resource intensive initial\n"
+ "sync of an empty mirror/raid1/raid4/raid5 and raid10 LV.\n"
+ "This option is not valid for raid6, because raid6 relies on proper parity\n"
+ "(P and Q Syndromes) being created during initial synchronization in order\n"
+ "to reconstruct proper user date in case of device failures.\n"
+ "raid0 and raid0_meta do not provide any data copies or parity support\n"
+ "and thus do not support initial synchronization.\n")
+
+arg(notifydbus_ARG, '\0', "notifydbus", 0, 0, 0,
+ "Send a notification to D-Bus. The command will exit with an error\n"
+ "if LVM is not built with support for D-Bus notification, or if the\n"
+ "notify_dbus config setting is disabled.\n")
+
+arg(noudevsync_ARG, '\0', "noudevsync", 0, 0, 0,
+ "Disables udev synchronisation. The process will not wait for notification\n"
+ "from udev. It will continue irrespective of any possible udev processing\n"
+ "in the background. Only use this if udev is not running or has rules that\n"
+ "ignore the devices LVM creates.\n")
+
+arg(originname_ARG, '\0', "originname", lv_VAL, 0, 0,
+ "Specifies the name to use for the external origin LV when converting an LV\n"
+ "to a thin LV. The LV being converted becomes a read-only external origin\n"
+ "with this name.\n")
+
+arg(physicalvolumesize_ARG, '\0', "setphysicalvolumesize", sizemb_VAL, 0, 0,
+ "Overrides the automatically detected size of the PV.\n"
+ "Use with care, or prior to reducing the physical size of the device.\n")
+
+arg(poll_ARG, '\0', "poll", bool_VAL, 0, 0,
+ "When yes, start the background transformation of an LV.\n"
+ "An incomplete transformation, e.g. pvmove or lvconvert interrupted\n"
+ "by reboot or crash, can be restarted from the last checkpoint with --poll y.\n"
+ "When no, background transformation of an LV will not occur, and the\n"
+ "transformation will not complete. It may not be appropriate to immediately\n"
+ "poll an LV after activation, in which case --poll n can be used to defer\n"
+ "polling until a later --poll y command.\n")
+
+arg(polloperation_ARG, '\0', "polloperation", polloperation_VAL, 0, 0,
+ "The command to perform from lvmpolld.\n")
+
+/* Not used. */
+arg(pooldatasize_ARG, '\0', "pooldatasize", sizemb_VAL, 0, 0, NULL)
+
+arg(poolmetadata_ARG, '\0', "poolmetadata", lv_VAL, 0, 0,
+ "The name of a an LV to use for storing pool metadata.\n")
+
+arg(poolmetadatasize_ARG, '\0', "poolmetadatasize", sizemb_VAL, 0, 0,
+ "The size of the pool metadata LV created by the command.\n")
+
+arg(poolmetadataspare_ARG, '\0', "poolmetadataspare", bool_VAL, 0, 0,
+ "Enable or disable the automatic creation and management of a\n"
+ "spare pool metadata LV in the VG. A spare metadata LV is reserved\n"
+ "space that can be used when repairing a pool.\n")
+
+arg(profile_ARG, '\0', "profile", string_VAL, 0, 0,
+ "An alias for --commandprofile or --metadataprofile, depending\n"
+ "on the command.\n")
+
+arg(pvmetadatacopies_ARG, '\0', "pvmetadatacopies", pvmetadatacopies_VAL, 0, 0,
+ "The number of metadata areas to set aside on a PV for storing VG metadata.\n"
+ "When 2, one copy of the VG metadata is stored at the front of the PV\n"
+ "and a second copy is stored at the end.\n"
+ "When 1, one copy of the VG metadata is stored at the front of the PV\n"
+ "(starting in the 5th sector).\n"
+ "When 0, no copies of the VG metadata are stored on the given PV.\n"
+ "This may be useful in VGs containing many PVs (this places limitations\n"
+ "on the ability to use vgsplit later.)\n")
+
+arg(raidrebuild_ARG, '\0', "raidrebuild", pv_VAL, ARG_GROUPABLE, 0,
+ "An alias for --rebuild.\n")
+
+arg(raidmaxrecoveryrate_ARG, '\0', "raidmaxrecoveryrate", sizekb_VAL, 0, 0,
+ "An alias for --maxrecoveryrate.\n")
+
+arg(raidminrecoveryrate_ARG, '\0', "raidminrecoveryrate", sizekb_VAL, 0, 0,
+ "An alias for --minrecoveryrate.\n")
+
+arg(raidsyncaction_ARG, '\0', "raidsyncaction", syncaction_VAL, 0, 0,
+ "An alias for --syncaction.\n")
+
+arg(raidwritebehind_ARG, '\0', "raidwritebehind", number_VAL, 0, 0,
+ "An alias for --writebehind.\n")
+
+arg(raidwritemostly_ARG, '\0', "raidwritemostly", writemostly_VAL, ARG_GROUPABLE, 0,
+ "An alias for --writemostly.\n")
+
+arg(readonly_ARG, '\0', "readonly", 0, 0, 0,
+ "Run the command in a special read-only mode which will read on-disk\n"
+ "metadata without needing to take any locks. This can be used to peek\n"
+ "inside metadata used by a virtual machine image while the virtual\n"
+ "machine is running.\n"
+ "It can also be used to peek inside the metadata of clustered VGs\n"
+ "when clustered locking is not configured or running. No attempt\n"
+ "will be made to communicate with the device-mapper kernel driver, so\n"
+ "this option is unable to report whether or not LVs are\n"
+ "actually in use.\n")
+
+arg(refresh_ARG, '\0', "refresh", 0, 0, 0,
+ "If the LV is active, reload its metadata.\n"
+ "This is not necessary in normal operation, but may be useful\n"
+ "if something has gone wrong, or if some form of manual LV\n"
+ "sharing is being used.\n")
+
+arg(removemissing_ARG, '\0', "removemissing", 0, 0, 0,
+ "Removes all missing PVs from the VG, if there are no LVs allocated\n"
+ "on them. This resumes normal operation of the VG (new LVs may again\n"
+ "be created, changed and so on).\n"
+ "If this is not possible because LVs are referencing the missing PVs,\n"
+ "this option can be combined with --force to have the command remove\n"
+ "any partial LVs. In this case, any LVs and dependent snapshots that\n"
+ "were partly on the missing disks are removed completely, including\n"
+ "those parts on disks that are still present.\n"
+ "If LVs spanned several disks, including ones that are lost, salvaging\n"
+ "some data first may be possible by activating LVs in partial mode.\n")
+
+arg(rebuild_ARG, '\0', "rebuild", pv_VAL, ARG_GROUPABLE, 0,
+ "Selects a PV to rebuild in a raid LV. Multiple PVs can be rebuilt by\n"
+ "repeating this option.\n"
+ "Use this option in place of --resync or --syncaction repair when the\n"
+ "PVs with corrupted data are known, and their data should be reconstructed\n"
+ "rather than reconstructing default (rotating) data.\n")
+
+arg(repair_ARG, '\0', "repair", 0, 0, 0,
+ "Replace failed PVs in a raid or mirror LV, or run a repair\n"
+ "utility on a thin pool.\n")
+
+arg(replace_ARG, '\0', "replace", pv_VAL, ARG_GROUPABLE, 0,
+ "Replace a specific PV in a raid LV with another PV.\n"
+ "The new PV to use can be optionally specified after the LV.\n"
+ "Multiple PVs can be replaced by repeating this option.\n")
+
+arg(reportformat_ARG, '\0', "reportformat", reportformat_VAL, 0, 0,
+ "Overrides current output format for reports which is defined globally by\n"
+ "the report/output_format setting in lvm.conf.\n"
+ "\\fBbasic\\fP is the original format with columns and rows.\n"
+ "If there is more than one report per command, each report is prefixed\n"
+ "with the report name for identification. \\fBjson\\fP produces report\n"
+ "output in JSON format.\n")
+
+arg(restorefile_ARG, '\0', "restorefile", string_VAL, 0, 0,
+ "In conjunction with --uuid, this reads the file (produced by\n"
+ "vgcfgbackup), extracts the location and size of the data on the PV,\n"
+ "and ensures that the metadata produced by the program is consistent\n"
+ "with the contents of the file, i.e. the physical extents will be in\n"
+ "the same place and not be overwritten by new metadata. This provides\n"
+ "a mechanism to upgrade the metadata format or to add/remove metadata\n"
+ "areas. Use with care.\n")
+
+arg(restoremissing_ARG, '\0', "restoremissing", 0, 0, 0,
+ "Add a PV back into a VG after the PV was missing and then returned,\n"
+ "e.g. due to a transient failure. The PV is not reinitialized.\n")
+
+arg(resync_ARG, '\0', "resync", 0, 0, 0,
+ "Initiates mirror synchronization. Synchronization generally happens\n"
+ "automatically, but this option forces it to run.\n"
+ "Also see --rebuild to synchronize a specific PV.\n"
+ "During synchronization, data is read from the primary mirror device\n"
+ "and copied to the others. This can take considerable time, during\n"
+ "which the LV is without a complete redundant copy of the data.\n")
+
+arg(rows_ARG, '\0', "rows", 0, 0, 0,
+ "Output columns as rows.\n")
+
+arg(segments_ARG, '\0', "segments", 0, 0, 0,
+ "#pvs\n"
+ "Produces one line of output for each contiguous allocation of space on each\n"
+ "PV, showing the start (pvseg_start) and length (pvseg_size) in units of\n"
+ "physical extents.\n"
+ "#lvs\n"
+ "Use default columns that emphasize segment information.\n")
+
+arg(separator_ARG, '\0', "separator", string_VAL, 0, 0,
+ "String to use to separate each column. Useful if grepping the output.\n")
+
+arg(shared_ARG, '\0', "shared", 0, 0, 0,
+ "#vgcreate\n"
+ "Create a shared VG using lvmlockd if LVM is compiled with lockd support.\n"
+ "lvmlockd will select lock type sanlock or dlm depending on which lock\n"
+ "manager is running. This allows multiple hosts to share a VG on shared\n"
+ "devices. lvmlockd and a lock manager must be configured and running.\n"
+ "(A shared VG using lvmlockd is different from a clustered VG using clvmd.)\n"
+ "See lvmlockd(8) for more information about shared VGs.\n"
+ "#vgs\n"
+ "#lvs\n"
+ "#pvs\n"
+ "#fullreport\n"
+ "#vgdisplay\n"
+ "#lvdisplay\n"
+ "#pvdisplay\n"
+ "Report/display shared VGs that would otherwise be skipped when\n"
+ "lvmlockd is not being used on the host.\n"
+ "See lvmlockd(8) for more information about shared VGs.\n")
+
+arg(sinceversion_ARG, '\0', "sinceversion", string_VAL, 0, 0,
+ "Specify an LVM version in x.y.z format where x is the major version,\n"
+ "the y is the minor version and z is the patchlevel (e.g. 2.2.106).\n"
+ "This option is currently applicable only with --type new\n"
+ "to display all configuration settings introduced since given version.\n")
+
+/* Not used */
+arg(split_ARG, '\0', "split", 0, 0, 0, NULL)
+
+arg(splitcache_ARG, '\0', "splitcache", 0, 0, 0,
+ "Separates a cache pool from a cache LV, and keeps the unused cache pool LV.\n"
+ "Before the separation, the cache is flushed. Also see --uncache.\n")
+
+arg(splitmirrors_ARG, '\0', "splitmirrors", number_VAL, 0, 0,
+ "Splits the specified number of images from a raid1 or mirror LV\n"
+ "and uses them to create a new LV. If --trackchanges is also specified,\n"
+ "changes to the raid1 LV are tracked while the split LV remains detached.\n")
+
+arg(splitsnapshot_ARG, '\0', "splitsnapshot", 0, 0, 0,
+ "Separates a COW snapshot from its origin LV. The LV that is split off\n"
+ "contains the chunks that differ from the origin LV along with metadata\n"
+ "describing them. This LV can be wiped and then destroyed with lvremove.\n")
+
+arg(showdeprecated_ARG, '\0', "showdeprecated", 0, 0, 0,
+ "Include deprecated configuration settings in the output. These settings\n"
+ "are deprecated after a certain version. If a concrete version is specified\n"
+ "with --atversion, deprecated settings are automatically included\n"
+ "if the specified version is lower than the version in which the settings were\n"
+ "deprecated. The current and diff types include deprecated settings\n"
+ "in their output by default, all the other types ignore deprecated settings.\n")
+
+arg(showunsupported_ARG, '\0', "showunsupported", 0, 0, 0,
+ "Include unsupported configuration settings in the output. These settings\n"
+ "are either used for debugging or development purposes only, or their support\n"
+ "is not yet complete and they are not meant to be used in production. The\n"
+ "current and diff types include unsupported settings in their\n"
+ "output by default, all the other types ignore unsupported settings.\n")
+
+arg(startpoll_ARG, '\0', "startpoll", 0, 0, 0,
+ "Start polling an LV to continue processing a conversion.\n")
+
+arg(stripes_long_ARG, '\0', "stripes", number_VAL, 0, 0,
+ "Specifies the number of stripes in a striped LV. This is the number of\n"
+ "PVs (devices) that a striped LV is spread across. Data that\n"
+ "appears sequential in the LV is spread across multiple devices in units of\n"
+ "the stripe size (see --stripesize). This does not apply to\n"
+ "existing allocated space, only newly allocated space can be striped.\n")
+
+arg(swapmetadata_ARG, '\0', "swapmetadata", 0, 0, 0,
+ "Remove the metadata LV in a pool and replace it with another specified LV.\n"
+ "The removed LV is preserved and given the name of the LV that replaced it.\n"
+ "Used for repair only.\n")
+
+arg(syncaction_ARG, '\0', "syncaction", syncaction_VAL, 0, 0,
+ "Initiate different types of RAID synchronization.\n"
+ "This causes the RAID LV to read all data and parity\n"
+ "blocks in the array and check for discrepancies\n"
+ "(mismatches between mirrors or incorrect parity values).\n"
+ "\\fBcheck\\fP will count but not correct discrepancies.\n"
+ "\\fBrepair\\fP will correct discrepancies.\n"
+ "See lvs for reporting discrepancies found or repaired.\n")
+
+arg(sysinit_ARG, '\0', "sysinit", 0, 0, 0,
+ "Indicates that vgchange/lvchange is being invoked from early system initialisation\n"
+ "scripts (e.g. rc.sysinit or an initrd), before writable filesystems are\n"
+ "available. As such, some functionality needs to be disabled and this option\n"
+ "acts as a shortcut which selects an appropriate set of options. Currently,\n"
+ "this is equivalent to using --ignorelockingfailure, --ignoremonitoring,\n"
+ "--poll n, and setting env var LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES.\n"
+ "When used in conjunction with lvmetad enabled and running,\n"
+ "vgchange/lvchange skip autoactivation, and defer to pvscan autoactivation.\n")
+
+arg(systemid_ARG, '\0', "systemid", string_VAL, 0, 0,
+ "#vgcreate\n"
+ "Specifies the system ID that will be given to the new VG, overriding the\n"
+ "system ID of the host running the command. A VG is normally created\n"
+ "without this option, in which case the new VG is given the system ID of\n"
+ "the host creating it. Using this option requires caution because the\n"
+ "system ID of the new VG may not match the system ID of the host running\n"
+ "the command, leaving the VG inaccessible to the host.\n"
+ "See lvmsystemid(7) for more information.\n"
+ "#vgchange\n"
+ "Changes the system ID of the VG. Using this option requires caution\n"
+ "because the VG may become foreign to the host running the command,\n"
+ "leaving the host unable to access it.\n"
+ "See lvmsystemid(7) for more information.\n")
+
+arg(thinpool_ARG, '\0', "thinpool", lv_VAL, 0, 0,
+ "The name of a thin pool LV.\n")
+
+arg(trackchanges_ARG, '\0', "trackchanges", 0, 0, 0,
+ "Can be used with --splitmirrors on a raid1 LV. This causes\n"
+ "changes to the original raid1 LV to be tracked while the split images\n"
+ "remain detached. This allows the read-only detached image(s) to be\n"
+ "merged efficiently back into the raid1 LV later. Only the regions with\n"
+ "changed data are resynchronized during merge. (This option only applies\n"
+ "when using the raid1 LV type.)\n")
+
+/* TODO: hide this? */
+arg(trustcache_ARG, '\0', "trustcache", 0, 0, 0,
+ "Avoids certain device scanning during command processing. Do not use.\n")
+
+arg(type_ARG, '\0', "type", segtype_VAL, 0, 0,
+ "Specifies an LV type, or \"segment type\".\n")
+
+arg(unbuffered_ARG, '\0', "unbuffered", 0, 0, 0,
+ "Produce output immediately without sorting or aligning the columns properly.\n")
+
+arg(uncache_ARG, '\0', "uncache", 0, 0, 0,
+ "Separates a cache pool from a cache LV, and deletes the unused cache pool LV.\n"
+ "Before the separation, the cache is flushed. Also see --splitcache.\n")
+
+arg(cachepolicy_ARG, '\0', "cachepolicy", string_VAL, 0, 0,
+ "Specifies the cache policy for a cache LV.\n"
+ "See lvmcache(7) for more information.\n")
+
+arg(cachesettings_ARG, '\0', "cachesettings", string_VAL, ARG_GROUPABLE, 0,
+ "Specifies tunable values for a cache LV in \"Key = Value\" form.\n"
+ "Repeat this option to specify multiple values.\n"
+ "(The default values should usually be adequate.)\n"
+ "The special string value \\fBdefault\\fP switches\n"
+ "settings back to their default kernel values and removes\n"
+ "them from the list of settings stored in LVM metadata.\n"
+ "See lvmcache(7) for more information.\n")
+
+arg(unconfigured_ARG, '\0', "unconfigured", 0, 0, 0,
+ "Internal option used for generating config file during build.\n")
+
+arg(units_ARG, '\0', "units", units_VAL, 0, 0,
+ "All sizes are output in these units: (h)uman-readable, (b)ytes, (s)ectors,\n"
+ "(k)ilobytes, (m)egabytes, (g)igabytes, (t)erabytes, (p)etabytes, (e)xabytes.\n"
+ "Capitalise to use multiples of 1000 (S.I.) instead of 1024. Can also specify\n"
+ "custom units e.g. --units 3M.\n")
+
+arg(unquoted_ARG, '\0', "unquoted", 0, 0, 0,
+ "When used with --nameprefixes, output values in the field=value\n"
+ "pairs are not quoted.\n")
+
+arg(usepolicies_ARG, '\0', "usepolicies", 0, 0, 0,
+ "Perform an operation according to the policy configured in lvm.conf.\n"
+ "or a profile.\n")
+
+arg(validate_ARG, '\0', "validate", 0, 0, 0,
+ "Validate current configuration used and exit with appropriate\n"
+ "return code. The validation is done only for the configuration\n"
+ "at the front of the \"config cascade\". To validate the whole\n"
+ "merged configuration tree, also use --mergedconfig.\n"
+ "The validation is done even if lvm.conf config/checks is disabled.\n")
+
+arg(version_ARG, '\0', "version", 0, 0, 0,
+ "Display version information.\n")
+
+arg(vgmetadatacopies_ARG, '\0', "vgmetadatacopies", vgmetadatacopies_VAL, 0, 0,
+ "Number of copies of the VG metadata that are kept.\n"
+ "VG metadata is kept in VG metadata areas on PVs in the VG,\n"
+ "i.e. reserved space at the start and/or end of the PVs.\n"
+ "Keeping a copy of the VG metadata on every PV can reduce performance\n"
+ "in VGs containing a large number of PVs.\n"
+ "When this number is set to a non-zero value, LVM will automatically\n"
+ "choose PVs on which to store metadata, using the metadataignore flags\n"
+ "on PVs to achieve the specified number.\n"
+ "The number can also be replaced with special string values:\n"
+ "\\fBunmanaged\\fP causes LVM to not automatically manage the PV\n"
+ "metadataignore flags.\n"
+ "\\fBall\\fP causes LVM to first clear the metadataignore flags on\n"
+ "all PVs, and then to become unmanaged.\n")
+
+arg(virtualoriginsize_ARG, '\0', "virtualoriginsize", sizemb_VAL, 0, 0,
+ "An alias for --virtualsize.\n")
+
+arg(withsummary_ARG, '\0', "withsummary", 0, 0, 0,
+ "Display a one line comment for each configuration node.\n")
+
+arg(withcomments_ARG, '\0', "withcomments", 0, 0, 0,
+ "Display a full comment for each configuration node. For deprecated\n"
+ "settings, also display comments about deprecation.\n")
+
+arg(withspaces_ARG, '\0', "withspaces", 0, 0, 0,
+ "Where appropriate, add more spaces in output for better readability.\n")
+
+arg(withversions_ARG, '\0', "withversions", 0, 0, 0,
+ "Also display a comment containing the version of introduction for\n"
+ "each configuration node. If the setting is deprecated, also display\n"
+ "the version since which it is deprecated.\n")
+
+arg(writebehind_ARG, '\0', "writebehind", number_VAL, 0, 0,
+ "The maximum number of outstanding writes that are allowed to\n"
+ "devices in a RAID1 LV that is marked write-mostly.\n"
+ "Once this value is exceeded, writes become synchronous (i.e. all writes\n"
+ "to the constituent devices must complete before the array signals the\n"
+ "write has completed). Setting the value to zero clears the preference\n"
+ "and allows the system to choose the value arbitrarily.\n")
+
+arg(writemostly_ARG, '\0', "writemostly", writemostly_VAL, ARG_GROUPABLE, 0,
+ "Mark a device in a RAID1 LV as write-mostly. All reads\n"
+ "to these drives will be avoided unless absolutely necessary. This keeps\n"
+ "the number of I/Os to the drive to a minimum. The default behavior is to\n"
+ "set the write-mostly attribute for the specified PV.\n"
+ "It is also possible to remove the write-mostly flag by adding the\n"
+ "suffix \\fB:n\\fP at the end of the PV name, or to toggle the value with\n"
+ "the suffix \\fB:t\\fP. Repeat this option to change the attribute on\n"
+ "multiple PVs.\n")
/* Allow some variations */
-arg(allocation_ARG, '\0', "allocation", bool_VAL, 0, 0)
-arg(available_ARG, '\0', "available", activation_VAL, 0, 0)
-arg(resizable_ARG, '\0', "resizable", bool_VAL, 0, 0)
+arg(allocation_ARG, '\0', "allocation", bool_VAL, 0, 0, NULL)
+arg(available_ARG, '\0', "available", activation_VAL, 0, 0, NULL)
+arg(resizable_ARG, '\0', "resizable", bool_VAL, 0, 0, NULL)
/*
* ... and now the short args.
*/
-arg(activate_ARG, 'a', "activate", activation_VAL, 0, 0)
-arg(all_ARG, 'a', "all", 0, 0, 0)
-arg(autobackup_ARG, 'A', "autobackup", bool_VAL, 0, 0)
-arg(activevolumegroups_ARG, 'A', "activevolumegroups", 0, 0, 0)
-arg(background_ARG, 'b', "background", 0, 0, 0)
-arg(backgroundfork_ARG, 'b', "background", 0, 0, 0)
-arg(basevgname_ARG, 'n', "basevgname", string_VAL, 0, 0)
-arg(blockdevice_ARG, 'b', "blockdevice", 0, 0, 0)
-arg(chunksize_ARG, 'c', "chunksize", sizekb_VAL, 0, 0)
-arg(clustered_ARG, 'c', "clustered", bool_VAL, 0, 0)
-arg(colon_ARG, 'c', "colon", 0, 0, 0)
-arg(columns_ARG, 'C', "columns", 0, 0, 0)
-arg(contiguous_ARG, 'C', "contiguous", bool_VAL, 0, 0)
-arg(debug_ARG, 'd', "debug", 0, ARG_COUNTABLE, 0)
-arg(exported_ARG, 'e', "exported", 0, 0, 0)
-arg(physicalextent_ARG, 'E', "physicalextent", 0, 0, 0)
-arg(file_ARG, 'f', "file", string_VAL, 0, 0)
-arg(force_ARG, 'f', "force", 0, ARG_COUNTABLE, 0)
-arg(full_ARG, 'f', "full", 0, 0, 0)
-arg(help_ARG, 'h', "help", 0, ARG_COUNTABLE, 0)
-arg(cache_ARG, 'H', "cache", 0, 0, 0)
-arg(history_ARG, 'H', "history", 0, 0, 0)
-arg(help2_ARG, '?', "", 0, 0, 0)
-arg(import_ARG, 'i', "import", 0, 0, 0)
-arg(interval_ARG, 'i', "interval", number_VAL, 0, 0)
-arg(iop_version_ARG, 'i', "iop_version", 0, 0, 0)
-arg(stripes_ARG, 'i', "stripes", number_VAL, 0, 0)
-arg(stripesize_ARG, 'I', "stripesize", sizekb_VAL, 0, 0)
-arg(logicalvolume_ARG, 'l', "logicalvolume", number_VAL, 0, 0)
-arg(maxlogicalvolumes_ARG, 'l', "maxlogicalvolumes", number_VAL, 0, 0)
-arg(extents_ARG, 'l', "extents", numsignedper_VAL, 0, 0)
-arg(list_ARG, 'l', "list", 0, 0, 0)
-arg(lvmpartition_ARG, 'l', "lvmpartition", 0, 0, 0)
-arg(size_ARG, 'L', "size", sizemb_VAL, 0, 0)
-arg(persistent_ARG, 'M', "persistent", bool_VAL, 0, 0)
-arg(major_ARG, 'j', "major", number_VAL, ARG_GROUPABLE, 0)
-arg(setactivationskip_ARG, 'k', "setactivationskip", bool_VAL, 0, 0)
-arg(ignoreactivationskip_ARG, 'K', "ignoreactivationskip", 0, 0, 0)
-arg(maps_ARG, 'm', "maps", 0, 0, 0)
-arg(mirrors_ARG, 'm', "mirrors", numsigned_VAL, 0, 0)
-arg(metadatatype_ARG, 'M', "metadatatype", metadatatype_VAL, 0, 0)
-arg(name_ARG, 'n', "name", string_VAL, 0, 0)
-arg(nofsck_ARG, 'n', "nofsck", 0, 0, 0)
-arg(novolumegroup_ARG, 'n', "novolumegroup", 0, 0, 0)
-arg(oldpath_ARG, 'n', "oldpath", 0, 0, 0)
-arg(options_ARG, 'o', "options", string_VAL, ARG_GROUPABLE, 0)
-arg(sort_ARG, 'O', "sort", string_VAL, ARG_GROUPABLE, 0)
-arg(maxphysicalvolumes_ARG, 'p', "maxphysicalvolumes", uint32_VAL, 0, 0)
-arg(permission_ARG, 'p', "permission", permission_VAL, 0, 0)
-arg(partial_ARG, 'P', "partial", 0, 0, 0)
-arg(physicalvolume_ARG, 'P', "physicalvolume", 0, 0, 0)
-arg(quiet_ARG, 'q', "quiet", 0, ARG_COUNTABLE, 0)
-arg(readahead_ARG, 'r', "readahead", readahead_VAL, 0, 0)
-arg(resizefs_ARG, 'r', "resizefs", 0, 0, 0)
-arg(reset_ARG, 'R', "reset", 0, 0, 0)
-arg(regionsize_ARG, 'R', "regionsize", sizemb_VAL, 0, 0)
-arg(physicalextentsize_ARG, 's', "physicalextentsize", sizemb_VAL, 0, 0)
-arg(snapshot_ARG, 's', "snapshot", 0, 0, 0)
-arg(short_ARG, 's', "short", 0, 0, 0)
-arg(stdin_ARG, 's', "stdin", 0, 0, 0)
-arg(select_ARG, 'S', "select", string_VAL, ARG_GROUPABLE, 0)
-arg(test_ARG, 't', "test", 0, 0, 0)
-arg(thin_ARG, 'T', "thin", 0, 0, 0)
-arg(uuid_ARG, 'u', "uuid", 0, 0, 0)
-arg(uuidstr_ARG, 'u', "uuid", string_VAL, 0, 0)
-arg(uuidlist_ARG, 'U', "uuidlist", 0, 0, 0)
-arg(verbose_ARG, 'v', "verbose", 0, ARG_COUNTABLE, 0)
-arg(volumegroup_ARG, 'V', "volumegroup", 0, 0, 0)
-arg(virtualsize_ARG, 'V', "virtualsize", sizemb_VAL, 0, 0)
-arg(wipesignatures_ARG, 'W', "wipesignatures", bool_VAL, 0, 0)
-arg(allocatable_ARG, 'x', "allocatable", bool_VAL, 0, 0)
-arg(resizeable_ARG, 'x', "resizeable", bool_VAL, 0, 0)
-arg(yes_ARG, 'y', "yes", 0, 0, 0)
-arg(zero_ARG, 'Z', "zero", bool_VAL, 0, 0)
+arg(activate_ARG, 'a', "activate", activation_VAL, 0, 0,
+ "#lvchange\n"
+ "#vgchange\n"
+ "Change the active state of LVs.\n"
+ "An active LV can be used through a block device,\n"
+ "allowing data on the LV to be accessed.\n"
+ "\\fBy\\fP makes LVs active, or available.\n"
+ "\\fBn\\fP makes LVs inactive, or unavailable.\n"
+ "The block device for the LV is added or removed from the system\n"
+ "using device-mapper in the kernel.\n"
+ "A symbolic link /dev/VGName/LVName pointing to the device node is also added/removed.\n"
+ "All software and scripts should access the device through the symbolic\n"
+ "link and present this as the name of the device.\n"
+ "The location and name of the underlying device node may depend on\n"
+ "the distribution, configuration (e.g. udev), or release version.\n"
+ "\\fBay\\fP specifies autoactivation, in which case an LV is activated\n"
+ "only if it matches an item in lvm.conf activation/auto_activation_volume_list.\n"
+ "If the list is not set, all LVs are considered to match, and if\n"
+ "if the list is set but empty, no LVs match.\n"
+ "Autoactivation should be used during system boot to make it possible\n"
+ "to select which LVs should be automatically activated by the system.\n"
+ "See lvmlockd(8) for more information about activation options for shared VGs.\n"
+ "See clvmd(8) for more information about activation options for clustered VGs.\n"
+ "#lvcreate\n"
+ "Controls the active state of the new LV.\n"
+ "\\fBy\\fP makes the LV active, or available.\n"
+ "New LVs are made active by default.\n"
+ "\\fBn\\fP makes the LV inactive, or unavailable, only when possible.\n"
+ "In some cases, creating an LV requires it to be active.\n"
+ "For example, COW snapshots of an active origin LV can only\n"
+ "be created in the active state (this does not apply to thin snapshots.)\n"
+ "The --zero option normally requires the LV to be active.\n"
+ "If autoactivation \\fBay\\fP is used, the LV is only activated\n"
+ "if it matches an item in lvm.conf activation/auto_activation_volume_list.\n"
+ "\\fBay\\fP implies --zero n and --wipesignatures n.\n"
+ "See lvmlockd(8) for more information about activation options for shared VGs.\n"
+ "See clvmd(8) for more information about activation options for clustered VGs.\n")
+
+arg(all_ARG, 'a', "all", 0, 0, 0,
+ "#vgreduce\n"
+ "Removes all empty PVs if none are named on the command line.\n"
+ "#lvscan\n"
+ "#lvdisplay\n"
+ "#lvs\n"
+ "Show information about internal LVs.\n"
+ "These are components of normal LVs, such as mirrors,\n"
+ "which are not independently accessible, e.g. not mountable.\n"
+ "#vgs\n"
+ "List all VGs. Equivalent to not specifying any VGs.\n"
+ "#pvs\n"
+ "#pvdisplay\n"
+ "Show information about devices that have not been initialized\n"
+ "by LVM, i.e. they are not PVs.\n")
+
+arg(autobackup_ARG, 'A', "autobackup", bool_VAL, 0, 0,
+ "Specifies if metadata should be backed up automatically after a change.\n"
+ "Enabling this is strongly advised! See vgcfgbackup(8) for more information.\n")
+
+arg(activevolumegroups_ARG, 'A', "activevolumegroups", 0, 0, 0,
+ "Only select active VGs. The VG is considered active\n"
+ "if at least one of its LVs is active.\n")
+
+/* FIXME: remove background option from pvscan, it's not used */
+
+arg(background_ARG, 'b', "background", 0, 0, 0,
+ "If the operation requires polling, this option causes the command to\n"
+ "return before the operation is complete, and polling is done in the\n"
+ "background.\n")
+
+/* Not used */
+arg(backgroundfork_ARG, 'b', "background", 0, 0, 0, NULL)
+
+arg(basevgname_ARG, 'n', "basevgname", string_VAL, 0, 0,
+ "By default the snapshot VG will be renamed to the original name plus a\n"
+ "numeric suffix to avoid duplicate naming (e.g. 'test_vg' would be renamed\n"
+ "to 'test_vg1'). This option will override the base VG name that is\n"
+ "used for all VG renames. If a VG already exists with the specified name\n"
+ "a numeric suffix will be added (like the previous example) to make it unique.\n")
+
+arg(blockdevice_ARG, 'b', "blockdevice", 0, 0, 0,
+ "No longer used.\n")
+
+arg(chunksize_ARG, 'c', "chunksize", sizekb_VAL, 0, 0,
+ "The size of chunks in a snapshot, cache pool or thin pool.\n"
+ "For snapshots, the value must be a power of 2 between 4KiB and 512KiB\n"
+ "and the default value is 4.\n"
+ "For a cache pool the value must be between 32KiB and 1GiB\n"
+ "and the default value is 64.\n"
+ "For a thin pool the value must be between 64KiB and 1GiB\n"
+ "and the default value starts with 64 and scales up to fit the\n"
+ "pool metadata size within 128MiB, if the pool metadata size is not specified.\n"
+ "The value must be a multiple of 64KiB.\n")
+
+arg(clustered_ARG, 'c', "clustered", bool_VAL, 0, 0,
+ "#vgcreate\n"
+ "Create a clustered VG using clvmd if LVM is compiled with cluster support.\n"
+ "This allows multiple hosts to share a VG on shared devices.\n"
+ "clvmd and a lock manager must be configured and running.\n"
+ "(A clustered VG using clvmd is different from a shared VG using lvmlockd.)\n"
+ "See clvmd(8) for more information about clustered VGs.\n"
+ "#vgchange\n"
+ "Change the clustered property of a VG using clvmd.\n"
+ "See clvmd(8) for more information about clustered VGs.\n"
+ "#vgsplit\n"
+ "Specifies the clustered property of the new VG.\n")
+
+arg(colon_ARG, 'c', "colon", 0, 0, 0,
+ "Generate colon separated output for easier parsing in scripts or programs.\n"
+ "Also see vgs(8) which provides considerably more control over the output.\n")
+
+arg(columns_ARG, 'C', "columns", 0, 0, 0,
+ "Display output in columns, the equivalent of vgs(8).\n"
+ "Options listed are the same as options given in vgs(8).\n")
+
+arg(contiguous_ARG, 'C', "contiguous", bool_VAL, 0, 0,
+ "Sets or resets the contiguous allocation policy for LVs.\n"
+ "Default is no contiguous allocation based on a next free principle.\n"
+ "It is only possible to change a non-contiguous allocation policy\n"
+ "to contiguous if all of the allocated physical extents in the LV\n"
+ "are already contiguous.\n")
+
+arg(debug_ARG, 'd', "debug", 0, ARG_COUNTABLE, 0,
+ "Set debug level. Repeat from 1 to 6 times to increase the detail of\n"
+ "messages sent to the log file and/or syslog (if configured).\n")
+
+arg(exported_ARG, 'e', "exported", 0, 0, 0,
+ "Only show PVs belonging to exported VGs.\n")
+
+/* Not used. */
+arg(physicalextent_ARG, 'E', "physicalextent", 0, 0, 0, NULL)
+
+arg(file_ARG, 'f', "file", string_VAL, 0, 0,
+ "#lvmconfig\n"
+ "#dumpconfig\n"
+ "#config\n"
+ "Write output to the named file.\n"
+ "#vgcfgbackup\n"
+ "Write the backup to the named file.\n"
+ "When backing up more than one VG, the file name is\n"
+ "treated as a template, and %s is replaced by the VG name.\n"
+ "#vgcfgrestore\n"
+ "Read metadata backup from the named file.\n"
+ "Usually this file was created by vgcfgbackup.\n")
+
+arg(force_ARG, 'f', "force", 0, ARG_COUNTABLE, 0,
+ "Override various checks, confirmations and protections.\n"
+ "Use with extreme caution.\n")
+
+/* Not used. */
+arg(full_ARG, 'f', "full", 0, 0, 0, NULL)
+
+arg(help_ARG, 'h', "help", 0, ARG_COUNTABLE, 0,
+ "Display help text. Repeat this option for more information.\n")
+
+arg(cache_ARG, 'H', "cache", 0, 0, 0,
+ "Specifies the command is handling a cache LV or cache pool.\n"
+ "See --type cache and --type cache-pool.\n"
+ "See lvmcache(7) for more information about LVM caching.\n")
+
+arg(history_ARG, 'H', "history", 0, 0, 0,
+ "Include historical LVs in the output.\n"
+ "(This has no effect unless LVs were removed while\n"
+ "lvm.conf metadata/record_lvs_history was enabled.\n")
+
+/* Not used */
+arg(help2_ARG, '?', "", 0, 0, 0, NULL)
+
+arg(import_ARG, 'i', "import", 0, 0, 0,
+ "Import exported VGs. Otherwise VGs that have been exported\n"
+ "will not be changed (nor will their associated PVs).\n")
+
+arg(interval_ARG, 'i', "interval", number_VAL, 0, 0,
+ "Report progress at regular intervals.\n")
+
+/* Not used */
+arg(iop_version_ARG, 'i', "iop_version", 0, 0, 0, NULL)
+
+arg(stripes_ARG, 'i', "stripes", number_VAL, 0, 0,
+ "Specifies the number of stripes in a striped LV. This is the number of\n"
+ "PVs (devices) that a striped LV is spread across. Data that\n"
+ "appears sequential in the LV is spread across multiple devices in units of\n"
+ "the stripe size (see --stripesize). This does not apply to\n"
+ "existing allocated space, only newly allocated space can be striped.\n"
+ "When creating a RAID 4/5/6 LV, this number does not include the extra\n"
+ "devices that are required for parity. The largest number depends on\n"
+ "the RAID type (raid0: 64, raid10: 32, raid4/5: 63, raid6: 62.)\n"
+ "When unspecified, the default depends on the RAID type\n"
+ "(raid0: 2, raid10: 4, raid4/5: 3, raid6: 5.)\n"
+ "When unspecified, to stripe across all PVs of the VG,\n"
+ "set lvm.conf allocation/raid_stripe_all_devices=1.\n")
+
+arg(stripesize_ARG, 'I', "stripesize", sizekb_VAL, 0, 0,
+ "The amount of data that is written to one device before\n"
+ "moving to the next in a striped LV.\n")
+
+arg(logicalvolume_ARG, 'l', "logicalvolume", number_VAL, 0, 0,
+ "Sets the maximum number of LVs allowed in a VG.\n")
+
+arg(maxlogicalvolumes_ARG, 'l', "maxlogicalvolumes", number_VAL, 0, 0,
+ "Sets the maximum number of LVs allowed in a VG.\n")
+
+arg(extents_ARG, 'l', "extents", numsignedper_VAL, 0, 0,
+ "#lvcreate\n"
+ "Specifies the size of the new LV in logical extents.\n"
+ "The --size and --extents options are alternate methods of specifying size.\n"
+ "The total number of physical extents used will be\n"
+ "greater when redundant data is needed for RAID levels.\n"
+ "An alternate syntax allows the size to be determined indirectly\n"
+ "as a percentage of the size of a related VG, LV, or set of PVs. The\n"
+ "suffix \\fB%VG\\fP denotes the total size of the VG, the suffix \\fB%FREE\\fP\n"
+ "the remaining free space in the VG, and the suffix \\fB%PVS\\fP the free\n"
+ "space in the specified PVs. For a snapshot, the size\n"
+ "can be expressed as a percentage of the total size of the origin LV\n"
+ "with the suffix \\fB%ORIGIN\\fP (\\fB100%ORIGIN\\fP provides space for\n"
+ "the whole origin).\n"
+ "When expressed as a percentage, the size defines an upper limit for the\n"
+ "number of logical extents in the new LV. The precise number of logical\n"
+ "extents in the new LV is not determined until the command has completed.\n"
+ "#lvreduce\n"
+ "#lvextend\n"
+ "#lvresize\n"
+ "Specifies the new size of the LV in logical extents.\n"
+ "The --size and --extents options are alternate methods of specifying size.\n"
+ "The total number of physical extents used will be\n"
+ "greater when redundant data is needed for RAID levels.\n"
+ "An alternate syntax allows the size to be determined indirectly\n"
+ "as a percentage of the size of a related VG, LV, or set of PVs. The\n"
+ "suffix \\fB%VG\\fP denotes the total size of the VG, the suffix \\fB%FREE\\fP\n"
+ "the remaining free space in the VG, and the suffix \\fB%PVS\\fP the free\n"
+ "space in the specified PVs. For a snapshot, the size\n"
+ "can be expressed as a percentage of the total size of the origin LV\n"
+ "with the suffix \\fB%ORIGIN\\fP (\\fB100%ORIGIN\\fP provides space for\n"
+ "the whole origin).\n"
+ "When expressed as a percentage, the size defines an upper limit for the\n"
+ "number of logical extents in the new LV. The precise number of logical\n"
+ "extents in the new LV is not determined until the command has completed.\n"
+ "The plus prefix \\fB+\\fP can be used, in which case\n"
+ "the value is added to the current size,\n"
+ "or the minus prefix \\fB-\\fP can be used, in which case\n"
+ "the value is subtracted from the current size.\n")
+
+arg(list_ARG, 'l', "list", 0, 0, 0,
+ "#lvmconfig\n"
+ "#dumpconfig\n"
+ "#config\n"
+ "List config settings with summarizing comment. This is the same as using\n"
+ "options --type list --withsummary.\n"
+ "#vgcfgrestore\n"
+ "List metadata backup and archive files pertaining to the VG.\n"
+ "May be used with --file. Does not restore the VG.\n"
+ "#vgmerge\n"
+ "Display merged destination VG like vgdisplay -v.\n")
+
+arg(lvmpartition_ARG, 'l', "lvmpartition", 0, 0, 0,
+ "Only report PVs.\n")
+
+arg(size_ARG, 'L', "size", sizemb_VAL, 0, 0,
+ "#lvcreate\n"
+ "Specifies the size of the new LV.\n"
+ "The --size and --extents options are alternate methods of specifying size.\n"
+ "The total number of physical extents used will be\n"
+ "greater when redundant data is needed for RAID levels.\n"
+ "A suffix can be chosen from: \\fBbBsSkKmMgGtTpPeE\\fP.\n"
+ "All units are base two values, regardless of letter capitalization:\n"
+ "b|B is bytes, s|S is sectors of 512 bytes,\n"
+ "k|K is kilobytes, m|M is megabytes,\n"
+ "g|G is gigabytes, t|T is terabytes,\n"
+ "p|P is petabytes, e|E is exabytes.\n"
+ "#lvreduce\n"
+ "#lvextend\n"
+ "#lvresize\n"
+ "Specifies the new size of the LV.\n"
+ "The --size and --extents options are alternate methods of specifying size.\n"
+ "The total number of physical extents used will be\n"
+ "greater when redundant data is needed for RAID levels.\n"
+ "A suffix can be chosen from: \\fBbBsSkKmMgGtTpPeE\\fP.\n"
+ "All units are base two values, regardless of letter capitalization:\n"
+ "b|B is bytes, s|S is sectors of 512 bytes,\n"
+ "k|K is kilobytes, m|M is megabytes,\n"
+ "g|G is gigabytes, t|T is terabytes,\n"
+ "p|P is petabytes, e|E is exabytes.\n"
+ "The plus prefix \\fB+\\fP can be used, in which case\n"
+ "the value is added to the current size,\n"
+ "or the minus prefix \\fB-\\fP can be used, in which case\n"
+ "the value is subtracted from the current size.\n")
+
+arg(persistent_ARG, 'M', "persistent", bool_VAL, 0, 0,
+ "When yes, makes the specified minor number persistent.\n")
+
+arg(major_ARG, 'j', "major", number_VAL, ARG_GROUPABLE, 0,
+ "#lvcreate\n"
+ "#lvchange\n"
+ "Sets the major number of an LV block device.\n"
+ "#pvscan\n"
+ "The major number of a device.\n")
+
+arg(setactivationskip_ARG, 'k', "setactivationskip", bool_VAL, 0, 0,
+ "Persistently sets (yes) or clears (no) the \"activation skip\" flag on an LV.\n"
+ "An LV with this flag set is not activated unless the\n"
+ "--ignoreactivationskip option is used by the activation command.\n"
+ "This flag is set by default on new thin snapshot LVs.\n"
+ "The flag is not applied to deactivation.\n"
+ "The current value of the flag is indicated in the lvs lv_attr bits.\n")
+
+arg(ignoreactivationskip_ARG, 'K', "ignoreactivationskip", 0, 0, 0,
+ "Ignore the \"activation skip\" LV flag during activation\n"
+ "to allow LVs with the flag set to be activated.\n")
+
+arg(maps_ARG, 'm', "maps", 0, 0, 0,
+ "#lvdisplay\n"
+ "Display the mapping of logical extents to PVs and physical extents.\n"
+ "To map physical extents to logical extents use:\n"
+ "pvs --segments -o+lv_name,seg_start_pe,segtype\n"
+ "#pvdisplay\n"
+ "Display the mapping of physical extents to LVs and logical extents.\n")
+
+/* FIXME: should the unused mirrors option be removed from lvextend? */
+
+arg(mirrors_ARG, 'm', "mirrors", numsigned_VAL, 0, 0,
+ "#lvcreate\n"
+ "Specifies the number of mirror images in addition to the original LV\n"
+ "image, e.g. --mirrors 1 means there are two images of the data, the\n"
+ "original and one mirror image.\n"
+ "Optional positional PV args on the command line can specify the devices\n"
+ "the images should be placed on.\n"
+ "There are two mirroring implementations: \"raid1\" and \"mirror\".\n"
+ "These are the names of the corresponding LV types, or \"segment types\".\n"
+ "Use the --type option to specify which to use (raid1 is default,\n"
+ "and mirror is legacy)\n"
+ "Use lvm.conf global/mirror_segtype_default and\n"
+ "global/raid10_segtype_default to configure the default types.\n"
+ "See the --nosync option for avoiding initial image synchronization.\n"
+ "#lvconvert\n"
+ "Specifies the number of mirror images in addition to the original LV\n"
+ "image, e.g. --mirrors 1 means there are two images of the data, the\n"
+ "original and one mirror image.\n"
+ "Optional positional PV args on the command line can specify the devices\n"
+ "the images should be placed on.\n"
+ "There are two mirroring implementations: \"raid1\" and \"mirror\".\n"
+ "These are the names of the corresponding LV types, or \"segment types\".\n"
+ "Use the --type option to specify which to use (raid1 is default,\n"
+ "and mirror is legacy)\n"
+ "Use lvm.conf global/mirror_segtype_default and\n"
+ "global/raid10_segtype_default to configure the default types.\n"
+ "The plus prefix \\fB+\\fP can be used, in which case\n"
+ "the number is added to the current number of images,\n"
+ "or the minus prefix \\fB-\\fP can be used, in which case\n"
+ "the number is subtracted from the current number of images.\n"
+ "#lvextend\n"
+ "Not used.\n")
+
+arg(metadatatype_ARG, 'M', "metadatatype", metadatatype_VAL, 0, 0,
+ "Specifies the type of on-disk metadata to use.\n"
+ "\\fBlvm2\\fP (or just \\fB2\\fP) is the current, standard format.\n"
+ "\\fBlvm1\\fP (or just \\fB1\\fP) is a historical format that\n"
+ "can be used for accessing old data.\n")
+
+arg(name_ARG, 'n', "name", string_VAL, 0, 0,
+ "#lvcreate\n"
+ "#lvconvert\n"
+ "Specifies the name of a new LV.\n"
+ "When unspecified, a default name of \"lvol#\" is\n"
+ "generated, where # is a number generated by LVM.\n"
+ "#pvmove\n"
+ "Move only the extents belonging to the named LV.\n"
+ "#vgsplit\n"
+ "Move only PVs used by the named LV.\n")
+
+arg(nofsck_ARG, 'n', "nofsck", 0, 0, 0,
+ "Do not perform fsck before resizing filesystem when filesystem\n"
+ "requires it. You may need to use --force to proceed with\n"
+ "this option.\n")
+
+arg(novolumegroup_ARG, 'n', "novolumegroup", 0, 0, 0,
+ "Only show PVs not belonging to any VG.\n")
+
+/* Not used */
+arg(oldpath_ARG, 'n', "oldpath", 0, 0, 0, NULL)
+
+/*
+ * FIXME: a free-form discussion section and document the
+ * VG/LV/PV attr bits which were previously listed
+ * in the description for -o.
+ */
+
+arg(options_ARG, 'o', "options", string_VAL, ARG_GROUPABLE, 0,
+ "Comma-separated, ordered list of fields to display in columns.\n"
+ "String arg syntax is: [+|-|#]Field1[,Field2 ...]\n"
+ "The prefix \\fB+\\fP will append the specified fields to the default fields,\n"
+ "\\fB-\\fP will remove the specified fields from the default fields, and\n"
+ "\\fB#\\fP will compact specified fields (removing them when empty for all rows.)\n"
+ "Use \\fB-o help\\fP to view the list of all available fields.\n"
+ "The -o option can be repeated, providing several lists.\n"
+ "These lists are evaluated from left to right.\n"
+ "Use field name \\fBlv_all\\fP to view all LV fields,\n"
+ "\\fBvg_all\\fP all VG fields,\n"
+ "\\fBpv_all\\fP all PV fields,\n"
+ "\\fBpvseg_all\\fP all PV segment fields,\n"
+ "\\fBseg_all\\fP all LV segment fields, and\n"
+ "\\fBpvseg_all\\fP all PV segment columns.\n"
+ "See the lvm.conf report section for more config options.\n"
+ "See lvmreport(7) for more information about reporting.\n")
+
+arg(sort_ARG, 'O', "sort", string_VAL, ARG_GROUPABLE, 0,
+ "Comma-separated ordered list of columns to sort by. Replaces the default\n"
+ "selection. Precede any column with \\fB-\\fP for a reverse sort on that column.\n")
+
+arg(maxphysicalvolumes_ARG, 'p', "maxphysicalvolumes", uint32_VAL, 0, 0,
+ "Sets the maximum number of PVs that can belong to the VG.\n"
+ "The value 0 removes any limitation.\n"
+ "For large numbers of PVs, also see options --pvmetadatacopies,\n"
+ "and --vgmetadatacopies for improving performance.\n")
+
+arg(permission_ARG, 'p', "permission", permission_VAL, 0, 0,
+ "Set access permission to read only \\fBr\\fP or read and write \\fBrw\\fP.\n")
+
+/* FIXME: I left out some of the previous description that didn't sound correct. */
+
+arg(partial_ARG, 'P', "partial", 0, 0, 0,
+ "When set, the tools will do their best to provide access to VGs\n"
+ "that are only partially available (one or more PVs belonging\n"
+ "to the VG are missing from the system). Metadata may not be\n"
+ "changed with this option.\n")
+
+/* Not used */
+arg(physicalvolume_ARG, 'P', "physicalvolume", 0, 0, 0, NULL)
+
+arg(quiet_ARG, 'q', "quiet", 0, ARG_COUNTABLE, 0,
+ "Suppress output and log messages. Overrides --debug and --verbose.\n"
+ "Repeat once to also suppress any prompts with answer no.\n")
+
+arg(readahead_ARG, 'r', "readahead", readahead_VAL, 0, 0,
+ "Sets read ahead sector count of an LV.\n"
+ "\\fBauto\\fP is the default which allows the kernel to choose\n"
+ "a suitable value automatically.\n"
+ "\\fBnone\\fP is equivalent to zero.\n")
+
+arg(resizefs_ARG, 'r', "resizefs", 0, 0, 0,
+ "Resize underlying filesystem together with the LV using fsadm(8).\n")
+
+/* Not used */
+arg(reset_ARG, 'R', "reset", 0, 0, 0, NULL)
+
+arg(regionsize_ARG, 'R', "regionsize", sizemb_VAL, 0, 0,
+ "A mirror is divided into regions of this size, and the mirror log\n"
+ "uses this granularity to track which regions are in sync.\n"
+ "(This can be used with the \"mirror\" type, not the \"raid1\" type.)\n")
+
+arg(physicalextentsize_ARG, 's', "physicalextentsize", sizemb_VAL, 0, 0,
+ "#vgcreate\n"
+ "Sets the physical extent size of PVs in the VG.\n"
+ "The value must be either a power of 2 of at least 1 sector\n"
+ "(where the sector size is the largest sector size of the PVs\n"
+ "currently used in the VG), or at least 128KiB.\n"
+ "Once this value has been set, it is difficult to change\n"
+ "without recreating the VG, unless no extents need moving.\n"
+ "#vgchange\n"
+ "Sets the physical extent size of PVs in the VG.\n"
+ "The value must be either a power of 2 of at least 1 sector\n"
+ "(where the sector size is the largest sector size of the PVs\n"
+ "currently used in the VG), or at least 128KiB.\n"
+ "Once this value has been set, it is difficult to change\n"
+ "without recreating the VG, unless no extents need moving.\n"
+ "Before increasing the physical extent size, you might need to use lvresize,\n"
+ "pvresize and/or pvmove so that everything fits. For example, every\n"
+ "contiguous range of extents used in a LV must start and end on an extent boundary.\n")
+
+arg(snapshot_ARG, 's', "snapshot", 0, 0, 0,
+ "#lvcreate\n"
+ "Create a snapshot. Snapshots provide a \"frozen image\" of an origin LV.\n"
+ "The snapshot LV can be used, e.g. for backups, while the origin LV\n"
+ "continues to be used.\n"
+ "This option can create a COW (copy on write) snapshot,\n"
+ "or a thin snapshot (in a thin pool.)\n"
+ "Thin snapshots are created when the origin is a thin LV and\n"
+ "the size option is NOT specified. Thin snapshots share the same blocks\n"
+ "in the thin pool, and do not allocate new space from the VG.\n"
+ "Thin snapshots are created with the \"activation skip\" flag,\n"
+ "see --setactivationskip.\n"
+ "A thin snapshot of a non-thin \"external origin\" LV is created\n"
+ "when a thin pool is specified. Unprovisioned blocks in the thin snapshot\n"
+ "LV are read from the external origin LV. The external origin LV must\n"
+ "be read-only.\n"
+ "See lvmthin(7) for more information about LVM thin provisioning.\n"
+ "COW snapshots are created when a size is specified. The size is allocated\n"
+ "from space in the VG, and is the amount of space that can be used\n"
+ "for saving COW blocks as writes occur to the origin or snapshot.\n"
+ "The size chosen should depend upon the amount of writes that are expected;\n"
+ "often 20% of the origin LV is enough. If COW space runs low, it can\n"
+ "be extended with lvextend (shrinking is also allowed with lvreduce.)\n"
+ "A small amount of the COW snapshot LV size is used to track COW block\n"
+ "locations, so the full size is not available for COW data blocks.\n"
+ "Use lvs to check how much space is used, and see --monitor to\n"
+ "to automatically extend the size to avoid running out of space.\n"
+ "#lvconvert\n"
+ "Combine a former COW snapshot LV with a former origin LV to reverse\n"
+ "a previous --splitsnapshot command.\n")
+
+arg(short_ARG, 's', "short", 0, 0, 0,
+ "#pvdisplay\n"
+ "Only display the size of the given PVs.\n"
+ "#vgdisplay\n"
+ "Give a short listing showing the existence of VGs.\n"
+ "#pvscan\n"
+ "Short listing format.\n")
+
+/* Not used */
+arg(stdin_ARG, 's', "stdin", 0, 0, 0, NULL)
+
+arg(select_ARG, 'S', "select", string_VAL, ARG_GROUPABLE, 0,
+ "Select objects for processing and reporting based on specified criteria.\n"
+ "The criteria syntax is described in lvmreport(7) under Selection.\n"
+ "For reporting commands, display rows that match the criteria.\n"
+ "All rows can be displayed with an additional \"selected\" field (-o selected)\n"
+ "showing 1 if the row matches the selection and 0 otherwise.\n"
+ "For non-reporting commands which process LVM entities, the selection is\n"
+ "used to choose items to process.\n")
+
+arg(test_ARG, 't', "test", 0, 0, 0,
+ "Run in test mode. Commands will not update metadata.\n"
+ "This is implemented by disabling all metadata writing but nevertheless\n"
+ "returning success to the calling function. This may lead to unusual\n"
+ "error messages in multi-stage operations if a tool relies on reading\n"
+ "back metadata it believes has changed but hasn't.\n")
+
+arg(thin_ARG, 'T', "thin", 0, 0, 0,
+ "Specifies the command is handling a thin LV or thin pool.\n"
+ "See --type thin, --type thin-pool, and --virtualsize.\n"
+ "See lvmthin(7) for more information about LVM thin provisioning.\n")
+
+arg(uuid_ARG, 'u', "uuid", 0, 0, 0,
+ "#pvchange\n"
+ "Generate new random UUID for specified PVs.\n"
+ "#pvscan\n"
+ "Show UUIDs in addition to device names.\n"
+ "#vgchange\n"
+ "Generate new random UUID for specified VGs.\n")
+
+arg(uuidstr_ARG, 'u', "uuid", string_VAL, 0, 0,
+ "Specify a UUID for the device.\n"
+ "Without this option, a random UUID is generated.\n"
+ "This option is needed before restoring a backup of LVM metadata\n"
+ "onto a replacement device; see vgcfgrestore(8). As such, use of\n"
+ "--restorefile is compulsory unless the --norestorefile is used.\n"
+ "All PVs must have unique UUIDs, and LVM will prevent certain operations\n"
+ "if multiple devices are seen with the same UUID.\n"
+ "See vgimportclone(8) for more information.\n")
+
+/* Not used */
+arg(uuidlist_ARG, 'U', "uuidlist", 0, 0, 0, NULL)
+
+arg(verbose_ARG, 'v', "verbose", 0, ARG_COUNTABLE, 0,
+ "Set verbose level. Repeat from 1 to 4 times to increase the detail\n"
+ "of messages sent to stdout and stderr.\n")
+
+/* Not used */
+arg(volumegroup_ARG, 'V', "volumegroup", 0, 0, 0, NULL)
+
+arg(virtualsize_ARG, 'V', "virtualsize", sizemb_VAL, 0, 0,
+ "The virtual size of a new thin LV.\n"
+ "See lvmthin(7) for more information about LVM thin provisioning.\n"
+ "Using virtual size (-V) and actual size (-L) together creates\n"
+ "a sparse LV.\n"
+ "lvm.conf global/sparse_segtype_default determines the\n"
+ "default segment type used to create a sparse LV.\n"
+ "Anything written to a sparse LV will be returned when reading from it.\n"
+ "Reading from other areas of the LV will return blocks of zeros.\n"
+ "When using a snapshot to create a sparse LV, a hidden virtual device\n"
+ "is created using the zero target, and the LV has the suffix _vorigin.\n"
+ "Snapshots are less efficient than thin provisioning when creating\n"
+ "large sparse LVs (GiB).\n")
+
+arg(wipesignatures_ARG, 'W', "wipesignatures", bool_VAL, 0, 0,
+ "Controls detection and subsequent wiping of signatures on new LVs.\n"
+ "There is a prompt for each signature detected to confirm its wiping\n"
+ "(unless --yes is used to override confirmations.)\n"
+ "When not specified, signatures are wiped whenever zeroing is done\n"
+ "(see --zero). This behaviour can be configured with\n"
+ "lvm.conf allocation/wipe_signatures_when_zeroing_new_lvs.\n"
+ "If blkid wiping is used (lvm.conf allocation/use_blkid_wiping)\n"
+ "and LVM is compiled with blkid wiping support, then the blkid(8)\n"
+ "library is used to detect the signatures (use blkid -k to list the\n"
+ "signatures that are recognized).\n"
+ "Otherwise, native LVM code is used to detect signatures\n"
+ "(only MD RAID, swap and LUKS signatures are detected in this case.)\n"
+ "The LV is not wiped if the read only flag is set.\n")
+
+arg(allocatable_ARG, 'x', "allocatable", bool_VAL, 0, 0,
+ "Enable or disable allocation of physical extents on this PV.\n")
+
+arg(resizeable_ARG, 'x', "resizeable", bool_VAL, 0, 0,
+ "Enables or disables the addition or removal of PVs to/from a VG\n"
+ "(by vgextend/vgreduce).\n")
+
+arg(yes_ARG, 'y', "yes", 0, 0, 0,
+ "Do not prompt for confirmation interactively but always assume the\n"
+ "answer yes. Use with extreme caution.\n")
+
+arg(zero_ARG, 'Z', "zero", bool_VAL, 0, 0,
+ "#lvchange\n"
+ "Set zeroing mode for thin pool. Note: already provisioned blocks from pool\n"
+ "in non-zero mode are not cleared in unwritten parts when setting --zero y.\n"
+ "#lvconvert\n"
+ "For snapshots, this controls zeroing of the first 4KiB of data in the\n"
+ "snapshot. If the LV is read-only, the snapshot will not be zeroed.\n"
+ "For thin pools, this controls zeroing of provisioned blocks.\n"
+ "Provisioning of large zeroed chunks negatively impacts performance.\n"
+ "#lvcreate\n"
+ "Controls zeroing of the first 4KiB of data in the new LV.\n"
+ "Default is \\fBy\\fP.\n"
+ "Snapshot COW volumes are always zeroed.\n"
+ "LV is not zeroed if the read only flag is set.\n"
+ "Warning: trying to mount an unzeroed LV can cause the system to hang.\n"
+ "#pvcreate\n"
+ "#vgcreate\n"
+ "#vgextend\n"
+ "Controls if the first 4 sectors (2048 bytes) of the device are wiped.\n"
+ "The default is to wipe these sectors unless either or both of\n"
+ "--restorefile or --uuid are specified.\n")
/* this should always be last */
-arg(ARG_COUNT, '-', "", 0, 0, 0)
+arg(ARG_COUNT, '-', "", 0, 0, 0, NULL)
/* *INDENT-ON* */
diff --git a/tools/create-commands.c b/tools/create-commands.c
index d9f8218..f9ff800 100644
--- a/tools/create-commands.c
+++ b/tools/create-commands.c
@@ -68,6 +68,7 @@ struct opt_name {
int val_enum; /* xyz_VAL when --foo takes a val like "--foo xyz" */
uint32_t unused1;
uint32_t unused2;
+ const char *desc;
};
/* also see val_props in tools.h and vals.h */
@@ -104,7 +105,7 @@ enum {
/* create foo_ARG enums for --option's */
enum {
-#define arg(a, b, c, d, e, f) a ,
+#define arg(a, b, c, d, e, f, g) a ,
#include "args.h"
#undef arg
};
@@ -136,7 +137,7 @@ static struct val_name val_names[VAL_COUNT + 1] = {
/* create table of option names, e.g. --foo, and corresponding enum from args.h */
static struct opt_name opt_names[ARG_COUNT + 1] = {
-#define arg(a, b, c, d, e, f) { # a, a, b, "", "--" c, d, e, f },
+#define arg(a, b, c, d, e, f, g) { # a, a, b, "", "--" c, d, e, f, g },
#include "args.h"
#undef arg
};
@@ -180,9 +181,15 @@ static struct cmd_name cmd_names[MAX_CMD_NAMES] = {
#undef xx
};
+/* array of pointers into opt_names[] that is sorted alphabetically (by long opt name) */
+
+static struct opt_name *opt_names_alpha[ARG_COUNT + 1];
+
#define MAX_LINE 1024
#define MAX_LINE_ARGC 256
+#define DESC_LINE 256
+
#define REQUIRED 1 /* required option */
#define OPTIONAL 0 /* optional option */
#define IGNORE -1 /* ignore option */
@@ -2050,6 +2057,23 @@ void print_man_usage(struct command *cmd)
printf("\n");
}
+/*
+ * common options listed in the usage section.
+ *
+ * For commands with only one variant, this is only
+ * the options which are common to all lvm commands
+ * (in lvm_all, see is_lvm_all_opt).
+ *
+ * For commands with more than one variant, this
+ * is the set of options common to all variants
+ * (in cname->common_options), (which obviously
+ * includes the options common to all lvm commands.)
+ *
+ * List ordering:
+ * options with short+long names, alphabetically,
+ * then options with only long names, alphabetically
+ */
+
void print_man_usage_common(struct command *cmd)
{
struct cmd_name *cname;
@@ -2063,23 +2087,17 @@ void print_man_usage_common(struct command *cmd)
printf(".RS 4\n");
printf("[");
- /*
- * when there's more than one variant, options that
- * are common to all commands with a common name.
- */
-
- if (cname->variants < 2)
- goto all;
-
/* print those with short opts */
- for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
if (!cname->common_options[opt_enum])
continue;
if (!opt_names[opt_enum].short_opt)
continue;
- if (is_lvm_all_opt(opt_enum))
+ if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
continue;
if (sep) {
@@ -2107,14 +2125,16 @@ void print_man_usage_common(struct command *cmd)
}
/* print those without short opts */
- for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
if (!cname->common_options[opt_enum])
continue;
if (opt_names[opt_enum].short_opt)
continue;
- if (is_lvm_all_opt(opt_enum))
+ if ((cname->variants < 2) && !is_lvm_all_opt(opt_enum))
continue;
if (sep) {
@@ -2140,67 +2160,108 @@ void print_man_usage_common(struct command *cmd)
break;
}
}
- all:
- /* options that are common to all lvm commands */
-
- /* those with short opts */
- for (oo = 0; oo < lvm_all.oo_count; oo++) {
- opt_enum = lvm_all.optional_opt_args[oo].opt;
- if (!opt_names[opt_enum].short_opt)
- continue;
+ printf(" ]\n");
+ return;
+}
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
- }
+/*
+ * Format of description, when different command names have
+ * different descriptions:
+ *
+ * "#cmdname1"
+ * "text foo goes here"
+ * "a second line of text."
+ * "#cmdname2"
+ * "text bar goes here"
+ * "another line of text."
+ *
+ * When called for cmdname2, this function should just print:
+ *
+ * "text bar goes here"
+ * "another line of text."
+ */
- printf(" \\fB-%c\\fP|\\fB%s\\fP",
- opt_names[opt_enum].short_opt,
- man_long_opt_name(cmd->name, opt_enum));
+static void print_man_option_desc(struct cmd_name *cname, int opt_enum)
+{
+ const char *desc = opt_names[opt_enum].desc;
+ char buf[DESC_LINE];
+ int started_cname = 0;
+ int line_count = 0;
+ int di, bi;
- if (lvm_all.optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def(&lvm_all.optional_opt_args[oo].def, 1);
- }
- sep = 1;
+ if (desc[0] != '#') {
+ printf("%s", desc);
+ return;
}
- /* those without short opts */
- for (oo = 0; oo < lvm_all.oo_count; oo++) {
- opt_enum = lvm_all.optional_opt_args[oo].opt;
+ for (di = 0; di < strlen(desc); di++) {
+ buf[bi++] = desc[di];
- if (opt_names[opt_enum].short_opt)
+ if (bi == DESC_LINE) {
+ printf("print_man_option_desc line too long\n");
+ return;
+ }
+
+ if (buf[bi-1] != '\n')
continue;
- if (sep) {
- printf(",");
- printf("\n.br\n");
- printf(" ");
+ if (buf[0] != '#') {
+ if (started_cname) {
+ printf("%s", buf);
+ line_count++;
+ }
+
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ continue;
}
- /* space alignment without short opt */
- printf(" ");
+ /* Line starting with #cmdname */
- printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+ /*
+ * Must be starting a new command name.
+ * If no lines have been printed, multiple command names
+ * are using the same text. If lines have been printed,
+ * then the start of a new command name means the end
+ * of text for the current command name.
+ */
+ if (line_count && started_cname)
+ return;
- if (lvm_all.optional_opt_args[oo].def.val_bits) {
- printf(" ");
- print_def(&lvm_all.optional_opt_args[oo].def, 1);
+ if (!strncmp(buf + 1, cname->name, strlen(cname->name))) {
+ /* The start of our command name. */
+ started_cname = 1;
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ } else {
+ /* The start of another command name. */
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
}
- sep = 1;
}
- printf(" ]\n");
+
+ if (bi && started_cname)
+ printf("%s", buf);
}
-void print_man_all_options(struct cmd_name *cname)
+/*
+ * Print a list of all options names for a given
+ * command name, listed by:
+ * options with short+long names, alphabetically,
+ * then options with only long names, alphabetically
+ */
+
+void print_man_all_options_list(struct cmd_name *cname)
{
int opt_enum, val_enum;
int sep = 0;
+ int i;
+
+ /* print those with both short and long opts */
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
- /* print those with short opts */
- for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
if (!cname->all_options[opt_enum])
continue;
@@ -2232,7 +2293,9 @@ void print_man_all_options(struct cmd_name *cname)
}
/* print those without short opts */
- for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
if (!cname->all_options[opt_enum])
continue;
@@ -2265,7 +2328,79 @@ void print_man_all_options(struct cmd_name *cname)
}
}
-#define DESC_LINE 256
+/*
+ * All options used for a given command name, along with descriptions.
+ * listed in order of:
+ * 1. options that are not common to all lvm commands, alphabetically
+ * 2. options common to all lvm commands, alphabetically
+ */
+
+void print_man_all_options_desc(struct cmd_name *cname)
+{
+ int opt_enum, val_enum;
+ int print_common = 0;
+ int sep = 0;
+ int i;
+
+ again:
+ /*
+ * Loop 1: print options that are not common to all lvm commands.
+ * Loop 2: print options common to all lvm commands (lvm_all)
+ */
+
+ for (i = 0; i < ARG_COUNT; i++) {
+ opt_enum = opt_names_alpha[i]->opt_enum;
+
+ if (!cname->all_options[opt_enum])
+ continue;
+
+ if (!print_common && is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (print_common && !is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (sep)
+ printf("\n.br\n");
+
+ printf("\n.TP\n");
+
+ if (opt_names[opt_enum].short_opt) {
+ printf("\\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cname->name, opt_enum));
+ } else {
+ printf("\\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
+ }
+
+ val_enum = opt_names[opt_enum].val_enum;
+
+ if (!val_names[val_enum].fn) {
+ /* takes no arg */
+ } else if (!val_names[val_enum].usage) {
+ printf(" ");
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ printf(" ");
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ if (opt_names[opt_enum].desc) {
+ printf("\n");
+ printf(".br\n");
+ print_man_option_desc(cname, opt_enum);
+ }
+
+ sep = 1;
+ }
+
+ if (!print_common) {
+ print_common = 1;
+ goto again;
+ }
+}
void print_desc_man(const char *desc)
{
@@ -2338,6 +2473,12 @@ void print_man_command(void)
printf("Common options:\n");
printf(".\n");
print_man_usage_common(prev_cmd);
+
+ printf("\n");
+ printf(".SH OPTIONS\n");
+ printf(".br\n");
+ print_man_all_options_desc(cname);
+
prev_cmd = NULL;
}
@@ -2396,7 +2537,7 @@ void print_man_command(void)
/* listing them all when there's only 1 or 2 is just repetative */
if (cname->variants > 2) {
printf(".P\n");
- print_man_all_options(cname);
+ print_man_all_options_list(cname);
printf("\n");
printf(".P\n");
printf("\n");
@@ -2419,6 +2560,12 @@ void print_man_command(void)
printf("Common options:\n");
printf(".\n");
print_man_usage_common(cmd);
+
+ printf("\n");
+ printf(".SH OPTIONS\n");
+ printf(".br\n");
+ print_man_all_options_desc(cname);
+
}
printf("\n");
@@ -2730,6 +2877,23 @@ next:
}
}
+static int long_name_compare(const void *on1, const void *on2)
+{
+ struct opt_name **optname1 = (void *)on1;
+ struct opt_name **optname2 = (void *)on2;
+ return strcmp((*optname1)->long_opt + 2, (*optname2)->long_opt + 2);
+}
+
+static void create_opt_names_alpha(void)
+{
+ int i;
+
+ for (i = 0; i < ARG_COUNT; i++)
+ opt_names_alpha[i] = &opt_names[i];
+
+ qsort(opt_names_alpha, ARG_COUNT, sizeof(long), long_name_compare);
+}
+
void print_command_list(void)
{
int i;
@@ -2754,6 +2918,17 @@ void print_option_list(void)
opt_names[i].short_opt ? opt_names[i].short_opt : 0);
}
+void print_option_alpha_list(void)
+{
+ int i;
+
+ for (i = 0; i < ARG_COUNT; i++)
+ printf("%d %s %s %c (%d)\n",
+ opt_names_alpha[i]->opt_enum, opt_names_alpha[i]->name,
+ opt_names_alpha[i]->long_opt, opt_names_alpha[i]->short_opt ?: ' ',
+ opt_names_alpha[i]->short_opt ? opt_names_alpha[i]->short_opt : 0);
+}
+
static void print_help(int argc, char *argv[])
{
printf("%s [options] --output <format> <filename>\n", argv[0]);
@@ -2791,9 +2966,12 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
+ create_opt_names_alpha();
+
if (!strcmp(argv[1], "debug")) {
print_command_list();
print_option_list();
+ print_option_alpha_list();
return 0;
}
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 4f1718b..afc941b 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -64,7 +64,7 @@ static struct val_props _val_props[VAL_COUNT + 1] = {
* Table of valid --option's
*/
static struct arg_props _arg_props[ARG_COUNT + 1] = {
-#define arg(a, b, c, d, e, f) {a, b, "", "--" c, d, e, f},
+#define arg(a, b, c, d, e, f, g) {a, b, "", "--" c, d, e, f, g},
#include "args.h"
#undef arg
};
diff --git a/tools/tools.h b/tools/tools.h
index 89ee8ad..392490f 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -59,7 +59,7 @@ enum {
/* define the enums for the command line --options, foo_ARG */
enum {
-#define arg(a, b, c, d, e, f) a ,
+#define arg(a, b, c, d, e, f, g) a ,
#include "args.h"
#undef arg
};
@@ -109,6 +109,7 @@ struct arg_props {
int val_enum; /* foo_VAL from vals.h */
uint32_t flags;
uint32_t prio;
+ const char *desc;
};
struct arg_value_group_list {
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=db26a82f2f464d0f…
Commit: db26a82f2f464d0f710229c24d67c83818fd8f3c
Parent: 041c2fef88ab2e546555625039a17ccbb7b1c9c5
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Jan 3 15:52:27 2017 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
args: use uint32 arg for maxphysicalvolumes
---
tools/args.h | 2 +-
tools/command-lines.in | 6 +++---
tools/create-commands.c | 1 +
tools/vals.h | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index 559bf16..690b4ee 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -204,7 +204,7 @@ arg(novolumegroup_ARG, 'n', "novolumegroup", 0, 0, 0)
arg(oldpath_ARG, 'n', "oldpath", 0, 0, 0)
arg(options_ARG, 'o', "options", string_VAL, ARG_GROUPABLE, 0)
arg(sort_ARG, 'O', "sort", string_VAL, ARG_GROUPABLE, 0)
-arg(maxphysicalvolumes_ARG, 'p', "maxphysicalvolumes", number_VAL, 0, 0)
+arg(maxphysicalvolumes_ARG, 'p', "maxphysicalvolumes", uint32_VAL, 0, 0)
arg(permission_ARG, 'p', "permission", permission_VAL, 0, 0)
arg(partial_ARG, 'P', "partial", 0, 0, 0)
arg(physicalvolume_ARG, 'P', "physicalvolume", 0, 0, 0)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index ebe7006..f99cb8c 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -1335,7 +1335,7 @@ OO_VGCHANGE: --autobackup Bool, --ignoremonitoring, --ignoreskippedcluster,
# because it can function as a required opt.
OO_VGCHANGE_META: --addtag Tag, --deltag Tag,
---logicalvolume Number, --maxphysicalvolumes Number, --alloc Alloc, --uuid,
+--logicalvolume Number, --maxphysicalvolumes Uint32, --alloc Alloc, --uuid,
--clustered Bool, --pvmetadatacopies MetadataCopiesPV, --vgmetadatacopies MetadataCopiesVG,
--physicalextentsize SizeMB, --resizeable Bool, --systemid String, --locktype LockType,
--profile String, --detachprofile, --metadataprofile String
@@ -1402,7 +1402,7 @@ ID: vgconvert_general
vgcreate VG_new PV ...
OO: --addtag Tag, --alloc Alloc, --autobackup Bool, --clustered Bool, --maxlogicalvolumes Number,
---maxphysicalvolumes Number, --metadataprofile String, --metadatatype MetadataType,
+--maxphysicalvolumes Uint32, --metadataprofile String, --metadatatype MetadataType,
--physicalextentsize SizeMB, --force, --zero Bool, --labelsector Number,
--metadatasize SizeMB, --pvmetadatacopies MetadataCopiesPV, --vgmetadatacopies MetadataCopiesVG,
--reportformat ReportFmt, --dataalignment SizeKB, --dataalignmentoffset SizeKB,
@@ -1535,7 +1535,7 @@ OO_VGSPLIT: --autobackup Bool
# used only when the destination VG is new
OO_VGSPLIT_NEW: --alloc Alloc, --clustered Bool,
---maxlogicalvolumes Number, --maxphysicalvolumes Number,
+--maxlogicalvolumes Number, --maxphysicalvolumes Uint32,
--metadatatype MetadataType, --vgmetadatacopies MetadataCopiesVG
vgsplit VG VG PV ...
diff --git a/tools/create-commands.c b/tools/create-commands.c
index 704ec47..d9f8218 100644
--- a/tools/create-commands.c
+++ b/tools/create-commands.c
@@ -34,6 +34,7 @@ int size_kb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
int size_mb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
int size_mb_arg_with_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
int int_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int uint32_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
int int_arg_with_sign(struct cmd_context *cmd, struct arg_values *av) { return 0; }
int int_arg_with_sign_and_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
int major_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
diff --git a/tools/vals.h b/tools/vals.h
index c8c998f..12d315f 100644
--- a/tools/vals.h
+++ b/tools/vals.h
@@ -99,6 +99,7 @@ val(conststr_VAL, NULL, "ConstString", "ERR") /* used only for command defs */
val(constnum_VAL, NULL, "ConstNumber", "ERR") /* used only for command defs */
val(bool_VAL, yes_no_arg, "Bool", "y|n")
val(number_VAL, int_arg, "Number", NULL)
+val(uint32_VAL, uint32_arg, "Uint32", "Number")
val(string_VAL, string_arg, "String", NULL)
val(vg_VAL, string_arg, "VG", NULL)
val(lv_VAL, string_arg, "LV", NULL)
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=041c2fef88ab2e54…
Commit: 041c2fef88ab2e546555625039a17ccbb7b1c9c5
Parent: 46b2599d5c4e01eee66be7c45aa6cf36d7cbc50f
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Dec 20 15:17:48 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvconvert: remove unused code
---
tools/lvconvert.c | 3170 +++++++++++++++--------------------------------------
1 files changed, 882 insertions(+), 2288 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 642d6b7..757e8b4 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -19,25 +19,6 @@
#include "lvconvert_poll.h"
#include "command-lines-count.h"
-/*
- * Guidelines for mapping options to operations.
- *
- * There should be a clear and unique correspondence between an option
- * name and the operation to be performed.
- *
- * An option with a given name should always perform the same operation.
- * If the same operation applies to two types of LV, then the same option
- * name can be used with both LV types. But, a given option name should
- * not be used to perform different operations depending on the LV type it
- * is used with.
- *
- * --merge and --split are examples where a single option name has been
- * overloaded with different operations. The case of --split has been
- * corrected with the clear and unique variations --splitcache,
- * --splitsnapshot, --splitmirror, which should allow --split to be
- * deprecated. (The same is still needed for --merge.)
- */
-
typedef enum {
/* Split:
* For a mirrored or raid LV, split mirror into two mirrors, optionally tracking
@@ -52,23 +33,13 @@ typedef enum {
struct lvconvert_params {
/* Exactly one of these 12 command categories is determined */
- int merge; /* 1 */
- int split; /* 2 */
- int splitsnapshot; /* 3 */
- int splitcache; /* 4 */
- int keep_mimages; /* 5 */ /* --splitmirrors */
- int cache; /* 6 */
- int uncache; /* 7 */
- int snapshot; /* 8 */
- int thin; /* 11 */
- /* other */ /* 12 */
+ int split; /* 1 */
+ int keep_mimages; /* 2 */ /* --splitmirrors */
+ /* other */ /* 3 */
/* FIXME Eliminate all cases where more than one of the above are set then use conv_type instead */
conversion_type_t conv_type;
- int merge_snapshot; /* CONV_MERGE is set */
- int merge_mirror; /* CONV_MERGE is set */
-
int track_changes; /* CONV_SPLIT_MIRRORS is set */
int corelog; /* Equivalent to --mirrorlog core */
@@ -80,7 +51,6 @@ struct lvconvert_params {
const struct segment_type *segtype; /* Holds what segment type you will get */
- int poolmetadataspare;
int force;
int yes;
int zero;
@@ -92,8 +62,6 @@ struct lvconvert_params {
int wait_completion;
int need_polling;
- int thin_chunk_size_calc_policy;
- uint32_t chunk_size;
uint32_t region_size;
uint32_t mirrors;
@@ -103,9 +71,6 @@ struct lvconvert_params {
unsigned stripes_supplied;
unsigned stripe_size_supplied;
uint32_t read_ahead;
- cache_mode_t cache_mode; /* cache */
- const char *policy_name; /* cache */
- struct dm_config_tree *policy_settings; /* cache */
unsigned target_attr;
@@ -118,15 +83,7 @@ struct lvconvert_params {
struct logical_volume *lv_to_poll;
struct dm_list idls;
- uint32_t pool_metadata_extents;
- int passed_args;
- uint64_t pool_metadata_size;
const char *origin_name;
- const char *pool_data_name;
- struct logical_volume *pool_data_lv;
- const char *pool_metadata_name;
- struct logical_volume *pool_metadata_lv;
- thin_discards_t discards;
};
struct convert_poll_id_list {
@@ -145,12 +102,6 @@ static void _set_conv_type(struct lvconvert_params *lp, int conv_type)
lp->conv_type = conv_type;
}
-/* -s/--snapshot and --type snapshot are synonyms */
-static int _snapshot_type_requested(struct cmd_context *cmd, const char *type_str)
-{
- return (arg_is_set(cmd, snapshot_ARG) || !strcmp(type_str, SEG_TYPE_NAME_SNAPSHOT));
-}
-
static int _raid0_type_requested(const char *type_str)
{
return (!strcmp(type_str, SEG_TYPE_NAME_RAID0) || !strcmp(type_str, SEG_TYPE_NAME_RAID0_META));
@@ -1282,11 +1233,6 @@ static int _lvconvert_mirrors(struct cmd_context *cmd,
return 0;
}
- if (lp->merge_mirror) {
- log_error("Unable to merge mirror images of segment type 'mirror'.");
- return 0;
- }
-
if (!_lvconvert_validate_thin(lv, lp))
return_0;
@@ -1424,7 +1370,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
if (!_is_valid_raid_conversion(seg->segtype, lp->segtype))
goto try_new_takeover_or_reshape;
- if (seg_is_linear(seg) && !lp->merge_mirror && !lp->mirrors_supplied) {
+ if (seg_is_linear(seg) && !lp->mirrors_supplied) {
if (_raid0_type_requested(lp->type_str)) {
log_error("Linear LV %s cannot be converted to %s.",
display_lvname(lv), lp->type_str);
@@ -1466,9 +1412,6 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
return 0;
}
- if (lp->merge_mirror)
- return lv_raid_merge(lv);
-
if (lp->track_changes)
return lv_raid_split_and_track(lv, lp->pvh);
@@ -1563,97 +1506,413 @@ try_new_takeover_or_reshape:
return 0;
}
-static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volume *cow)
+/*
+ * Functions called to perform a specific operation on a specific LV type.
+ *
+ * _convert_<lvtype>_<operation>
+ *
+ * For cases where an operation does not apply to the LV itself, but
+ * is implicitly redirected to a sub-LV, these functions locate the
+ * correct sub-LV and call the operation on that sub-LV. If a sub-LV
+ * of the proper type is not found, these functions report the error.
+ *
+ * FIXME: the _lvconvert_foo() functions can be cleaned up since they
+ * are now only called for valid combinations of LV type and operation.
+ * After that happens, the code remaining in those functions can be
+ * moved into the _convert_lvtype_operation() functions below.
+ */
+
+/*
+ * Change the number of images in a mirror LV.
+ * lvconvert --mirrors Number LV
+ */
+static int _convert_mirror_number(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
{
- struct volume_group *vg = cow->vg;
- const char *cow_name = display_lvname(cow);
+ return _lvconvert_mirrors(cmd, lv, lp);
+}
- if (lv_is_virtual_origin(origin_from_cow(cow))) {
- log_error("Unable to split off snapshot %s with virtual origin.", cow_name);
- return 0;
- }
+/*
+ * Split images from a mirror LV and use them to create a new LV.
+ * lvconvert --splitmirrors Number LV
+ *
+ * Required options:
+ * --name Name
+ */
- if (!(vg->fid->fmt->features & FMT_MDAS)) {
- log_error("Unable to split off snapshot %s using old LVM1-style metadata.", cow_name);
- return 0;
- }
+static int _convert_mirror_splitmirrors(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ return _lvconvert_mirrors(cmd, lv, lp);
+}
- if (is_lockd_type(vg->lock_type)) {
- /* FIXME: we need to create a lock for the new LV. */
- log_error("Unable to split snapshots in VG with lock_type %s.", vg->lock_type);
- return 0;
- }
+/*
+ * Change the type of log used by a mirror LV.
+ * lvconvert --mirrorlog Type LV
+ */
+static int _convert_mirror_log(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ return _lvconvert_mirrors(cmd, lv, lp);
+}
- if (lv_is_active_locally(cow)) {
- if (!lv_check_not_in_use(cow, 1))
- return_0;
+/*
+ * Convert mirror LV to linear LV.
+ * lvconvert --type linear LV
+ *
+ * Alternate syntax:
+ * lvconvert --mirrors 0 LV
+ */
+static int _convert_mirror_linear(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ return _lvconvert_mirrors(cmd, lv, lp);
+}
- if ((arg_count(cmd, force_ARG) == PROMPT) &&
- !arg_count(cmd, yes_ARG) &&
- lv_is_visible(cow) &&
- lv_is_active(cow)) {
- if (yes_no_prompt("Do you really want to split off active "
- "logical volume %s? [y/n]: ", display_lvname(cow)) == 'n') {
- log_error("Logical volume %s not split.", display_lvname(cow));
- return 0;
- }
- }
- }
+/*
+ * Convert mirror LV to raid1 LV.
+ * lvconvert --type raid1 LV
+ */
+static int _convert_mirror_raid(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ return _lvconvert_raid(lv, lp);
+}
- if (!archive(vg))
- return_0;
+/*
+ * Change the number of images in a raid1 LV.
+ * lvconvert --mirrors Number LV
+ */
+static int _convert_raid_number(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ return _lvconvert_raid(lv, lp);
+}
- log_verbose("Splitting snapshot %s from its origin.", display_lvname(cow));
+/*
+ * Split images from a raid1 LV and use them to create a new LV.
+ * lvconvert --splitmirrors Number LV
+ *
+ * Required options:
+ * --trackchanges | --name Name
+ */
+static int _convert_raid_splitmirrors(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ /* FIXME: split the splitmirrors section out of _lvconvert_raid and call it here. */
+ return _lvconvert_raid(lv, lp);
+}
- if (!vg_remove_snapshot(cow))
- return_0;
+/*
+ * Convert a raid* LV to use a different raid level.
+ * lvconvert --type raid* LV
+ */
+static int _convert_raid_raid(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ return _lvconvert_raid(lv, lp);
+}
- backup(vg);
+/*
+ * Convert a raid* LV to a mirror LV.
+ * lvconvert --type mirror LV
+ */
+static int _convert_raid_mirror(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ return _lvconvert_raid(lv, lp);
+}
- log_print_unless_silent("Logical Volume %s split from its origin.", display_lvname(cow));
+/*
+ * Convert a raid* LV to a striped LV.
+ * lvconvert --type striped LV
+ */
+static int _convert_raid_striped(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ return _lvconvert_raid(lv, lp);
+}
- return 1;
+/*
+ * Convert a raid* LV to a linear LV.
+ * lvconvert --type linear LV
+ */
+static int _convert_raid_linear(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ return _lvconvert_raid(lv, lp);
}
-static int _lvconvert_split_and_keep_cachepool(struct cmd_context *cmd,
- struct logical_volume *lv,
- struct logical_volume *cachepool_lv)
+/*
+ * Convert a striped/linear LV to a mirror LV.
+ * lvconvert --type mirror LV
+ *
+ * Required options:
+ * --mirrors Number
+ *
+ * Alternate syntax:
+ * This is equivalent to above when global/mirror_segtype_default="mirror".
+ * lvconvert --mirrors Number LV
+ */
+static int _convert_striped_mirror(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
{
- log_debug("Detaching cache pool %s from cache LV %s.",
- display_lvname(cachepool_lv), display_lvname(lv));
+ return _lvconvert_mirrors(cmd, lv, lp);
+}
- if (!archive(lv->vg))
- return_0;
+/*
+ * Convert a striped/linear LV to a raid* LV.
+ * lvconvert --type raid* LV
+ *
+ * Required options:
+ * --mirrors Number
+ *
+ * Alternate syntax:
+ * This is equivalent to above when global/mirror_segtype_default="raid1".
+ * lvconvert --mirrors Number LV
+ */
+static int _convert_striped_raid(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ return _lvconvert_raid(lv, lp);
+}
- if (!lv_cache_remove(lv))
- return_0;
+static int _convert_mirror(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ if (arg_is_set(cmd, mirrors_ARG))
+ return _convert_mirror_number(cmd, lv, lp);
- if (!vg_write(lv->vg) || !vg_commit(lv->vg))
- return_0;
+ if (arg_is_set(cmd, splitmirrors_ARG))
+ return _convert_mirror_splitmirrors(cmd, lv, lp);
- backup(lv->vg);
+ if (arg_is_set(cmd, mirrorlog_ARG) || arg_is_set(cmd, corelog_ARG))
+ return _convert_mirror_log(cmd, lv, lp);
- log_print_unless_silent("Logical volume %s is not cached and cache pool %s is unused.",
- display_lvname(lv), display_lvname(cachepool_lv));
+ if (_linear_type_requested(lp->type_str))
+ return _convert_mirror_linear(cmd, lv, lp);
- return 1;
+ if (segtype_is_raid(lp->segtype))
+ return _convert_mirror_raid(cmd, lv, lp);
+
+ log_error("Unknown operation on mirror LV %s.", display_lvname(lv));
+ return 0;
}
-static int _lvconvert_split_and_remove_cachepool(struct cmd_context *cmd,
- struct logical_volume *lv,
- struct logical_volume *cachepool_lv)
+static int _convert_raid(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
{
- struct lv_segment *seg;
- struct logical_volume *remove_lv;
+ if (arg_is_set(cmd, mirrors_ARG))
+ return _convert_raid_number(cmd, lv, lp);
- seg = first_seg(lv);
+ if (arg_is_set(cmd, splitmirrors_ARG))
+ return _convert_raid_splitmirrors(cmd, lv, lp);
- if (lv_is_partial(seg_lv(seg, 0))) {
- log_warn("WARNING: Cache origin logical volume %s is missing.",
- display_lvname(seg_lv(seg, 0)));
- remove_lv = lv; /* When origin is missing, drop everything */
- } else
- remove_lv = seg->pool_lv;
+ if (segtype_is_raid(lp->segtype))
+ return _convert_raid_raid(cmd, lv, lp);
+
+ if (segtype_is_mirror(lp->segtype))
+ return _convert_raid_mirror(cmd, lv, lp);
+
+ if (!strcmp(lp->type_str, SEG_TYPE_NAME_STRIPED))
+ return _convert_raid_striped(cmd, lv, lp);
+
+ if (_linear_type_requested(lp->type_str))
+ return _convert_raid_linear(cmd, lv, lp);
+
+ log_error("Unknown operation on raid LV %s.", display_lvname(lv));
+ return 0;
+}
+
+static int _convert_striped(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ const char *mirrors_type = find_config_tree_str(cmd, global_mirror_segtype_default_CFG, NULL);
+
+ if (!strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR))
+ return _convert_striped_mirror(cmd, lv, lp);
+
+ if (segtype_is_raid(lp->segtype))
+ return _convert_striped_raid(cmd, lv, lp);
+
+ /* --mirrors can mean --type mirror or --type raid1 depending on config setting. */
+
+ if (arg_is_set(cmd, mirrors_ARG) && mirrors_type && !strcmp(mirrors_type, SEG_TYPE_NAME_MIRROR))
+ return _convert_striped_mirror(cmd, lv, lp);
+
+ if (arg_is_set(cmd, mirrors_ARG) && mirrors_type && !strcmp(mirrors_type, SEG_TYPE_NAME_RAID1))
+ return _convert_striped_raid(cmd, lv, lp);
+
+ log_error("Unknown operation on striped or linear LV %s.", display_lvname(lv));
+ return 0;
+}
+
+static int _lvconvert_raid_types(struct cmd_context *cmd, struct logical_volume *lv,
+ struct lvconvert_params *lp)
+{
+ struct lv_segment *seg = first_seg(lv);
+ int ret = 0;
+
+ /* Set up segtype either from type_str or else to match the existing one. */
+ if (!*lp->type_str)
+ lp->segtype = seg->segtype;
+ else if (!(lp->segtype = get_segtype_from_string(cmd, lp->type_str)))
+ goto_out;
+
+ if (!strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR)) {
+ if (!lp->mirrors_supplied && !seg_is_raid1(seg)) {
+ log_error("Conversions to --type mirror require -m/--mirrors");
+ goto out;
+ }
+ }
+
+ /* lv->segtype can't be NULL */
+ if (activation() && lp->segtype->ops->target_present &&
+ !lp->segtype->ops->target_present(cmd, NULL, &lp->target_attr)) {
+ log_error("%s: Required device-mapper target(s) not "
+ "detected in your kernel.", lp->segtype->name);
+ goto out;
+ }
+
+ /* Process striping parameters */
+ /* FIXME This is incomplete */
+ if (_mirror_or_raid_type_requested(cmd, lp->type_str) || _raid0_type_requested(lp->type_str) ||
+ _striped_type_requested(lp->type_str) || lp->mirrorlog || lp->corelog) {
+ /* FIXME Handle +/- adjustments too? */
+ if (!get_stripe_params(cmd, lp->segtype, &lp->stripes, &lp->stripe_size, &lp->stripes_supplied, &lp->stripe_size_supplied))
+ goto_out;
+
+ if (_raid0_type_requested(lp->type_str) || _striped_type_requested(lp->type_str))
+ /* FIXME Shouldn't need to override get_stripe_params which defaults to 1 stripe (i.e. linear)! */
+ /* The default keeps existing number of stripes, handled inside the library code */
+ if (!arg_is_set(cmd, stripes_long_ARG))
+ lp->stripes = 0;
+ }
+
+ if (lv_is_cache(lv))
+ lv = seg_lv(first_seg(lv), 0);
+
+ if (lv_is_mirror(lv)) {
+ ret = _convert_mirror(cmd, lv, lp);
+ goto out;
+ }
+
+ if (lv_is_raid(lv)) {
+ ret = _convert_raid(cmd, lv, lp);
+ goto out;
+ }
+
+ /*
+ * FIXME: add lv_is_striped() and lv_is_linear()?
+ * This does not include raid0 which is caught by the test above.
+ * If operations differ between striped and linear, split this case.
+ */
+ if (segtype_is_striped(seg->segtype) || segtype_is_linear(seg->segtype)) {
+ ret = _convert_striped(cmd, lv, lp);
+ goto out;
+ }
+
+ /*
+ * The intention is to explicitly check all cases above and never
+ * reach here, but this covers anything that was missed.
+ */
+ log_error("Cannot convert LV %s.", display_lvname(lv));
+
+out:
+ return ret ? ECMD_PROCESSED : ECMD_FAILED;
+}
+
+static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volume *cow)
+{
+ struct volume_group *vg = cow->vg;
+ const char *cow_name = display_lvname(cow);
+
+ if (lv_is_virtual_origin(origin_from_cow(cow))) {
+ log_error("Unable to split off snapshot %s with virtual origin.", cow_name);
+ return 0;
+ }
+
+ if (!(vg->fid->fmt->features & FMT_MDAS)) {
+ log_error("Unable to split off snapshot %s using old LVM1-style metadata.", cow_name);
+ return 0;
+ }
+
+ if (is_lockd_type(vg->lock_type)) {
+ /* FIXME: we need to create a lock for the new LV. */
+ log_error("Unable to split snapshots in VG with lock_type %s.", vg->lock_type);
+ return 0;
+ }
+
+ if (lv_is_active_locally(cow)) {
+ if (!lv_check_not_in_use(cow, 1))
+ return_0;
+
+ if ((arg_count(cmd, force_ARG) == PROMPT) &&
+ !arg_count(cmd, yes_ARG) &&
+ lv_is_visible(cow) &&
+ lv_is_active(cow)) {
+ if (yes_no_prompt("Do you really want to split off active "
+ "logical volume %s? [y/n]: ", display_lvname(cow)) == 'n') {
+ log_error("Logical volume %s not split.", display_lvname(cow));
+ return 0;
+ }
+ }
+ }
+
+ if (!archive(vg))
+ return_0;
+
+ log_verbose("Splitting snapshot %s from its origin.", display_lvname(cow));
+
+ if (!vg_remove_snapshot(cow))
+ return_0;
+
+ backup(vg);
+
+ log_print_unless_silent("Logical Volume %s split from its origin.", display_lvname(cow));
+
+ return 1;
+}
+
+static int _lvconvert_split_and_keep_cachepool(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct logical_volume *cachepool_lv)
+{
+ log_debug("Detaching cache pool %s from cache LV %s.",
+ display_lvname(cachepool_lv), display_lvname(lv));
+
+ if (!archive(lv->vg))
+ return_0;
+
+ if (!lv_cache_remove(lv))
+ return_0;
+
+ if (!vg_write(lv->vg) || !vg_commit(lv->vg))
+ return_0;
+
+ backup(lv->vg);
+
+ log_print_unless_silent("Logical volume %s is not cached and cache pool %s is unused.",
+ display_lvname(lv), display_lvname(cachepool_lv));
+
+ return 1;
+}
+
+static int _lvconvert_split_and_remove_cachepool(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct logical_volume *cachepool_lv)
+{
+ struct lv_segment *seg;
+ struct logical_volume *remove_lv;
+
+ seg = first_seg(lv);
+
+ if (lv_is_partial(seg_lv(seg, 0))) {
+ log_warn("WARNING: Cache origin logical volume %s is missing.",
+ display_lvname(seg_lv(seg, 0)));
+ remove_lv = lv; /* When origin is missing, drop everything */
+ } else
+ remove_lv = seg->pool_lv;
if (lv_is_partial(seg_lv(first_seg(seg->pool_lv), 0)))
log_warn("WARNING: Cache pool data logical volume %s is missing.",
@@ -2179,49 +2438,45 @@ deactivate_pmslv:
return 1;
}
-/* Currently converts only to thin volume with external origin */
-static int _lvconvert_thin(struct cmd_context *cmd,
+static int _lvconvert_to_thin_with_external(struct cmd_context *cmd,
struct logical_volume *lv,
- struct lvconvert_params *lp)
+ struct logical_volume *thinpool_lv)
{
- struct logical_volume *torigin_lv, *pool_lv = lp->pool_data_lv;
struct volume_group *vg = lv->vg;
+ struct logical_volume *thin_lv;
+ const char *origin_name;
+
struct lvcreate_params lvc = {
.activate = CHANGE_AEY,
.alloc = ALLOC_INHERIT,
- .lv_name = lp->origin_name,
.major = -1,
.minor = -1,
.suppress_zero_warn = 1, /* Suppress warning for this thin */
.permission = LVM_READ,
- .pool_name = pool_lv->name,
+ .pool_name = thinpool_lv->name,
.pvh = &vg->pvs,
.read_ahead = DM_READ_AHEAD_AUTO,
.stripes = 1,
.virtual_extents = lv->le_count,
};
- if (lv == pool_lv) {
+ if (lv == thinpool_lv) {
log_error("Can't use same LV %s for thin pool and thin volume.",
- display_lvname(pool_lv));
+ display_lvname(thinpool_lv));
return 0;
}
- if (lv_is_locked(lv) ||
- !lv_is_visible(lv) ||
- lv_is_cow(lv) ||
- lv_is_pool(lv) ||
- lv_is_pool_data(lv) ||
- lv_is_pool_metadata(lv)) {
- log_error("Can't use%s%s %s %s as external origin.",
- lv_is_locked(lv) ? " locked" : "",
- lv_is_visible(lv) ? "" : " hidden",
- lvseg_name(first_seg(lv)),
- display_lvname(lv));
- return 0;
- }
+ if ((origin_name = arg_str_value(cmd, originname_ARG, NULL)))
+ if (!validate_restricted_lvname_param(cmd, &vg->name, &origin_name))
+ return_0;
+
+ /*
+ * If NULL, an auto-generated 'lvol' name is used.
+ * If set, the lv create code checks the name isn't used.
+ */
+ lvc.lv_name = origin_name;
- if (is_lockd_type(lv->vg->lock_type)) {
+ if (is_lockd_type(vg->lock_type)) {
/*
* FIXME: external origins don't work in lockd VGs.
* Prior to the lvconvert, there's a lock associated with
@@ -2233,13 +2488,13 @@ static int _lvconvert_thin(struct cmd_context *cmd,
* lock for the new LV uuid used by the external LV.
*/
log_error("Can't use lock_type %s LV as external origin.",
- lv->vg->lock_type);
+ vg->lock_type);
return 0;
}
dm_list_init(&lvc.tags);
- if (!pool_supports_external_origin(first_seg(pool_lv), lv))
+ if (!pool_supports_external_origin(first_seg(thinpool_lv), lv))
return_0;
if (!(lvc.segtype = get_segtype_from_string(cmd, SEG_TYPE_NAME_THIN)))
@@ -2248,14 +2503,22 @@ static int _lvconvert_thin(struct cmd_context *cmd,
if (!archive(vg))
return_0;
- /* New thin LV needs to be created (all messages sent to pool)
- * In this case thin volume is created READ-ONLY and
- * also warn about not zeroing is suppressed. */
- if (!(torigin_lv = lv_create_single(vg, &lvc)))
+ /*
+ * New thin LV needs to be created (all messages sent to pool) In this
+ * case thin volume is created READ-ONLY and also warn about not
+ * zeroing is suppressed.
+ *
+ * The new thin LV is created with the origin_name, or an autogenerated
+ * 'lvol' name. Then the names and ids are swapped between the thin LV
+ * and the original/external LV. So, the thin LV gets the name and id
+ * of the original LV arg, and the original LV arg gets the origin_name
+ * or the autogenerated name.
+ */
+
+ if (!(thin_lv = lv_create_single(vg, &lvc)))
return_0;
- /* Deactivate prepared Thin LV */
- if (!deactivate_lv(cmd, torigin_lv)) {
+ if (!deactivate_lv(cmd, thin_lv)) {
log_error("Aborting. Unable to deactivate new LV. "
"Manual intervention required.");
return 0;
@@ -2266,47 +2529,45 @@ static int _lvconvert_thin(struct cmd_context *cmd,
* which could be easily removed by the user after i.e. power-off
*/
- if (!swap_lv_identifiers(cmd, torigin_lv, lv)) {
+ if (!swap_lv_identifiers(cmd, thin_lv, lv)) {
stack;
goto revert_new_lv;
}
/* Preserve read-write status of original LV here */
- torigin_lv->status |= (lv->status & LVM_WRITE);
+ thin_lv->status |= (lv->status & LVM_WRITE);
- if (!attach_thin_external_origin(first_seg(torigin_lv), lv)) {
+ if (!attach_thin_external_origin(first_seg(thin_lv), lv)) {
stack;
goto revert_new_lv;
}
- if (!lv_update_and_reload(torigin_lv)) {
+ if (!lv_update_and_reload(thin_lv)) {
stack;
goto deactivate_and_revert_new_lv;
}
- log_print_unless_silent("Converted %s to thin volume with "
- "external origin %s.",
- display_lvname(torigin_lv),
- display_lvname(lv));
+ log_print_unless_silent("Converted %s to thin volume with external origin %s.",
+ display_lvname(thin_lv), display_lvname(lv));
return 1;
deactivate_and_revert_new_lv:
- if (!swap_lv_identifiers(cmd, torigin_lv, lv))
+ if (!swap_lv_identifiers(cmd, thin_lv, lv))
stack;
- if (!deactivate_lv(cmd, torigin_lv)) {
+ if (!deactivate_lv(cmd, thin_lv)) {
log_error("Unable to deactivate failed new LV. "
"Manual intervention required.");
return 0;
}
- if (!detach_thin_external_origin(first_seg(torigin_lv)))
+ if (!detach_thin_external_origin(first_seg(thin_lv)))
return_0;
revert_new_lv:
/* FIXME Better to revert to backup of metadata? */
- if (!lv_remove(torigin_lv) || !vg_write(vg) || !vg_commit(vg))
+ if (!lv_remove(thin_lv) || !vg_write(vg) || !vg_commit(vg))
log_error("Manual intervention may be required to remove "
"abandoned LV(s) before retrying.");
else
@@ -2315,269 +2576,225 @@ revert_new_lv:
return 0;
}
-static int _lvconvert_to_thin_with_external(struct cmd_context *cmd,
- struct logical_volume *lv,
- struct logical_volume *thinpool_lv)
+static int _lvconvert_swap_pool_metadata(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct logical_volume *metadata_lv)
{
struct volume_group *vg = lv->vg;
- struct logical_volume *thin_lv;
- const char *origin_name;
+ struct logical_volume *prev_metadata_lv;
+ struct lv_segment *seg;
+ struct lv_types *lvtype;
+ char meta_name[NAME_LEN];
+ const char *swap_name;
+ uint32_t chunk_size;
+ int is_thinpool;
+ int is_cachepool;
+ int lvt_enum;
- struct lvcreate_params lvc = {
- .activate = CHANGE_AEY,
- .alloc = ALLOC_INHERIT,
- .major = -1,
- .minor = -1,
- .suppress_zero_warn = 1, /* Suppress warning for this thin */
- .permission = LVM_READ,
- .pool_name = thinpool_lv->name,
- .pvh = &vg->pvs,
- .read_ahead = DM_READ_AHEAD_AUTO,
- .stripes = 1,
- .virtual_extents = lv->le_count,
- };
+ is_thinpool = lv_is_thin_pool(lv);
+ is_cachepool = lv_is_cache_pool(lv);
+ lvt_enum = get_lvt_enum(metadata_lv);
+ lvtype = get_lv_type(lvt_enum);
- if (lv == thinpool_lv) {
- log_error("Can't use same LV %s for thin pool and thin volume.",
- display_lvname(thinpool_lv));
+ if (lvt_enum != striped_LVT && lvt_enum != linear_LVT && lvt_enum != raid_LVT) {
+ log_error("LV %s with type %s cannot be used as a metadata LV.",
+ display_lvname(metadata_lv), lvtype ? lvtype->name : "unknown");
return 0;
}
- if ((origin_name = arg_str_value(cmd, originname_ARG, NULL)))
- if (!validate_restricted_lvname_param(cmd, &vg->name, &origin_name))
- return_0;
+ if (!lv_is_visible(metadata_lv)) {
+ log_error("Can't convert internal LV %s.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
- /*
- * If NULL, an auto-generated 'lvol' name is used.
- * If set, the lv create code checks the name isn't used.
- */
- lvc.lv_name = origin_name;
+ if (lv_is_locked(metadata_lv)) {
+ log_error("Can't convert locked LV %s.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
- if (is_lockd_type(vg->lock_type)) {
- /*
- * FIXME: external origins don't work in lockd VGs.
- * Prior to the lvconvert, there's a lock associated with
- * the uuid of the external origin LV. After the convert,
- * that uuid belongs to the new thin LV, and a new LV with
- * a new uuid exists as the non-thin, readonly external LV.
- * We'd need to remove the lock for the previous uuid
- * (the new thin LV will have no lock), and create a new
- * lock for the new LV uuid used by the external LV.
- */
- log_error("Can't use lock_type %s LV as external origin.",
- vg->lock_type);
+ if (lv_is_origin(metadata_lv) ||
+ lv_is_merging_origin(metadata_lv) ||
+ lv_is_external_origin(metadata_lv) ||
+ lv_is_virtual(metadata_lv)) {
+ log_error("Pool metadata LV %s is of an unsupported type.",
+ display_lvname(metadata_lv));
return 0;
}
- dm_list_init(&lvc.tags);
+ /* FIXME cache pool */
+ if (is_thinpool && pool_is_active(lv)) {
+ /* If any volume referencing pool active - abort here */
+ log_error("Cannot convert pool %s with active volumes.",
+ display_lvname(lv));
+ return 0;
+ }
- if (!pool_supports_external_origin(first_seg(thinpool_lv), lv))
- return_0;
+ if ((dm_snprintf(meta_name, sizeof(meta_name), "%s%s", lv->name, is_cachepool ? "_cmeta" : "_tmeta") < 0)) {
+ log_error("Failed to create internal lv names, pool name is too long.");
+ return 0;
+ }
- if (!(lvc.segtype = get_segtype_from_string(cmd, SEG_TYPE_NAME_THIN)))
- return_0;
+ seg = first_seg(lv);
- if (!archive(vg))
- return_0;
+ /* Normally do NOT change chunk size when swapping */
- /*
- * New thin LV needs to be created (all messages sent to pool) In this
- * case thin volume is created READ-ONLY and also warn about not
- * zeroing is suppressed.
- *
- * The new thin LV is created with the origin_name, or an autogenerated
- * 'lvol' name. Then the names and ids are swapped between the thin LV
- * and the original/external LV. So, the thin LV gets the name and id
- * of the original LV arg, and the original LV arg gets the origin_name
- * or the autogenerated name.
- */
+ if (arg_is_set(cmd, chunksize_ARG)) {
+ chunk_size = arg_uint_value(cmd, chunksize_ARG, 0);
- if (!(thin_lv = lv_create_single(vg, &lvc)))
- return_0;
+ if ((chunk_size != seg->chunk_size) && !dm_list_empty(&lv->segs_using_this_lv)) {
+ if (arg_count(cmd, force_ARG) == PROMPT) {
+ log_error("Chunk size can be only changed with --force. Conversion aborted.");
+ return 0;
+ }
- if (!deactivate_lv(cmd, thin_lv)) {
- log_error("Aborting. Unable to deactivate new LV. "
- "Manual intervention required.");
- return 0;
- }
+ if (!validate_pool_chunk_size(cmd, seg->segtype, chunk_size))
+ return_0;
- /*
- * Crashing till this point will leave plain thin volume
- * which could be easily removed by the user after i.e. power-off
- */
+ log_warn("WARNING: Changing chunk size %s to %s for %s pool volume.",
+ display_size(cmd, seg->chunk_size),
+ display_size(cmd, chunk_size),
+ display_lvname(lv));
- if (!swap_lv_identifiers(cmd, thin_lv, lv)) {
- stack;
- goto revert_new_lv;
- }
+ /* Ok, user has likely some serious reason for this */
+ if (!arg_count(cmd, yes_ARG) &&
+ yes_no_prompt("Do you really want to change chunk size for %s pool volume? [y/n]: ",
+ display_lvname(lv)) == 'n') {
+ log_error("Conversion aborted.");
+ return 0;
+ }
+ }
- /* Preserve read-write status of original LV here */
- thin_lv->status |= (lv->status & LVM_WRITE);
+ seg->chunk_size = chunk_size;
+ }
- if (!attach_thin_external_origin(first_seg(thin_lv), lv)) {
- stack;
- goto revert_new_lv;
+ if (!arg_count(cmd, yes_ARG) &&
+ yes_no_prompt("Do you want to swap metadata of %s pool with metadata volume %s? [y/n]: ",
+ display_lvname(lv),
+ display_lvname(metadata_lv)) == 'n') {
+ log_error("Conversion aborted.");
+ return 0;
}
- if (!lv_update_and_reload(thin_lv)) {
- stack;
- goto deactivate_and_revert_new_lv;
+ if (!deactivate_lv(cmd, metadata_lv)) {
+ log_error("Aborting. Failed to deactivate %s.",
+ display_lvname(metadata_lv));
+ return 0;
}
- log_print_unless_silent("Converted %s to thin volume with external origin %s.",
- display_lvname(thin_lv), display_lvname(lv));
+ if (!archive(vg))
+ return_0;
- return 1;
+ /* Swap names between old and new metadata LV */
-deactivate_and_revert_new_lv:
- if (!swap_lv_identifiers(cmd, thin_lv, lv))
- stack;
+ if (!detach_pool_metadata_lv(seg, &prev_metadata_lv))
+ return_0;
- if (!deactivate_lv(cmd, thin_lv)) {
- log_error("Unable to deactivate failed new LV. "
- "Manual intervention required.");
- return 0;
- }
+ swap_name = metadata_lv->name;
- if (!detach_thin_external_origin(first_seg(thin_lv)))
+ if (!lv_rename_update(cmd, metadata_lv, "pvmove_tmeta", 0))
return_0;
-revert_new_lv:
- /* FIXME Better to revert to backup of metadata? */
- if (!lv_remove(thin_lv) || !vg_write(vg) || !vg_commit(vg))
- log_error("Manual intervention may be required to remove "
- "abandoned LV(s) before retrying.");
- else
- backup(vg);
+ /* Give the previous metadata LV the name of the LV replacing it. */
- return 0;
-}
+ if (!lv_rename_update(cmd, prev_metadata_lv, swap_name, 0))
+ return_0;
-static int _lvconvert_update_pool_params(struct logical_volume *pool_lv,
- struct lvconvert_params *lp)
-{
- if (lp->pool_metadata_size &&
- !(lp->pool_metadata_extents =
- extents_from_size(pool_lv->vg->cmd, lp->pool_metadata_size, pool_lv->vg->extent_size)))
+ /* Rename deactivated metadata LV to have _tmeta suffix */
+
+ if (!lv_rename_update(cmd, metadata_lv, meta_name, 0))
+ return_0;
+
+ if (!attach_pool_metadata_lv(seg, metadata_lv))
+ return_0;
+
+ if (!vg_write(vg) || !vg_commit(vg))
return_0;
- return update_pool_params(lp->segtype,
- pool_lv->vg,
- lp->target_attr,
- lp->passed_args,
- pool_lv->le_count,
- &lp->pool_metadata_extents,
- &lp->thin_chunk_size_calc_policy,
- &lp->chunk_size,
- &lp->discards,
- &lp->zero);
+ backup(vg);
+ return 1;
}
/*
- * Converts a data lv and a metadata lv into a thin or cache pool lv.
- *
- * Thin lvconvert version which
- * rename metadata
- * convert/layers thinpool over data
- * attach metadata
- *
- * pool_lv might or might not already be a pool.
+ * Create a new pool LV, using the lv arg as the data sub LV.
+ * The metadata sub LV is either a new LV created here, or an
+ * existing LV specified by --poolmetadata.
*/
-static int _lvconvert_pool(struct cmd_context *cmd,
- struct logical_volume *pool_lv,
- struct lvconvert_params *lp)
+
+static int _lvconvert_to_pool(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ int to_thinpool,
+ int to_cachepool,
+ struct dm_list *use_pvh)
{
- int r = 0;
- const char *old_name;
+ struct volume_group *vg = lv->vg;
+ struct logical_volume *metadata_lv = NULL; /* existing or created */
+ struct logical_volume *data_lv; /* lv arg renamed */
+ struct logical_volume *pool_lv; /* new lv created here */
+ const char *pool_metadata_name; /* user-specified lv name */
+ const char *pool_name; /* name of original lv arg */
+ char meta_name[NAME_LEN]; /* generated sub lv name */
+ char data_name[NAME_LEN]; /* generated sub lv name */
+ struct segment_type *pool_segtype; /* thinpool or cachepool */
struct lv_segment *seg;
- struct volume_group *vg = pool_lv->vg;
- struct logical_volume *data_lv;
- struct logical_volume *metadata_lv = NULL;
- struct logical_volume *pool_metadata_lv;
+ unsigned int target_attr = ~0;
+ unsigned int passed_args = 0;
+ unsigned int activate_pool;
+ unsigned int zero_metadata;
+ uint64_t meta_size;
+ uint32_t meta_extents;
+ uint32_t chunk_size;
+ int chunk_calc;
+ int r = 0;
+
+ /* for handling lvmlockd cases */
char *lockd_data_args = NULL;
char *lockd_meta_args = NULL;
char *lockd_data_name = NULL;
char *lockd_meta_name = NULL;
struct id lockd_data_id;
struct id lockd_meta_id;
- char metadata_name[NAME_LEN], data_name[NAME_LEN];
- int zero_metadata = 1;
- int activate_pool;
-
- if (lp->pool_data_name) {
- if ((lp->thin || lp->cache) &&
- !strcmp(lp->pool_data_name, pool_lv->name)) {
- log_error("Converted volume %s and pool volume must differ.",
- display_lvname(pool_lv));
- return 0;
- }
- if (!(pool_lv = find_lv(vg, lp->pool_data_name))) {
- log_error("Unknown pool data LV %s.", lp->pool_data_name);
- return 0;
- }
- }
-
- /* An existing LV needs to have its lock freed once it becomes a data LV. */
- if (is_lockd_type(vg->lock_type) && !lv_is_pool(pool_lv) && pool_lv->lock_args) {
- lockd_data_args = dm_pool_strdup(cmd->mem, pool_lv->lock_args);
- lockd_data_name = dm_pool_strdup(cmd->mem, pool_lv->name);
- memcpy(&lockd_data_id, &pool_lv->lvid.id[1], sizeof(struct id));
- }
- if (!lv_is_visible(pool_lv)) {
- log_error("Can't convert internal LV %s.", display_lvname(pool_lv));
- return 0;
- }
- if (lv_is_locked(pool_lv)) {
- log_error("Can't convert locked LV %s.", display_lvname(pool_lv));
+ if (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) {
+ log_error(INTERNAL_ERROR "LV %s is already a pool.", display_lvname(lv));
return 0;
}
- if (lv_is_thin_pool(pool_lv) && (segtype_is_cache_pool(lp->segtype) || lp->cache)) {
- log_error("Can't convert thin pool LV %s.", display_lvname(pool_lv));
- return 0;
- }
+ pool_segtype = to_cachepool ? get_segtype_from_string(cmd, SEG_TYPE_NAME_CACHE_POOL) :
+ get_segtype_from_string(cmd, SEG_TYPE_NAME_THIN_POOL);
- if (lv_is_cache(pool_lv) && !segtype_is_thin_pool(lp->segtype)) {
- log_error("Cached LV %s could be only converted into a thin pool volume.",
- display_lvname(pool_lv));
+ if (!pool_segtype->ops->target_present(cmd, NULL, &target_attr)) {
+ log_error("%s: Required device-mapper target(s) not detected in your kernel.", pool_segtype->name);
return 0;
}
- if (lv_is_cache_pool(pool_lv) && (segtype_is_thin_pool(lp->segtype) || lp->thin)) {
- log_error("Cannot convert cache pool %s as pool data volume.",
- display_lvname(pool_lv));
- return 0;
- }
+ /* Allow to have only thinpool active and restore it's active state. */
+ activate_pool = to_thinpool && lv_is_active(lv);
- if (lv_is_mirror(pool_lv)) {
- log_error("Mirror logical volumes cannot be used as pools.");
- log_print_unless_silent("Try \"%s\" segment type instead.", SEG_TYPE_NAME_RAID1);
- return 0;
+ /* Wipe metadata_lv by default, but allow skipping this for cache pools. */
+ zero_metadata = to_cachepool ? arg_int_value(cmd, zero_ARG, 1) : 1;
+
+ /* An existing LV needs to have its lock freed once it becomes a data LV. */
+ if (is_lockd_type(vg->lock_type) && lv->lock_args) {
+ lockd_data_args = dm_pool_strdup(cmd->mem, lv->lock_args);
+ lockd_data_name = dm_pool_strdup(cmd->mem, lv->name);
+ memcpy(&lockd_data_id, &lv->lvid.id[1], sizeof(struct id));
}
/*
- * Only linear, striped and raid supported.
- * FIXME Tidy up all these type restrictions.
+ * If an existing LV is to be used as the metadata LV,
+ * verify that it's in a usable state. These checks are
+ * not done by command def rules because this LV is not
+ * processed by process_each_lv.
*/
- if (!lv_is_pool(pool_lv) &&
- (lv_is_thin_type(pool_lv) ||
- lv_is_cow(pool_lv) || lv_is_merging_cow(pool_lv) ||
- lv_is_origin(pool_lv) ||lv_is_merging_origin(pool_lv) ||
- lv_is_external_origin(pool_lv) ||
- lv_is_virtual(pool_lv))) {
- log_error("Pool data LV %s is of an unsupported type.", display_lvname(pool_lv));
- return 0;
- }
- if (lp->pool_metadata_name) {
- if (!(lp->pool_metadata_lv = find_lv(vg, lp->pool_metadata_name))) {
- log_error("Unknown pool metadata LV %s.", lp->pool_metadata_name);
+ if ((pool_metadata_name = arg_str_value(cmd, poolmetadata_ARG, NULL))) {
+ if (!(metadata_lv = find_lv(vg, pool_metadata_name))) {
+ log_error("Unknown pool metadata LV %s.", pool_metadata_name);
return 0;
}
- lp->pool_metadata_extents = lp->pool_metadata_lv->le_count;
- metadata_lv = lp->pool_metadata_lv;
/* An existing LV needs to have its lock freed once it becomes a meta LV. */
if (is_lockd_type(vg->lock_type) && metadata_lv->lock_args) {
@@ -2586,7 +2803,7 @@ static int _lvconvert_pool(struct cmd_context *cmd,
memcpy(&lockd_meta_id, &metadata_lv->lvid.id[1], sizeof(struct id));
}
- if (metadata_lv == pool_lv) {
+ if (metadata_lv == lv) {
log_error("Can't use same LV for pool data and metadata LV %s.",
display_lvname(metadata_lv));
return 0;
@@ -2621,199 +2838,152 @@ static int _lvconvert_pool(struct cmd_context *cmd,
display_lvname(metadata_lv));
return 0;
}
-
- if (!lv_is_pool(pool_lv)) {
- if (!_lvconvert_update_pool_params(pool_lv, lp))
- return_0;
-
- if (lp->pool_metadata_extents > metadata_lv->le_count) {
- log_error("Logical volume %s is too small for metadata.",
- display_lvname(metadata_lv));
- return 0;
- }
- }
}
- if (lv_is_pool(pool_lv)) {
- lp->pool_data_lv = pool_lv;
+ /*
+ * Determine the size of the metadata LV and the chunk size. When an
+ * existing LV is to be used for metadata, this introduces some
+ * constraints/defaults. When chunk_size=0 and/or meta_extents=0 are
+ * passed to the "update params" function, defaults are calculated and
+ * returned.
+ */
- if (!metadata_lv) {
- if (arg_from_list_is_set(cmd, "is invalid with existing pool",
- discards_ARG,
- poolmetadatasize_ARG, -1))
- return_0;
+ if (arg_is_set(cmd, chunksize_ARG)) {
+ passed_args |= PASS_ARG_CHUNK_SIZE;
+ chunk_size = arg_uint_value(cmd, chunksize_ARG, 0);
+ if (!validate_pool_chunk_size(cmd, pool_segtype, chunk_size))
+ return_0;
+ } else {
+ /* A default will be chosen by the "update" function. */
+ chunk_size = 0;
+ }
- if (lp->thin &&
- arg_from_list_is_set(cmd, "is invalid with existing thin pool",
- chunksize_ARG, zero_ARG, -1))
- return_0;
+ if (arg_is_set(cmd, poolmetadatasize_ARG)) {
+ meta_size = arg_uint64_value(cmd, poolmetadatasize_ARG, UINT64_C(0));
+ meta_extents = extents_from_size(cmd, meta_size, vg->extent_size);
+ passed_args |= PASS_ARG_POOL_METADATA_SIZE;
+ } else if (metadata_lv) {
+ meta_extents = metadata_lv->le_count;
+ passed_args |= PASS_ARG_POOL_METADATA_SIZE;
+ } else {
+ /* A default will be chosen by the "update" function. */
+ meta_extents = 0;
+ }
- if (lp->cache) {
- if (!lp->chunk_size)
- lp->chunk_size = first_seg(pool_lv)->chunk_size;
-
- if (!validate_lv_cache_chunk_size(pool_lv, lp->chunk_size))
- return_0;
-
- /* Check is user requested zeroing logic via [-Z y|n] */
- if (!arg_is_set(cmd, zero_ARG)) {
- /* Note: requires rather deep know-how to skip zeroing */
- if (!lp->yes &&
- yes_no_prompt("Do you want wipe existing metadata of "
- "cache pool volume %s? [y/n]: ",
- display_lvname(pool_lv)) == 'n') {
- log_error("Conversion aborted.");
- log_error("To preserve cache metadata add option \"--zero n\".");
- log_warn("WARNING: Reusing mismatched cache pool metadata "
- "MAY DESTROY YOUR DATA!");
- return 0;
- }
- /* Wiping confirmed, go ahead */
- if (!wipe_cache_pool(pool_lv))
- return_0;
- } else if (arg_int_value(cmd, zero_ARG, 0)) {
- if (!wipe_cache_pool(pool_lv)) /* Wipe according to -Z y|n */
- return_0;
- } else
- log_warn("WARNING: Reusing cache pool metadata %s "
- "for volume caching.", display_lvname(pool_lv));
- }
+ /* Tell the "update" function to ignore these, they are handled below. */
+ passed_args |= PASS_ARG_DISCARDS | PASS_ARG_ZERO;
- if (lp->thin || lp->cache)
- /* already pool, can continue converting volume */
- return 1;
+ /*
+ * Validate and/or choose defaults for meta_extents and chunk_size,
+ * this involves some complicated calculations.
+ */
- log_error("LV %s is already pool.", display_lvname(pool_lv));
- return 0;
- }
+ if (to_cachepool) {
+ if (!update_cache_pool_params(pool_segtype, vg, target_attr,
+ passed_args, lv->le_count,
+ &meta_extents,
+ &chunk_calc,
+ &chunk_size))
+ return_0;
+ } else {
+ if (!update_thin_pool_params(pool_segtype, vg, target_attr,
+ passed_args, lv->le_count,
+ &meta_extents,
+ &chunk_calc,
+ &chunk_size,
+ NULL, NULL))
+ return_0;
+ }
- if (lp->thin || lp->cache) {
- log_error("--%s and pool metadata swap is not supported.",
- lp->thin ? "thin" : "cache");
- return 0;
- }
+ if ((uint64_t)chunk_size > ((uint64_t)lv->le_count * vg->extent_size)) {
+ log_error("Pool data LV %s is too small (%s) for specified chunk size (%s).",
+ display_lvname(lv),
+ display_size(cmd, (uint64_t)lv->le_count * vg->extent_size),
+ display_size(cmd, chunk_size));
+ return 0;
+ }
- /* FIXME cache pool */
- if (lv_is_thin_pool(pool_lv) && pool_is_active(pool_lv)) {
- /* If any volume referencing pool active - abort here */
- log_error("Cannot convert pool %s with active volumes.",
- display_lvname(pool_lv));
- return 0;
- }
+ if (metadata_lv && (meta_extents > metadata_lv->le_count)) {
+ log_error("Pool metadata LV %s is too small (%u extents) for required metadata (%u extents).",
+ display_lvname(metadata_lv), metadata_lv->le_count, meta_extents);
+ return 0;
+ }
- lp->passed_args |= PASS_ARG_CHUNK_SIZE | PASS_ARG_DISCARDS | PASS_ARG_ZERO;
- seg = first_seg(pool_lv);
+ log_verbose("Pool metadata extents %u chunk_size %u", meta_extents, chunk_size);
- /* Normally do NOT change chunk size when swapping */
- if (arg_is_set(cmd, chunksize_ARG) &&
- (lp->chunk_size != seg->chunk_size) &&
- !dm_list_empty(&pool_lv->segs_using_this_lv)) {
- if (lp->force == PROMPT) {
- log_error("Chunk size can be only changed with --force. Conversion aborted.");
- return 0;
- }
- log_warn("WARNING: Changing chunk size %s to "
- "%s for %s pool volume.",
- display_size(cmd, seg->chunk_size),
- display_size(cmd, lp->chunk_size),
- display_lvname(pool_lv));
- /* Ok, user has likely some serious reason for this */
- if (!lp->yes &&
- yes_no_prompt("Do you really want to change chunk size "
- "for %s pool volume? [y/n]: ",
- display_lvname(pool_lv)) == 'n') {
- log_error("Conversion aborted.");
- return 0;
- }
- } else
- lp->chunk_size = seg->chunk_size;
- if (!_lvconvert_update_pool_params(pool_lv, lp))
- return_0;
+ /*
+ * Verify that user wants to use these LVs.
+ */
- if (metadata_lv->le_count < lp->pool_metadata_extents)
- log_print_unless_silent("Continuing with swap...");
+ log_warn("WARNING: Converting logical volume %s%s%s to %s pool's data%s %s metadata wiping.",
+ display_lvname(lv),
+ metadata_lv ? " and " : "",
+ metadata_lv ? display_lvname(metadata_lv) : "",
+ to_cachepool ? "cache" : "thin",
+ metadata_lv ? " and metadata volumes" : " volume",
+ zero_metadata ? "with" : "WITHOUT");
- if (!arg_is_set(cmd, discards_ARG))
- lp->discards = seg->discards;
- if (!arg_is_set(cmd, zero_ARG))
- lp->zero = seg->zero_new_blocks;
+ if (zero_metadata)
+ log_warn("THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.)");
+ else if (to_cachepool)
+ log_warn("WARNING: Using mismatched cache pool metadata MAY DESTROY YOUR DATA!");
- if (!lp->yes &&
- yes_no_prompt("Do you want to swap metadata of %s "
- "pool with metadata volume %s? [y/n]: ",
- display_lvname(pool_lv),
- display_lvname(metadata_lv)) == 'n') {
- log_error("Conversion aborted.");
- return 0;
- }
- } else {
- /* Only cache pool conversion may suppress metadata zeroing
- * TODO: Maybe similar support could be useful for thin-pool, but --zero
- * is already overloade and we would also need to possibly match transaction Id. */
- if (segtype_is_cache_pool(lp->segtype) && metadata_lv)
- /* Check is user requested zeroing logic via [-Z y|n] (default is yes) */
- zero_metadata = arg_int_value(cmd, zero_ARG, 1);
-
- log_warn("WARNING: Converting logical volume %s%s%s to %s pool's data%s %s metadata wiping.",
- display_lvname(pool_lv),
- metadata_lv ? " and " : "",
- metadata_lv ? display_lvname(metadata_lv) : "",
- segtype_is_cache_pool(lp->segtype) ? "cache" : "thin",
- metadata_lv ? " and metadata volumes" : " volume",
- zero_metadata ? "with" : "WITHOUT");
-
- if (zero_metadata)
- log_warn("THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.)");
- else /* ATM supported only for cache pools */
- log_warn("WARNING: Using mismatched cache pool metadata "
- "MAY DESTROY YOUR DATA!");
-
- if (!lp->yes &&
- yes_no_prompt("Do you really want to convert %s%s%s? [y/n]: ",
- display_lvname(pool_lv),
- metadata_lv ? " and " : "",
- metadata_lv ? display_lvname(metadata_lv) : "") == 'n') {
- log_error("Conversion aborted.");
- return 0;
- }
+ if (!arg_count(cmd, yes_ARG) &&
+ yes_no_prompt("Do you really want to convert %s%s%s? [y/n]: ",
+ display_lvname(lv),
+ metadata_lv ? " and " : "",
+ metadata_lv ? display_lvname(metadata_lv) : "") == 'n') {
+ log_error("Conversion aborted.");
+ return 0;
}
- if (segtype_is_cache_pool(lp->segtype))
- activate_pool = 0; /* Cannot activate cache pool */
- else
- /* Allow to have only thinpool active and restore it's active state */
- activate_pool = lv_is_active(pool_lv);
-
- if ((dm_snprintf(metadata_name, sizeof(metadata_name), "%s%s",
- pool_lv->name,
- (segtype_is_cache_pool(lp->segtype)) ?
- "_cmeta" : "_tmeta") < 0) ||
- (dm_snprintf(data_name, sizeof(data_name), "%s%s",
- pool_lv->name,
- (segtype_is_cache_pool(lp->segtype)) ?
- "_cdata" : "_tdata") < 0)) {
- log_error("Failed to create internal lv names, "
- "pool name is too long.");
+ /*
+ * The internal LV names for pool data/meta LVs.
+ */
+
+ if ((dm_snprintf(meta_name, sizeof(meta_name), "%s%s", lv->name, to_cachepool ? "_cmeta" : "_tmeta") < 0) ||
+ (dm_snprintf(data_name, sizeof(data_name), "%s%s", lv->name, to_cachepool ? "_cdata" : "_tdata") < 0)) {
+ log_error("Failed to create internal lv names, pool name is too long.");
return 0;
}
+ /*
+ * If a new metadata LV needs to be created, collect the settings for
+ * the new LV and create it.
+ *
+ * If an existing LV is used for metadata, deactivate/activate/wipe it.
+ */
+
if (!metadata_lv) {
- if (!_lvconvert_update_pool_params(pool_lv, lp))
- return_0;
+ uint32_t meta_stripes;
+ uint32_t meta_stripe_size;
+ uint32_t meta_readahead;
+ alloc_policy_t meta_alloc;
+ unsigned meta_stripes_supplied;
+ unsigned meta_stripe_size_supplied;
if (!get_stripe_params(cmd, get_segtype_from_string(cmd, SEG_TYPE_NAME_STRIPED),
- &lp->stripes, &lp->stripe_size, &lp->stripes_supplied, &lp->stripe_size_supplied))
+ &meta_stripes,
+ &meta_stripe_size,
+ &meta_stripes_supplied,
+ &meta_stripe_size_supplied))
return_0;
+ meta_readahead = arg_uint_value(cmd, readahead_ARG, cmd->default_settings.read_ahead);
+ meta_alloc = (alloc_policy_t) arg_uint_value(cmd, alloc_ARG, ALLOC_INHERIT);
+
if (!archive(vg))
return_0;
- if (!(metadata_lv = alloc_pool_metadata(pool_lv, metadata_name,
- lp->read_ahead, lp->stripes,
- lp->stripe_size,
- lp->pool_metadata_extents,
- lp->alloc, lp->pvh)))
+ if (!(metadata_lv = alloc_pool_metadata(lv,
+ meta_name,
+ meta_readahead,
+ meta_stripes,
+ meta_stripe_size,
+ meta_extents,
+ meta_alloc,
+ use_pvh)))
return_0;
} else {
if (!deactivate_lv(cmd, metadata_lv)) {
@@ -2825,21 +2995,6 @@ static int _lvconvert_pool(struct cmd_context *cmd,
if (!archive(vg))
return_0;
- /* Swap normal LV with pool's metadata LV ? */
- if (lv_is_pool(pool_lv)) {
- /* Swap names between old and new metadata LV */
- seg = first_seg(pool_lv);
- if (!detach_pool_metadata_lv(seg, &pool_metadata_lv))
- return_0;
- old_name = metadata_lv->name;
- if (!lv_rename_update(cmd, metadata_lv, "pvmove_tmeta", 0))
- return_0;
- if (!lv_rename_update(cmd, pool_metadata_lv, old_name, 0))
- return_0;
-
- goto mda_write;
- }
-
if (zero_metadata) {
metadata_lv->status |= LV_TEMPORARY;
if (!activate_lv_local(cmd, metadata_lv)) {
@@ -2854,41 +3009,66 @@ static int _lvconvert_pool(struct cmd_context *cmd,
}
}
- /* We are changing target type, so deactivate first */
+ /*
+ * Deactivate the data LV and metadata LV.
+ * We are changing target type, so deactivate first.
+ */
+
if (!deactivate_lv(cmd, metadata_lv)) {
log_error("Aborting. Failed to deactivate metadata lv. "
"Manual intervention required.");
return 0;
}
- if (!deactivate_lv(cmd, pool_lv)) {
+ if (!deactivate_lv(cmd, lv)) {
log_error("Aborting. Failed to deactivate logical volume %s.",
- display_lvname(pool_lv));
+ display_lvname(lv));
return 0;
}
- data_lv = pool_lv;
- old_name = data_lv->name; /* Use for pool name */
/*
+ * When the LV referenced by the original function arg "lv"
+ * is renamed, it is then referenced as "data_lv".
+ *
+ * pool_name pool name taken from lv arg
+ * data_name sub lv name, generated
+ * meta_name sub lv name, generated
+ *
+ * pool_lv new lv for pool object, created here
+ * data_lv sub lv, was lv arg, now renamed
+ * metadata_lv sub lv, existing or created here
+ */
+
+ data_lv = lv;
+ pool_name = lv->name; /* Use original LV name for pool name */
+
+ /*
+ * Rename the original LV arg to the internal data LV naming scheme.
+ *
* Since we wish to have underlaying devs to match _[ct]data
* rename data LV to match pool LV subtree first,
* also checks for visible LV.
+ *
+ * FIXME: any more types prohibited here?
*/
- /* FIXME: any more types prohibited here? */
+
if (!lv_rename_update(cmd, data_lv, data_name, 0))
return_0;
- if (!(pool_lv = lv_create_empty(old_name, NULL,
- ((segtype_is_cache_pool(lp->segtype)) ?
- CACHE_POOL : THIN_POOL) |
- VISIBLE_LV | LVM_READ | LVM_WRITE,
+ /*
+ * Create LV structures for the new pool LV object,
+ * and connect it to the data/meta LVs.
+ */
+
+ if (!(pool_lv = lv_create_empty(pool_name, NULL,
+ (to_cachepool ? CACHE_POOL : THIN_POOL) | VISIBLE_LV | LVM_READ | LVM_WRITE,
ALLOC_INHERIT, vg))) {
log_error("Creation of pool LV failed.");
return 0;
}
/* Allocate a new pool segment */
- if (!(seg = alloc_lv_segment(lp->segtype, pool_lv, 0, data_lv->le_count,
+ if (!(seg = alloc_lv_segment(pool_segtype, pool_lv, 0, data_lv->le_count,
pool_lv->status, 0, NULL, 1,
data_lv->le_count, 0, 0, 0, NULL)))
return_0;
@@ -2907,7 +3087,7 @@ static int _lvconvert_pool(struct cmd_context *cmd,
* data and meta LVs (they are unlocked and deleted below.)
*/
if (is_lockd_type(vg->lock_type)) {
- if (segtype_is_cache_pool(lp->segtype)) {
+ if (to_cachepool) {
data_lv->lock_args = NULL;
metadata_lv->lock_args = NULL;
} else {
@@ -2919,1763 +3099,182 @@ static int _lvconvert_pool(struct cmd_context *cmd,
else if (!strcmp(vg->lock_type, "dlm"))
pool_lv->lock_args = "dlm";
/* The lock_args will be set in vg_write(). */
- }
- }
-
- /* FIXME: revert renamed LVs in fail path? */
- /* FIXME: any common code with metadata/thin_manip.c extend_pool() ? */
-
- seg->transaction_id = 0;
-
-mda_write:
- seg->chunk_size = lp->chunk_size;
- seg->discards = lp->discards;
- seg->zero_new_blocks = lp->zero ? 1 : 0;
-
- if (lp->cache_mode &&
- !cache_set_cache_mode(seg, lp->cache_mode))
- return_0;
-
- if ((lp->policy_name || lp->policy_settings) &&
- !cache_set_policy(seg, lp->policy_name, lp->policy_settings))
- return_0;
-
- /* Rename deactivated metadata LV to have _tmeta suffix */
- /* Implicit checks if metadata_lv is visible */
- if (lp->pool_metadata_name &&
- !lv_rename_update(cmd, metadata_lv, metadata_name, 0))
- return_0;
-
- if (!attach_pool_metadata_lv(seg, metadata_lv))
- return_0;
-
- if (!handle_pool_metadata_spare(vg, metadata_lv->le_count,
- lp->pvh, lp->poolmetadataspare))
- return_0;
-
- if (!vg_write(vg) || !vg_commit(vg))
- return_0;
-
- if (seg->zero_new_blocks &&
- seg->chunk_size >= DEFAULT_THIN_POOL_CHUNK_SIZE_PERFORMANCE * 2)
- log_warn("WARNING: Pool zeroing and large %s chunk size slows down "
- "provisioning.", display_size(cmd, seg->chunk_size));
-
- if (activate_pool && !lockd_lv(cmd, pool_lv, "ex", LDLV_PERSISTENT)) {
- log_error("Failed to lock pool LV %s.", display_lvname(pool_lv));
- goto out;
- }
-
- if (activate_pool &&
- !activate_lv_excl(cmd, pool_lv)) {
- log_error("Failed to activate pool logical volume %s.",
- display_lvname(pool_lv));
- /* Deactivate subvolumes */
- if (!deactivate_lv(cmd, seg_lv(seg, 0)))
- log_error("Failed to deactivate pool data logical volume %s.",
- display_lvname(seg_lv(seg, 0)));
- if (!deactivate_lv(cmd, seg->metadata_lv))
- log_error("Failed to deactivate pool metadata logical volume %s.",
- display_lvname(seg->metadata_lv));
- goto out;
- }
-
- r = 1;
- lp->pool_data_lv = pool_lv;
-
-out:
- backup(vg);
-
- if (r)
- log_print_unless_silent("Converted %s to %s pool.",
- display_lvname(pool_lv),
- (segtype_is_cache_pool(lp->segtype)) ?
- "cache" : "thin");
-
- /*
- * Unlock and free the locks from existing LVs that became pool data
- * and meta LVs.
- */
- if (lockd_data_name) {
- if (!lockd_lv_name(cmd, vg, lockd_data_name, &lockd_data_id, lockd_data_args, "un", LDLV_PERSISTENT))
- log_error("Failed to unlock pool data LV %s/%s", vg->name, lockd_data_name);
- lockd_free_lv(cmd, vg, lockd_data_name, &lockd_data_id, lockd_data_args);
- }
-
- if (lockd_meta_name) {
- if (!lockd_lv_name(cmd, vg, lockd_meta_name, &lockd_meta_id, lockd_meta_args, "un", LDLV_PERSISTENT))
- log_error("Failed to unlock pool metadata LV %s/%s", vg->name, lockd_meta_name);
- lockd_free_lv(cmd, vg, lockd_meta_name, &lockd_meta_id, lockd_meta_args);
- }
-
- return r;
-#if 0
-revert_new_lv:
- /* TBD */
- if (!lp->pool_metadata_lv_name) {
- if (!deactivate_lv(cmd, metadata_lv)) {
- log_error("Failed to deactivate metadata lv.");
- return 0;
- }
- if (!lv_remove(metadata_lv) || !vg_write(vg) || !vg_commit(vg))
- log_error("Manual intervention may be required to remove "
- "abandoned LV(s) before retrying.");
- else
- backup(vg);
- }
-
- return 0;
-#endif
-}
-
-static int _lvconvert_swap_pool_metadata(struct cmd_context *cmd,
- struct logical_volume *lv,
- struct logical_volume *metadata_lv)
-{
- struct volume_group *vg = lv->vg;
- struct logical_volume *prev_metadata_lv;
- struct lv_segment *seg;
- struct lv_types *lvtype;
- char meta_name[NAME_LEN];
- const char *swap_name;
- uint32_t chunk_size;
- int is_thinpool;
- int is_cachepool;
- int lvt_enum;
-
- is_thinpool = lv_is_thin_pool(lv);
- is_cachepool = lv_is_cache_pool(lv);
- lvt_enum = get_lvt_enum(metadata_lv);
- lvtype = get_lv_type(lvt_enum);
-
- if (lvt_enum != striped_LVT && lvt_enum != linear_LVT && lvt_enum != raid_LVT) {
- log_error("LV %s with type %s cannot be used as a metadata LV.",
- display_lvname(metadata_lv), lvtype ? lvtype->name : "unknown");
- return 0;
- }
-
- if (!lv_is_visible(metadata_lv)) {
- log_error("Can't convert internal LV %s.",
- display_lvname(metadata_lv));
- return 0;
- }
-
- if (lv_is_locked(metadata_lv)) {
- log_error("Can't convert locked LV %s.",
- display_lvname(metadata_lv));
- return 0;
- }
-
- if (lv_is_origin(metadata_lv) ||
- lv_is_merging_origin(metadata_lv) ||
- lv_is_external_origin(metadata_lv) ||
- lv_is_virtual(metadata_lv)) {
- log_error("Pool metadata LV %s is of an unsupported type.",
- display_lvname(metadata_lv));
- return 0;
- }
-
- /* FIXME cache pool */
- if (is_thinpool && pool_is_active(lv)) {
- /* If any volume referencing pool active - abort here */
- log_error("Cannot convert pool %s with active volumes.",
- display_lvname(lv));
- return 0;
- }
-
- if ((dm_snprintf(meta_name, sizeof(meta_name), "%s%s", lv->name, is_cachepool ? "_cmeta" : "_tmeta") < 0)) {
- log_error("Failed to create internal lv names, pool name is too long.");
- return 0;
- }
-
- seg = first_seg(lv);
-
- /* Normally do NOT change chunk size when swapping */
-
- if (arg_is_set(cmd, chunksize_ARG)) {
- chunk_size = arg_uint_value(cmd, chunksize_ARG, 0);
-
- if ((chunk_size != seg->chunk_size) && !dm_list_empty(&lv->segs_using_this_lv)) {
- if (arg_count(cmd, force_ARG) == PROMPT) {
- log_error("Chunk size can be only changed with --force. Conversion aborted.");
- return 0;
- }
-
- if (!validate_pool_chunk_size(cmd, seg->segtype, chunk_size))
- return_0;
-
- log_warn("WARNING: Changing chunk size %s to %s for %s pool volume.",
- display_size(cmd, seg->chunk_size),
- display_size(cmd, chunk_size),
- display_lvname(lv));
-
- /* Ok, user has likely some serious reason for this */
- if (!arg_count(cmd, yes_ARG) &&
- yes_no_prompt("Do you really want to change chunk size for %s pool volume? [y/n]: ",
- display_lvname(lv)) == 'n') {
- log_error("Conversion aborted.");
- return 0;
- }
- }
-
- seg->chunk_size = chunk_size;
- }
-
- if (!arg_count(cmd, yes_ARG) &&
- yes_no_prompt("Do you want to swap metadata of %s pool with metadata volume %s? [y/n]: ",
- display_lvname(lv),
- display_lvname(metadata_lv)) == 'n') {
- log_error("Conversion aborted.");
- return 0;
- }
-
- if (!deactivate_lv(cmd, metadata_lv)) {
- log_error("Aborting. Failed to deactivate %s.",
- display_lvname(metadata_lv));
- return 0;
- }
-
- if (!archive(vg))
- return_0;
-
- /* Swap names between old and new metadata LV */
-
- if (!detach_pool_metadata_lv(seg, &prev_metadata_lv))
- return_0;
-
- swap_name = metadata_lv->name;
-
- if (!lv_rename_update(cmd, metadata_lv, "pvmove_tmeta", 0))
- return_0;
-
- /* Give the previous metadata LV the name of the LV replacing it. */
-
- if (!lv_rename_update(cmd, prev_metadata_lv, swap_name, 0))
- return_0;
-
- /* Rename deactivated metadata LV to have _tmeta suffix */
-
- if (!lv_rename_update(cmd, metadata_lv, meta_name, 0))
- return_0;
-
- if (!attach_pool_metadata_lv(seg, metadata_lv))
- return_0;
-
- if (!vg_write(vg) || !vg_commit(vg))
- return_0;
-
- backup(vg);
- return 1;
-}
-
-/*
- * Create a new pool LV, using the lv arg as the data sub LV.
- * The metadata sub LV is either a new LV created here, or an
- * existing LV specified by --poolmetadata.
- */
-
-static int _lvconvert_to_pool(struct cmd_context *cmd,
- struct logical_volume *lv,
- int to_thinpool,
- int to_cachepool,
- struct dm_list *use_pvh)
-{
- struct volume_group *vg = lv->vg;
- struct logical_volume *metadata_lv = NULL; /* existing or created */
- struct logical_volume *data_lv; /* lv arg renamed */
- struct logical_volume *pool_lv; /* new lv created here */
- const char *pool_metadata_name; /* user-specified lv name */
- const char *pool_name; /* name of original lv arg */
- char meta_name[NAME_LEN]; /* generated sub lv name */
- char data_name[NAME_LEN]; /* generated sub lv name */
- struct segment_type *pool_segtype; /* thinpool or cachepool */
- struct lv_segment *seg;
- unsigned int target_attr = ~0;
- unsigned int passed_args = 0;
- unsigned int activate_pool;
- unsigned int zero_metadata;
- uint64_t meta_size;
- uint32_t meta_extents;
- uint32_t chunk_size;
- int chunk_calc;
- int r = 0;
-
- /* for handling lvmlockd cases */
- char *lockd_data_args = NULL;
- char *lockd_meta_args = NULL;
- char *lockd_data_name = NULL;
- char *lockd_meta_name = NULL;
- struct id lockd_data_id;
- struct id lockd_meta_id;
-
-
- if (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) {
- log_error(INTERNAL_ERROR "LV %s is already a pool.", display_lvname(lv));
- return 0;
- }
-
- pool_segtype = to_cachepool ? get_segtype_from_string(cmd, SEG_TYPE_NAME_CACHE_POOL) :
- get_segtype_from_string(cmd, SEG_TYPE_NAME_THIN_POOL);
-
- if (!pool_segtype->ops->target_present(cmd, NULL, &target_attr)) {
- log_error("%s: Required device-mapper target(s) not detected in your kernel.", pool_segtype->name);
- return 0;
- }
-
- /* Allow to have only thinpool active and restore it's active state. */
- activate_pool = to_thinpool && lv_is_active(lv);
-
- /* Wipe metadata_lv by default, but allow skipping this for cache pools. */
- zero_metadata = to_cachepool ? arg_int_value(cmd, zero_ARG, 1) : 1;
-
- /* An existing LV needs to have its lock freed once it becomes a data LV. */
- if (is_lockd_type(vg->lock_type) && lv->lock_args) {
- lockd_data_args = dm_pool_strdup(cmd->mem, lv->lock_args);
- lockd_data_name = dm_pool_strdup(cmd->mem, lv->name);
- memcpy(&lockd_data_id, &lv->lvid.id[1], sizeof(struct id));
- }
-
- /*
- * If an existing LV is to be used as the metadata LV,
- * verify that it's in a usable state. These checks are
- * not done by command def rules because this LV is not
- * processed by process_each_lv.
- */
-
- if ((pool_metadata_name = arg_str_value(cmd, poolmetadata_ARG, NULL))) {
- if (!(metadata_lv = find_lv(vg, pool_metadata_name))) {
- log_error("Unknown pool metadata LV %s.", pool_metadata_name);
- return 0;
- }
-
- /* An existing LV needs to have its lock freed once it becomes a meta LV. */
- if (is_lockd_type(vg->lock_type) && metadata_lv->lock_args) {
- lockd_meta_args = dm_pool_strdup(cmd->mem, metadata_lv->lock_args);
- lockd_meta_name = dm_pool_strdup(cmd->mem, metadata_lv->name);
- memcpy(&lockd_meta_id, &metadata_lv->lvid.id[1], sizeof(struct id));
- }
-
- if (metadata_lv == lv) {
- log_error("Can't use same LV for pool data and metadata LV %s.",
- display_lvname(metadata_lv));
- return 0;
- }
-
- if (!lv_is_visible(metadata_lv)) {
- log_error("Can't convert internal LV %s.",
- display_lvname(metadata_lv));
- return 0;
- }
-
- if (lv_is_locked(metadata_lv)) {
- log_error("Can't convert locked LV %s.",
- display_lvname(metadata_lv));
- return 0;
- }
-
- if (lv_is_mirror(metadata_lv)) {
- log_error("Mirror logical volumes cannot be used for pool metadata.");
- log_print_unless_silent("Try \"%s\" segment type instead.", SEG_TYPE_NAME_RAID1);
- return 0;
- }
-
- /* FIXME Tidy up all these type restrictions. */
- if (lv_is_cache_type(metadata_lv) ||
- lv_is_thin_type(metadata_lv) ||
- lv_is_cow(metadata_lv) || lv_is_merging_cow(metadata_lv) ||
- lv_is_origin(metadata_lv) || lv_is_merging_origin(metadata_lv) ||
- lv_is_external_origin(metadata_lv) ||
- lv_is_virtual(metadata_lv)) {
- log_error("Pool metadata LV %s is of an unsupported type.",
- display_lvname(metadata_lv));
- return 0;
- }
- }
-
- /*
- * Determine the size of the metadata LV and the chunk size. When an
- * existing LV is to be used for metadata, this introduces some
- * constraints/defaults. When chunk_size=0 and/or meta_extents=0 are
- * passed to the "update params" function, defaults are calculated and
- * returned.
- */
-
- if (arg_is_set(cmd, chunksize_ARG)) {
- passed_args |= PASS_ARG_CHUNK_SIZE;
- chunk_size = arg_uint_value(cmd, chunksize_ARG, 0);
- if (!validate_pool_chunk_size(cmd, pool_segtype, chunk_size))
- return_0;
- } else {
- /* A default will be chosen by the "update" function. */
- chunk_size = 0;
- }
-
- if (arg_is_set(cmd, poolmetadatasize_ARG)) {
- meta_size = arg_uint64_value(cmd, poolmetadatasize_ARG, UINT64_C(0));
- meta_extents = extents_from_size(cmd, meta_size, vg->extent_size);
- passed_args |= PASS_ARG_POOL_METADATA_SIZE;
- } else if (metadata_lv) {
- meta_extents = metadata_lv->le_count;
- passed_args |= PASS_ARG_POOL_METADATA_SIZE;
- } else {
- /* A default will be chosen by the "update" function. */
- meta_extents = 0;
- }
-
- /* Tell the "update" function to ignore these, they are handled below. */
- passed_args |= PASS_ARG_DISCARDS | PASS_ARG_ZERO;
-
- /*
- * Validate and/or choose defaults for meta_extents and chunk_size,
- * this involves some complicated calculations.
- */
-
- if (to_cachepool) {
- if (!update_cache_pool_params(pool_segtype, vg, target_attr,
- passed_args, lv->le_count,
- &meta_extents,
- &chunk_calc,
- &chunk_size))
- return_0;
- } else {
- if (!update_thin_pool_params(pool_segtype, vg, target_attr,
- passed_args, lv->le_count,
- &meta_extents,
- &chunk_calc,
- &chunk_size,
- NULL, NULL))
- return_0;
- }
-
- if ((uint64_t)chunk_size > ((uint64_t)lv->le_count * vg->extent_size)) {
- log_error("Pool data LV %s is too small (%s) for specified chunk size (%s).",
- display_lvname(lv),
- display_size(cmd, (uint64_t)lv->le_count * vg->extent_size),
- display_size(cmd, chunk_size));
- return 0;
- }
-
- if (metadata_lv && (meta_extents > metadata_lv->le_count)) {
- log_error("Pool metadata LV %s is too small (%u extents) for required metadata (%u extents).",
- display_lvname(metadata_lv), metadata_lv->le_count, meta_extents);
- return 0;
- }
-
- log_verbose("Pool metadata extents %u chunk_size %u", meta_extents, chunk_size);
-
-
- /*
- * Verify that user wants to use these LVs.
- */
-
- log_warn("WARNING: Converting logical volume %s%s%s to %s pool's data%s %s metadata wiping.",
- display_lvname(lv),
- metadata_lv ? " and " : "",
- metadata_lv ? display_lvname(metadata_lv) : "",
- to_cachepool ? "cache" : "thin",
- metadata_lv ? " and metadata volumes" : " volume",
- zero_metadata ? "with" : "WITHOUT");
-
- if (zero_metadata)
- log_warn("THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.)");
- else if (to_cachepool)
- log_warn("WARNING: Using mismatched cache pool metadata MAY DESTROY YOUR DATA!");
-
- if (!arg_count(cmd, yes_ARG) &&
- yes_no_prompt("Do you really want to convert %s%s%s? [y/n]: ",
- display_lvname(lv),
- metadata_lv ? " and " : "",
- metadata_lv ? display_lvname(metadata_lv) : "") == 'n') {
- log_error("Conversion aborted.");
- return 0;
- }
-
- /*
- * The internal LV names for pool data/meta LVs.
- */
-
- if ((dm_snprintf(meta_name, sizeof(meta_name), "%s%s", lv->name, to_cachepool ? "_cmeta" : "_tmeta") < 0) ||
- (dm_snprintf(data_name, sizeof(data_name), "%s%s", lv->name, to_cachepool ? "_cdata" : "_tdata") < 0)) {
- log_error("Failed to create internal lv names, pool name is too long.");
- return 0;
- }
-
- /*
- * If a new metadata LV needs to be created, collect the settings for
- * the new LV and create it.
- *
- * If an existing LV is used for metadata, deactivate/activate/wipe it.
- */
-
- if (!metadata_lv) {
- uint32_t meta_stripes;
- uint32_t meta_stripe_size;
- uint32_t meta_readahead;
- alloc_policy_t meta_alloc;
- unsigned meta_stripes_supplied;
- unsigned meta_stripe_size_supplied;
-
- if (!get_stripe_params(cmd, get_segtype_from_string(cmd, SEG_TYPE_NAME_STRIPED),
- &meta_stripes,
- &meta_stripe_size,
- &meta_stripes_supplied,
- &meta_stripe_size_supplied))
- return_0;
-
- meta_readahead = arg_uint_value(cmd, readahead_ARG, cmd->default_settings.read_ahead);
- meta_alloc = (alloc_policy_t) arg_uint_value(cmd, alloc_ARG, ALLOC_INHERIT);
-
- if (!archive(vg))
- return_0;
-
- if (!(metadata_lv = alloc_pool_metadata(lv,
- meta_name,
- meta_readahead,
- meta_stripes,
- meta_stripe_size,
- meta_extents,
- meta_alloc,
- use_pvh)))
- return_0;
- } else {
- if (!deactivate_lv(cmd, metadata_lv)) {
- log_error("Aborting. Failed to deactivate %s.",
- display_lvname(metadata_lv));
- return 0;
- }
-
- if (!archive(vg))
- return_0;
-
- if (zero_metadata) {
- metadata_lv->status |= LV_TEMPORARY;
- if (!activate_lv_local(cmd, metadata_lv)) {
- log_error("Aborting. Failed to activate metadata lv.");
- return 0;
- }
-
- if (!wipe_lv(metadata_lv, (struct wipe_params) { .do_zero = 1 })) {
- log_error("Aborting. Failed to wipe metadata lv.");
- return 0;
- }
- }
- }
-
- /*
- * Deactivate the data LV and metadata LV.
- * We are changing target type, so deactivate first.
- */
-
- if (!deactivate_lv(cmd, metadata_lv)) {
- log_error("Aborting. Failed to deactivate metadata lv. "
- "Manual intervention required.");
- return 0;
- }
-
- if (!deactivate_lv(cmd, lv)) {
- log_error("Aborting. Failed to deactivate logical volume %s.",
- display_lvname(lv));
- return 0;
- }
-
- /*
- * When the LV referenced by the original function arg "lv"
- * is renamed, it is then referenced as "data_lv".
- *
- * pool_name pool name taken from lv arg
- * data_name sub lv name, generated
- * meta_name sub lv name, generated
- *
- * pool_lv new lv for pool object, created here
- * data_lv sub lv, was lv arg, now renamed
- * metadata_lv sub lv, existing or created here
- */
-
- data_lv = lv;
- pool_name = lv->name; /* Use original LV name for pool name */
-
- /*
- * Rename the original LV arg to the internal data LV naming scheme.
- *
- * Since we wish to have underlaying devs to match _[ct]data
- * rename data LV to match pool LV subtree first,
- * also checks for visible LV.
- *
- * FIXME: any more types prohibited here?
- */
-
- if (!lv_rename_update(cmd, data_lv, data_name, 0))
- return_0;
-
- /*
- * Create LV structures for the new pool LV object,
- * and connect it to the data/meta LVs.
- */
-
- if (!(pool_lv = lv_create_empty(pool_name, NULL,
- (to_cachepool ? CACHE_POOL : THIN_POOL) | VISIBLE_LV | LVM_READ | LVM_WRITE,
- ALLOC_INHERIT, vg))) {
- log_error("Creation of pool LV failed.");
- return 0;
- }
-
- /* Allocate a new pool segment */
- if (!(seg = alloc_lv_segment(pool_segtype, pool_lv, 0, data_lv->le_count,
- pool_lv->status, 0, NULL, 1,
- data_lv->le_count, 0, 0, 0, NULL)))
- return_0;
-
- /* Add the new segment to the layer LV */
- dm_list_add(&pool_lv->segments, &seg->list);
- pool_lv->le_count = data_lv->le_count;
- pool_lv->size = data_lv->size;
-
- if (!attach_pool_data_lv(seg, data_lv))
- return_0;
-
- /*
- * Create a new lock for a thin pool LV. A cache pool LV has no lock.
- * Locks are removed from existing LVs that are being converted to
- * data and meta LVs (they are unlocked and deleted below.)
- */
- if (is_lockd_type(vg->lock_type)) {
- if (to_cachepool) {
- data_lv->lock_args = NULL;
- metadata_lv->lock_args = NULL;
- } else {
- data_lv->lock_args = NULL;
- metadata_lv->lock_args = NULL;
-
- if (!strcmp(vg->lock_type, "sanlock"))
- pool_lv->lock_args = "pending";
- else if (!strcmp(vg->lock_type, "dlm"))
- pool_lv->lock_args = "dlm";
- /* The lock_args will be set in vg_write(). */
- }
- }
-
- /*
- * Apply settings to the new pool seg, from command line, from
- * defaults, sometimes adjusted.
- */
-
- seg->transaction_id = 0;
- seg->chunk_size = chunk_size;
-
- if (to_cachepool) {
- cache_mode_t cache_mode = 0;
- const char *policy_name = NULL;
- struct dm_config_tree *policy_settings = NULL;
-
- if (!get_cache_params(cmd, &cache_mode, &policy_name, &policy_settings))
- return_0;
-
- if (cache_mode &&
- !cache_set_cache_mode(seg, cache_mode))
- return_0;
-
- if ((policy_name || policy_settings) &&
- !cache_set_policy(seg, policy_name, policy_settings))
- return_0;
-
- if (policy_settings)
- dm_config_destroy(policy_settings);
- } else {
- const char *discards_name;
-
- if (arg_is_set(cmd, zero_ARG))
- seg->zero_new_blocks = arg_int_value(cmd, zero_ARG, 0);
- else
- seg->zero_new_blocks = find_config_tree_bool(cmd, allocation_thin_pool_zero_CFG, vg->profile);
-
- if (arg_is_set(cmd, discards_ARG))
- seg->discards = (thin_discards_t) arg_uint_value(cmd, discards_ARG, THIN_DISCARDS_PASSDOWN);
- else {
- if (!(discards_name = find_config_tree_str(cmd, allocation_thin_pool_discards_CFG, vg->profile)))
- return_0;
- if (!set_pool_discards(&seg->discards, discards_name))
- return_0;
- }
- }
-
- /*
- * Rename deactivated metadata LV to have _tmeta suffix.
- * Implicit checks if metadata_lv is visible.
- */
- if (pool_metadata_name &&
- !lv_rename_update(cmd, metadata_lv, meta_name, 0))
- return_0;
-
- if (!attach_pool_metadata_lv(seg, metadata_lv))
- return_0;
-
- if (!handle_pool_metadata_spare(vg,
- metadata_lv->le_count,
- use_pvh,
- arg_int_value(cmd, poolmetadataspare_ARG, DEFAULT_POOL_METADATA_SPARE)))
- return_0;
-
- if (!vg_write(vg) || !vg_commit(vg))
- return_0;
-
- if (seg->zero_new_blocks &&
- seg->chunk_size >= DEFAULT_THIN_POOL_CHUNK_SIZE_PERFORMANCE * 2)
- log_warn("WARNING: Pool zeroing and large %s chunk size slows down provisioning.",
- display_size(cmd, seg->chunk_size));
-
- if (activate_pool && !lockd_lv(cmd, pool_lv, "ex", LDLV_PERSISTENT)) {
- log_error("Failed to lock pool LV %s.", display_lvname(pool_lv));
- goto out;
- }
-
- if (activate_pool &&
- !activate_lv_excl(cmd, pool_lv)) {
- log_error("Failed to activate pool logical volume %s.",
- display_lvname(pool_lv));
- /* Deactivate subvolumes */
- if (!deactivate_lv(cmd, seg_lv(seg, 0)))
- log_error("Failed to deactivate pool data logical volume %s.",
- display_lvname(seg_lv(seg, 0)));
- if (!deactivate_lv(cmd, seg->metadata_lv))
- log_error("Failed to deactivate pool metadata logical volume %s.",
- display_lvname(seg->metadata_lv));
- goto out;
- }
-
- r = 1;
-
-out:
- backup(vg);
-
- if (r)
- log_print_unless_silent("Converted %s to %s pool.",
- display_lvname(lv),
- to_cachepool ? "cache" : "thin");
-
- /*
- * Unlock and free the locks from existing LVs that became pool data
- * and meta LVs.
- */
- if (lockd_data_name) {
- if (!lockd_lv_name(cmd, vg, lockd_data_name, &lockd_data_id, lockd_data_args, "un", LDLV_PERSISTENT))
- log_error("Failed to unlock pool data LV %s/%s", vg->name, lockd_data_name);
- lockd_free_lv(cmd, vg, lockd_data_name, &lockd_data_id, lockd_data_args);
- }
-
- if (lockd_meta_name) {
- if (!lockd_lv_name(cmd, vg, lockd_meta_name, &lockd_meta_id, lockd_meta_args, "un", LDLV_PERSISTENT))
- log_error("Failed to unlock pool metadata LV %s/%s", vg->name, lockd_meta_name);
- lockd_free_lv(cmd, vg, lockd_meta_name, &lockd_meta_id, lockd_meta_args);
- }
-
- return r;
-#if 0
-revert_new_lv:
- /* TBD */
- if (!pool_metadata_lv_name) {
- if (!deactivate_lv(cmd, metadata_lv)) {
- log_error("Failed to deactivate metadata lv.");
- return 0;
- }
- if (!lv_remove(metadata_lv) || !vg_write(vg) || !vg_commit(vg))
- log_error("Manual intervention may be required to remove "
- "abandoned LV(s) before retrying.");
- else
- backup(vg);
- }
-
- return 0;
-#endif
-}
-
-/*
- * Convert origin into a cache LV by attaching a cache pool.
- */
-static int _lvconvert_cache(struct cmd_context *cmd,
- struct logical_volume *origin_lv,
- struct lvconvert_params *lp)
-{
- struct logical_volume *pool_lv = lp->pool_data_lv;
- struct logical_volume *cache_lv;
-
- if (!validate_lv_cache_create_pool(pool_lv))
- return_0;
-
- if (!archive(origin_lv->vg))
- return_0;
-
- if (!(cache_lv = lv_cache_create(pool_lv, origin_lv)))
- return_0;
-
- if (!cache_set_cache_mode(first_seg(cache_lv), lp->cache_mode))
- return_0;
-
- if (!cache_set_policy(first_seg(cache_lv), lp->policy_name, lp->policy_settings))
- return_0;
-
- cache_check_for_warns(first_seg(cache_lv));
-
- if (!lv_update_and_reload(cache_lv))
- return_0;
-
- log_print_unless_silent("Logical volume %s is now cached.",
- display_lvname(cache_lv));
-
- return 1;
-}
-
-static int _lvconvert_to_cache_vol(struct cmd_context *cmd,
- struct logical_volume *lv,
- struct logical_volume *cachepool_lv)
-{
- struct logical_volume *cache_lv;
- cache_mode_t cache_mode = 0;
- const char *policy_name = NULL;
- struct dm_config_tree *policy_settings = NULL;
-
- if (!validate_lv_cache_create_pool(cachepool_lv))
- return_0;
-
- if (!get_cache_params(cmd, &cache_mode, &policy_name, &policy_settings))
- return_0;
-
- if (!archive(lv->vg))
- return_0;
-
- if (!(cache_lv = lv_cache_create(cachepool_lv, lv)))
- return_0;
-
- if (!cache_set_cache_mode(first_seg(cache_lv), cache_mode))
- return_0;
-
- if (!cache_set_policy(first_seg(cache_lv), policy_name, policy_settings))
- return_0;
-
- if (policy_settings)
- dm_config_destroy(policy_settings);
-
- cache_check_for_warns(first_seg(cache_lv));
-
- if (!lv_update_and_reload(cache_lv))
- return_0;
-
- log_print_unless_silent("Logical volume %s is now cached.",
- display_lvname(cache_lv));
-
- return 1;
-}
-
-/*
- * Functions called to perform a specific operation on a specific LV type.
- *
- * _convert_<lvtype>_<operation>
- *
- * For cases where an operation does not apply to the LV itself, but
- * is implicitly redirected to a sub-LV, these functions locate the
- * correct sub-LV and call the operation on that sub-LV. If a sub-LV
- * of the proper type is not found, these functions report the error.
- *
- * FIXME: the _lvconvert_foo() functions can be cleaned up since they
- * are now only called for valid combinations of LV type and operation.
- * After that happens, the code remaining in those functions can be
- * moved into the _convert_lvtype_operation() functions below.
- */
-
-/*
- * Separate a COW snapshot LV from its origin.
- * lvconvert --splitsnapshot LV
- */
-static int _convert_cow_snapshot_splitsnapshot(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_splitsnapshot(cmd, lv);
-}
-
-/*
- * Merge a COW snapshot LV into its origin.
- * lvconvert --merge LV
- */
-static int _convert_cow_snapshot_merge(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* return _lvconvert_merge_old_snapshot(cmd, lv, lp); */
-}
-
-/*
- * Merge a snapshot thin LV into its origin.
- * lvconvert --merge LV
- */
-
-static int _convert_thin_volume_merge(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_merge_thin_snapshot(cmd, lv);
-}
-
-/*
- * Split and preserve a cache pool from the data portion of a thin pool LV.
- * lvconvert --splitcache LV
- */
-static int _convert_thin_pool_splitcache(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- struct logical_volume *sublv1;
-
- sublv1 = seg_lv(first_seg(lv), 0); /* cached _tdata ? */
-
- if (!lv_is_cache(sublv1)) {
- log_error("Sub LV %s must be cache.", display_lvname(sublv1));
- return 0;
- }
-
- /* return _lvconvert_split_cached(cmd, sublv1); */
- return 0;
-}
-
-/*
- * Split and remove a cache pool from the data portion of a thin pool LV.
- * lvconvert --uncache LV
- */
-static int _convert_thin_pool_uncache(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- struct logical_volume *sublv1 = NULL;
-
- sublv1 = seg_lv(first_seg(lv), 0); /* cached _tdata ? */
-
- if (!lv_is_cache(sublv1)) {
- log_error("Sub LV %s must be cache.", display_lvname(sublv1));
- return 0;
- }
-
- /* return _lvconvert_uncache(cmd, sublv1, lp); */
- return 0;
-}
-
-/*
- * Convert the data portion of a thin pool LV to a cache LV.
- * lvconvert --type cache LV
- *
- * Required options:
- * --cachepool LV
- *
- * Auxiliary operation:
- * Converts the --cachepool arg to a cache pool if it is not already.
- *
- * Alternate syntax:
- * lvconvert --cache LV
- */
-static int _convert_thin_pool_cache(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* lvconvert --type cache includes an implicit conversion of the cachepool arg to type cache-pool. */
- if (!_lvconvert_pool(cmd, lv, lp)) {
- log_error("Implicit conversion of --cachepool arg to type cache-pool failed.");
- return 0;
- }
-
- /* Do we need to grab the tdata sub LV to pass on? */
-
- return _lvconvert_cache(cmd, lv, lp);
-}
-
-/*
- * Replace the metadata LV in a thin pool LV.
- * lvconvert --poolmetadata NewLV --thinpool LV
- * FIXME: this will change so --swap-poolmetadata defines the operation.
- * FIXME: should be lvconvert --swap-poolmetadata NewLV LV
- */
-static int _convert_thin_pool_swapmetadata(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_pool(cmd, lv, lp);
-}
-
-/*
- * Split and preserve a cache pool from a cache LV.
- * lvconvert --splitcache LV
- */
-static int _convert_cache_volume_splitcache(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* return _lvconvert_split_cached(cmd, lv); */
- return 0;
-}
-
-/*
- * Split and remove a cache pool from a cache LV.
- * lvconvert --uncache LV
- */
-static int _convert_cache_volume_uncache(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* return _lvconvert_uncache(cmd, lv, lp); */
- return 0;
-}
-
-/*
- * Split images from the raid1|mirror origin of a cache LV and use them to create a new LV.
- * lvconvert --splitmirrors Number LV
- *
- * Required options:
- * --trackchanges | --name Name
- */
-static int _convert_cache_volume_splitmirrors(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- struct logical_volume *sublv1;
-
- sublv1 = seg_lv(first_seg(lv), 0);
-
- if (lv_is_raid(sublv1))
- return _lvconvert_raid(sublv1, lp);
-
- if (lv_is_mirror(sublv1))
- return _lvconvert_mirrors(cmd, lv, lp);
-
- log_error("Sub LV %s must be raid or mirror.", display_lvname(sublv1));
- return 0;
-}
-
-/*
- * Convert a cache LV to a thin pool (using the cache LV for thin pool data).
- * lvconvert --type thin-pool LV
- *
- * Convert a cache LV to a thin volume with cached external origin using given
- * thinpool tpLV (when not yet Thinpool convert it to thin-pool first).
- * Conversion is 2-step process in this case.
- * Only writethrough cacheLV can be converted as external origin is read-only.
- * lvconvert --thin cacheLV --thinpool tpLV
- *
- * Alternate syntax:
- * This is equivalent to above, but not preferred because it's ambiguous and inconsistent.
- * lvconvert --thinpool LV
- */
-static int _convert_cache_volume_thin_pool(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- int is_clean;
- const struct lv_segment *pool_seg;
-
- if (!_lvconvert_pool(cmd, lv, lp))
- return_0;
-
- if (lv_is_cache(lv) && !lv_is_pool_data(lv)) {
- pool_seg = first_seg(first_seg(lv)->pool_lv);
- if (pool_seg->cache_mode != CACHE_MODE_WRITETHROUGH) {
- log_error("Cannot convert cache volume %s with %s cache mode to external origin.",
- display_lvname(lv),
- get_cache_mode_name(pool_seg));
- log_error("To proceed, run 'lvchange --cachemode writethrough %s'.",
- display_lvname(lv));
- return 0;
- }
-
- if (!lv_cache_wait_for_clean(lv, &is_clean))
- return_0;
-
- if (!is_clean) {
- log_error("Cache %s is not clean, refusing to convert to external origin.",
- display_lvname(lv));
- return 0;
- }
-
- if (!_lvconvert_thin(cmd, lv, lp))
- return_0;
- }
-
- return 1;
-}
-
-/*
- * Convert/Recombine cacheLV to be an origin for snapshot
- * lvconvert --type snapshot cacheLV snapshotLV
- */
-static int _convert_cache_volume_snapshot(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_snapshot(cmd, lv, lp->origin_name);
-}
-
-/*
- * Split a cache volume from a cache pool LV.
- * lvconvert --splitcache LV
- */
-static int _convert_cache_pool_splitcache(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- struct logical_volume *sublv1;
- struct lv_segment *seg;
-
- /* When passed used cache-pool of used cached LV -> split cached LV */
-
- if ((dm_list_size(&lv->segs_using_this_lv) == 1) &&
- (seg = get_only_segment_using_this_lv(lv)) &&
- seg_is_cache(seg))
- sublv1 = seg->lv;
- else {
- log_error("Sub LV of cache type not found.");
- return 0;
- }
-
- if (!lv_is_cache(sublv1)) {
- log_error("Sub LV %s must be cache.", display_lvname(sublv1));
- return 0;
- }
-
- /* return _lvconvert_split_cached(cmd, sublv1); */
- return 0;
-}
-
-/*
- * Replace the metadata LV in a cache pool LV.
- * lvconvert --poolmetadata NewLV --cachepool LV
- * FIXME: this will change so --swap-poolmetadata defines the operation.
- * FIXME: should be lvconvert --swap-poolmetadata NewLV LV
- */
-static int _convert_cache_pool_swapmetadata(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_pool(cmd, lv, lp);
-}
-
-/*
- * Change the number of images in a mirror LV.
- * lvconvert --mirrors Number LV
- */
-static int _convert_mirror_number(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_mirrors(cmd, lv, lp);
-}
-
-/*
- * Split images from a mirror LV and use them to create a new LV.
- * lvconvert --splitmirrors Number LV
- *
- * Required options:
- * --name Name
- */
-
-static int _convert_mirror_splitmirrors(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_mirrors(cmd, lv, lp);
-}
-
-/*
- * Change the type of log used by a mirror LV.
- * lvconvert --mirrorlog Type LV
- */
-static int _convert_mirror_log(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_mirrors(cmd, lv, lp);
-}
-
-/*
- * Convert mirror LV to linear LV.
- * lvconvert --type linear LV
- *
- * Alternate syntax:
- * lvconvert --mirrors 0 LV
- */
-static int _convert_mirror_linear(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_mirrors(cmd, lv, lp);
-}
-
-/*
- * Convert mirror LV to raid1 LV.
- * lvconvert --type raid1 LV
- */
-static int _convert_mirror_raid(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_raid(lv, lp);
-}
-
-/*
- * Change the number of images in a raid1 LV.
- * lvconvert --mirrors Number LV
- */
-static int _convert_raid_number(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_raid(lv, lp);
-}
-
-/*
- * Split images from a raid1 LV and use them to create a new LV.
- * lvconvert --splitmirrors Number LV
- *
- * Required options:
- * --trackchanges | --name Name
- */
-static int _convert_raid_splitmirrors(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* FIXME: split the splitmirrors section out of _lvconvert_raid and call it here. */
- return _lvconvert_raid(lv, lp);
-}
-
-/*
- * Merge a raid1 LV into originalLV if the raid1 LV was
- * previously split from the originalLV using --trackchanges.
- * lvconvert --merge LV
- */
-static int _convert_raid_merge(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* FIXME: split the merge section out of _lvconvert_raid and call it here. */
- return _lvconvert_raid(lv, lp);
-}
-
-/*
- * Combine a raid* LV with a snapshot LV that was previously
- * split from the raid* LV using --splitsnapshot.
- * lvconvert --type snapshot LV SnapshotLV
- *
- * Alternate syntax:
- * lvconvert --snapshot LV SnapshotLV
- */
-static int _convert_raid_snapshot(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_snapshot(cmd, lv, lp->origin_name);
-}
-
-/*
- * Convert a raid* LV to a thin LV with an external origin.
- * lvconvert --type thin LV
- *
- * Required options:
- * --thinpool LV
- *
- * Auxiliary operation:
- * Converts the --thinpool arg to a thin pool if it is not already.
- *
- * Alternate syntax:
- * lvconvert --thin LV
- */
-static int _convert_raid_thin(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* lvconvert --thin includes an implicit conversion of the thinpool arg to type thin-pool. */
- if (!_lvconvert_pool(cmd, lv, lp)) {
- log_error("Implicit conversion of --thinpool arg to type thin-pool failed.");
- return 0;
- }
-
- return _lvconvert_thin(cmd, lv, lp);
-}
-
-/*
- * Convert a raid* LV to a cache LV.
- * lvconvert --type cache LV
- *
- * Required options:
- * --cachepool LV
- *
- * Auxiliary operation:
- * Converts the --cachepool arg to a cache pool if it is not already.
- *
- * Alternate syntax:
- * lvconvert --cache LV
- */
-static int _convert_raid_cache(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* lvconvert --type cache includes an implicit conversion of the cachepool arg to type cache-pool. */
- if (!_lvconvert_pool(cmd, lv, lp)) {
- log_error("Implicit conversion of --cachepool arg to type cache-pool failed.");
- return 0;
- }
-
- return _lvconvert_cache(cmd, lv, lp);
-}
-
-/*
- * Convert a raid* LV to a thin-pool LV.
- * lvconvert --type thin-pool LV
- *
- * Alternate syntax:
- * This is equivalent to above, but not preferred because it's ambiguous and inconsistent.
- * lvconvert --thinpool LV
- */
-static int _convert_raid_thin_pool(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_pool(cmd, lv, lp);
-}
-
-/*
- * Convert a raid* LV to cache-pool LV.
- * lvconvert --type cache-pool LV
- */
-static int _convert_raid_cache_pool(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_pool(cmd, lv, lp);
-}
-
-/*
- * Convert a raid* LV to use a different raid level.
- * lvconvert --type raid* LV
- */
-static int _convert_raid_raid(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_raid(lv, lp);
-}
-
-/*
- * Convert a raid* LV to a mirror LV.
- * lvconvert --type mirror LV
- */
-static int _convert_raid_mirror(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_raid(lv, lp);
-}
-
-/*
- * Convert a raid* LV to a striped LV.
- * lvconvert --type striped LV
- */
-static int _convert_raid_striped(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_raid(lv, lp);
-}
-
-/*
- * Convert a raid* LV to a linear LV.
- * lvconvert --type linear LV
- */
-static int _convert_raid_linear(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_raid(lv, lp);
-}
-
-/*
- * Merge a striped/linear LV into a raid1 LV if the striped/linear LV was
- * previously split from the raid1 LV using --trackchanges.
- * lvconvert --merge LV
- */
-static int _convert_striped_merge(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_raid(lv, lp);
-}
-
-/*
- * Combine a linear/striped LV with a snapshot LV that was previously
- * split from the linear/striped LV using --splitsnapshot.
- * lvconvert --type snapshot LV SnapshotLV
- *
- * Alternate syntax:
- * lvconvert --snapshot LV SnapshotLV
- */
-static int _convert_striped_snapshot(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_snapshot(cmd, lv, lp->origin_name);
-}
-
-/*
- * Convert a striped/linear LV to a thin LV with an external origin.
- * lvconvert --type thin LV
- *
- * Required options:
- * --thinpool LV
- *
- * Auxiliary operation:
- * Converts the --thinpool arg to a thin pool if it is not already.
- *
- * Alternate syntax:
- * lvconvert --thin LV
- */
-static int _convert_striped_thin(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* lvconvert --thin includes an implicit conversion of the thinpool arg to type thin-pool. */
- if (!_lvconvert_pool(cmd, lv, lp)) {
- log_error("Conversion of --thinpool arg to type thin-pool failed.");
- return 0;
- }
-
- return _lvconvert_thin(cmd, lv, lp);
-}
-
-/*
- * Convert a striped/linear LV to a cache LV.
- * lvconvert --type cache LV
- *
- * Required options:
- * --cachepool LV
- *
- * Auxiliary operation:
- * Converts the --cachepool arg to a cache pool if it is not already.
- *
- * Alternate syntax:
- * lvconvert --cache LV
- */
-
-static int _convert_striped_cache(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* lvconvert --cache includes an implicit conversion of the cachepool arg to type cache-pool. */
- if (!_lvconvert_pool(cmd, lv, lp)) {
- log_error("Conversion of --cachepool arg to type cache-pool failed.");
- return 0;
- }
-
- return _lvconvert_cache(cmd, lv, lp);
-}
-
-/*
- * Convert a striped/linear LV to a thin-pool LV.
- * lvconvert --type thin-pool LV
- *
- * Alternate syntax:
- * This is equivalent to above, but not preferred because it's ambiguous and inconsistent.
- * lvconvert --thinpool LV
- */
-static int _convert_striped_thin_pool(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_pool(cmd, lv, lp);
-}
-
-/*
- * Convert a striped/linear LV to a cache-pool LV.
- * lvconvert --type cache-pool LV
- */
-static int _convert_striped_cache_pool(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_pool(cmd, lv, lp);
-}
-
-/*
- * Convert a striped/linear LV to a mirror LV.
- * lvconvert --type mirror LV
- *
- * Required options:
- * --mirrors Number
- *
- * Alternate syntax:
- * This is equivalent to above when global/mirror_segtype_default="mirror".
- * lvconvert --mirrors Number LV
- */
-static int _convert_striped_mirror(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_mirrors(cmd, lv, lp);
-}
-
-/*
- * Convert a striped/linear LV to a raid* LV.
- * lvconvert --type raid* LV
- *
- * Required options:
- * --mirrors Number
- *
- * Alternate syntax:
- * This is equivalent to above when global/mirror_segtype_default="raid1".
- * lvconvert --mirrors Number LV
- */
-static int _convert_striped_raid(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_raid(lv, lp);
-}
-
-/*
- * Functions called to perform all valid operations on a given LV type.
- *
- * _convert_<lvtype>
- */
-static int _convert_cow_snapshot(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- if (lp->splitsnapshot)
- return _convert_cow_snapshot_splitsnapshot(cmd, lv, lp);
-
- /* FIXME: add --merge-snapshot to make this distinct from --merge-mirror. */
- if (lp->merge)
- return _convert_cow_snapshot_merge(cmd, lv, lp);
-
- log_error("Operation not permitted on COW snapshot LV %s.", display_lvname(lv));
- log_error("Operations permitted on a COW snapshot LV are:\n"
- " --splitsnapshot\n"
- " --merge\n");
- return 0;
-}
-
-static int _convert_thin_volume(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* FIXME: add --merge-snapshot to make this distinct from --merge-mirror. */
- if (lp->merge)
- return _convert_thin_volume_merge(cmd, lv, lp);
-
- log_error("Operation not permitted on thin LV %s.", display_lvname(lv));
- log_error("Operations permitted on a thin LV are:\n"
- " --merge\n");
- return 0;
-}
-
-static int _convert_thin_pool(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- if (lp->splitcache)
- return _convert_thin_pool_splitcache(cmd, lv, lp);
-
- if (lp->split)
- return _convert_thin_pool_splitcache(cmd, lv, lp);
-
- if (lp->uncache)
- return _convert_thin_pool_uncache(cmd, lv, lp);
-
- if (lp->cache)
- return _convert_thin_pool_cache(cmd, lv, lp);
-
- /* FIXME: swapping the thin pool metadata LV needs a specific option like --swapmetadata */
- if (arg_is_set(cmd, poolmetadata_ARG))
- return _convert_thin_pool_swapmetadata(cmd, lv, lp);
-
- /* FIXME: add --swapmetadata to list of permitted operations. */
-
- log_error("Operation not permitted on thin pool LV %s.", display_lvname(lv));
- log_error("Operations permitted on a thin pool LV are:\n"
- " --splitcache (operates on cache sub LV)\n"
- " --uncache (operates on cache sub LV)\n"
- " --type cache (operates on data sub LV)\n"
- " --repair\n");
- return 0;
-}
-
-static int _convert_cache_volume(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- if (lp->splitcache)
- return _convert_cache_volume_splitcache(cmd, lv, lp);
-
- if (lp->split)
- return _convert_cache_volume_splitcache(cmd, lv, lp);
-
- if (lp->uncache)
- return _convert_cache_volume_uncache(cmd, lv, lp);
-
- if (arg_is_set(cmd, splitmirrors_ARG))
- return _convert_cache_volume_splitmirrors(cmd, lv, lp);
-
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_THIN_POOL) ||
- arg_is_set(cmd, thinpool_ARG))
- return _convert_cache_volume_thin_pool(cmd, lv, lp);
-
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_SNAPSHOT) ||
- arg_is_set(cmd, snapshot_ARG))
- return _convert_cache_volume_snapshot(cmd, lv, lp);
-
- /* The --thinpool alternative for --type thin-pool is not preferred, so not shown. */
-
- log_error("Operation not permitted on cache LV %s.", display_lvname(lv));
- log_error("Operations permitted on a cache LV are:\n"
- " --splitcache\n"
- " --uncache\n"
- " --splitmirrors (operates on mirror or raid sub LV)\n"
- " --type thin-pool\n");
- return 0;
-}
-
-static int _convert_cache_pool(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- if (lp->splitcache)
- return _convert_cache_pool_splitcache(cmd, lv, lp);
-
- if (lp->split)
- return _convert_cache_pool_splitcache(cmd, lv, lp);
+ }
+ }
- /* FIXME: swapping the cache pool metadata LV needs a specific option like --swapmetadata */
- if (arg_is_set(cmd, poolmetadata_ARG))
- return _convert_cache_pool_swapmetadata(cmd, lv, lp);
+ /*
+ * Apply settings to the new pool seg, from command line, from
+ * defaults, sometimes adjusted.
+ */
- /* FIXME: add --swapmetadata to list of permitted operations. */
+ seg->transaction_id = 0;
+ seg->chunk_size = chunk_size;
- log_error("Operation not permitted on cache pool LV %s.", display_lvname(lv));
- log_error("Operations permitted on a cache pool LV are:\n"
- " --splitcache (operates on cache LV)\n");
- return 0;
-}
+ if (to_cachepool) {
+ cache_mode_t cache_mode = 0;
+ const char *policy_name = NULL;
+ struct dm_config_tree *policy_settings = NULL;
-static int _convert_mirror(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- if (arg_is_set(cmd, mirrors_ARG))
- return _convert_mirror_number(cmd, lv, lp);
+ if (!get_cache_params(cmd, &cache_mode, &policy_name, &policy_settings))
+ return_0;
- if (arg_is_set(cmd, splitmirrors_ARG))
- return _convert_mirror_splitmirrors(cmd, lv, lp);
+ if (cache_mode &&
+ !cache_set_cache_mode(seg, cache_mode))
+ return_0;
- if (arg_is_set(cmd, mirrorlog_ARG) || arg_is_set(cmd, corelog_ARG))
- return _convert_mirror_log(cmd, lv, lp);
+ if ((policy_name || policy_settings) &&
+ !cache_set_policy(seg, policy_name, policy_settings))
+ return_0;
- if (_linear_type_requested(lp->type_str))
- return _convert_mirror_linear(cmd, lv, lp);
+ if (policy_settings)
+ dm_config_destroy(policy_settings);
+ } else {
+ const char *discards_name;
- if (segtype_is_raid(lp->segtype))
- return _convert_mirror_raid(cmd, lv, lp);
+ if (arg_is_set(cmd, zero_ARG))
+ seg->zero_new_blocks = arg_int_value(cmd, zero_ARG, 0);
+ else
+ seg->zero_new_blocks = find_config_tree_bool(cmd, allocation_thin_pool_zero_CFG, vg->profile);
- log_error("Unknown operation on mirror LV %s.", display_lvname(lv));
- return 0;
-}
+ if (arg_is_set(cmd, discards_ARG))
+ seg->discards = (thin_discards_t) arg_uint_value(cmd, discards_ARG, THIN_DISCARDS_PASSDOWN);
+ else {
+ if (!(discards_name = find_config_tree_str(cmd, allocation_thin_pool_discards_CFG, vg->profile)))
+ return_0;
+ if (!set_pool_discards(&seg->discards, discards_name))
+ return_0;
+ }
+ }
-static int _convert_raid(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- if (arg_is_set(cmd, mirrors_ARG))
- return _convert_raid_number(cmd, lv, lp);
+ /*
+ * Rename deactivated metadata LV to have _tmeta suffix.
+ * Implicit checks if metadata_lv is visible.
+ */
+ if (pool_metadata_name &&
+ !lv_rename_update(cmd, metadata_lv, meta_name, 0))
+ return_0;
- if (arg_is_set(cmd, splitmirrors_ARG))
- return _convert_raid_splitmirrors(cmd, lv, lp);
+ if (!attach_pool_metadata_lv(seg, metadata_lv))
+ return_0;
- if (segtype_is_raid(lp->segtype))
- return _convert_raid_raid(cmd, lv, lp);
+ if (!handle_pool_metadata_spare(vg,
+ metadata_lv->le_count,
+ use_pvh,
+ arg_int_value(cmd, poolmetadataspare_ARG, DEFAULT_POOL_METADATA_SPARE)))
+ return_0;
- if (segtype_is_mirror(lp->segtype))
- return _convert_raid_mirror(cmd, lv, lp);
+ if (!vg_write(vg) || !vg_commit(vg))
+ return_0;
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_STRIPED))
- return _convert_raid_striped(cmd, lv, lp);
+ if (seg->zero_new_blocks &&
+ seg->chunk_size >= DEFAULT_THIN_POOL_CHUNK_SIZE_PERFORMANCE * 2)
+ log_warn("WARNING: Pool zeroing and large %s chunk size slows down provisioning.",
+ display_size(cmd, seg->chunk_size));
- if (_linear_type_requested(lp->type_str))
- return _convert_raid_linear(cmd, lv, lp);
+ if (activate_pool && !lockd_lv(cmd, pool_lv, "ex", LDLV_PERSISTENT)) {
+ log_error("Failed to lock pool LV %s.", display_lvname(pool_lv));
+ goto out;
+ }
- log_error("Unknown operation on raid LV %s.", display_lvname(lv));
- return 0;
-}
+ if (activate_pool &&
+ !activate_lv_excl(cmd, pool_lv)) {
+ log_error("Failed to activate pool logical volume %s.",
+ display_lvname(pool_lv));
+ /* Deactivate subvolumes */
+ if (!deactivate_lv(cmd, seg_lv(seg, 0)))
+ log_error("Failed to deactivate pool data logical volume %s.",
+ display_lvname(seg_lv(seg, 0)));
+ if (!deactivate_lv(cmd, seg->metadata_lv))
+ log_error("Failed to deactivate pool metadata logical volume %s.",
+ display_lvname(seg->metadata_lv));
+ goto out;
+ }
-static int _convert_striped(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- const char *mirrors_type = find_config_tree_str(cmd, global_mirror_segtype_default_CFG, NULL);
+ r = 1;
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR))
- return _convert_striped_mirror(cmd, lv, lp);
+out:
+ backup(vg);
- if (segtype_is_raid(lp->segtype))
- return _convert_striped_raid(cmd, lv, lp);
+ if (r)
+ log_print_unless_silent("Converted %s to %s pool.",
+ display_lvname(lv),
+ to_cachepool ? "cache" : "thin");
- /* --mirrors can mean --type mirror or --type raid1 depending on config setting. */
+ /*
+ * Unlock and free the locks from existing LVs that became pool data
+ * and meta LVs.
+ */
+ if (lockd_data_name) {
+ if (!lockd_lv_name(cmd, vg, lockd_data_name, &lockd_data_id, lockd_data_args, "un", LDLV_PERSISTENT))
+ log_error("Failed to unlock pool data LV %s/%s", vg->name, lockd_data_name);
+ lockd_free_lv(cmd, vg, lockd_data_name, &lockd_data_id, lockd_data_args);
+ }
- if (arg_is_set(cmd, mirrors_ARG) && mirrors_type && !strcmp(mirrors_type, SEG_TYPE_NAME_MIRROR))
- return _convert_striped_mirror(cmd, lv, lp);
+ if (lockd_meta_name) {
+ if (!lockd_lv_name(cmd, vg, lockd_meta_name, &lockd_meta_id, lockd_meta_args, "un", LDLV_PERSISTENT))
+ log_error("Failed to unlock pool metadata LV %s/%s", vg->name, lockd_meta_name);
+ lockd_free_lv(cmd, vg, lockd_meta_name, &lockd_meta_id, lockd_meta_args);
+ }
- if (arg_is_set(cmd, mirrors_ARG) && mirrors_type && !strcmp(mirrors_type, SEG_TYPE_NAME_RAID1))
- return _convert_striped_raid(cmd, lv, lp);
+ return r;
+#if 0
+revert_new_lv:
+ /* TBD */
+ if (!pool_metadata_lv_name) {
+ if (!deactivate_lv(cmd, metadata_lv)) {
+ log_error("Failed to deactivate metadata lv.");
+ return 0;
+ }
+ if (!lv_remove(metadata_lv) || !vg_write(vg) || !vg_commit(vg))
+ log_error("Manual intervention may be required to remove "
+ "abandoned LV(s) before retrying.");
+ else
+ backup(vg);
+ }
- log_error("Unknown operation on striped or linear LV %s.", display_lvname(lv));
return 0;
+#endif
}
-/*
- * Main entry point.
- * lvconvert performs a specific <operation> on a specific <lv_type>.
- *
- * The <operation> is specified by command line args.
- * The <lv_type> is found using lv_is_foo(lv) functions.
- *
- * for each lvtype,
- * _convert_lvtype();
- * for each arg_is_set(operation)
- * _convert_lvtype_operation();
- *
- * FIXME: this code (identifying/routing each unique operation through
- * _convert_lvtype_op) was designed to work based on the new type that
- * the user entered after --type, not the final segment type in lp->type_str.
- * Sometimes the two differ because tricks are played with lp->type_str.
- * So, when the use of arg_type_str(type_ARG) here was replaced with
- * lp->type_str, some commands are no longer identified/routed correctly.
- */
-static int _lvconvert(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
+static int _lvconvert_to_cache_vol(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct logical_volume *cachepool_lv)
{
- struct lv_segment *seg = first_seg(lv);
- int ret = 0;
+ struct logical_volume *cache_lv;
+ cache_mode_t cache_mode = 0;
+ const char *policy_name = NULL;
+ struct dm_config_tree *policy_settings = NULL;
- /* Set up segtype either from type_str or else to match the existing one. */
- if (!*lp->type_str)
- lp->segtype = seg->segtype;
- else if (!(lp->segtype = get_segtype_from_string(cmd, lp->type_str)))
- goto_out;
+ if (!validate_lv_cache_create_pool(cachepool_lv))
+ return_0;
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR)) {
- if (!lp->mirrors_supplied && !seg_is_raid1(seg)) {
- log_error("Conversions to --type mirror require -m/--mirrors");
- goto out;
- }
- }
+ if (!get_cache_params(cmd, &cache_mode, &policy_name, &policy_settings))
+ return_0;
- /* lv->segtype can't be NULL */
- if (activation() && lp->segtype->ops->target_present &&
- !lp->segtype->ops->target_present(cmd, NULL, &lp->target_attr)) {
- log_error("%s: Required device-mapper target(s) not "
- "detected in your kernel.", lp->segtype->name);
- goto out;
- }
+ if (!archive(lv->vg))
+ return_0;
- /* Process striping parameters */
- /* FIXME This is incomplete */
- if (_mirror_or_raid_type_requested(cmd, lp->type_str) || _raid0_type_requested(lp->type_str) ||
- _striped_type_requested(lp->type_str) || lp->mirrorlog || lp->corelog) {
- /* FIXME Handle +/- adjustments too? */
- if (!get_stripe_params(cmd, lp->segtype, &lp->stripes, &lp->stripe_size, &lp->stripes_supplied, &lp->stripe_size_supplied))
- goto_out;
+ if (!(cache_lv = lv_cache_create(cachepool_lv, lv)))
+ return_0;
- if (_raid0_type_requested(lp->type_str) || _striped_type_requested(lp->type_str))
- /* FIXME Shouldn't need to override get_stripe_params which defaults to 1 stripe (i.e. linear)! */
- /* The default keeps existing number of stripes, handled inside the library code */
- if (!arg_is_set(cmd, stripes_long_ARG))
- lp->stripes = 0;
- }
+ if (!cache_set_cache_mode(first_seg(cache_lv), cache_mode))
+ return_0;
- if (lv_is_cache(lv))
- lv = seg_lv(first_seg(lv), 0);
+ if (!cache_set_policy(first_seg(cache_lv), policy_name, policy_settings))
+ return_0;
- if (lv_is_mirror(lv)) {
- ret = _convert_mirror(cmd, lv, lp);
- goto out;
- }
+ if (policy_settings)
+ dm_config_destroy(policy_settings);
- if (lv_is_raid(lv)) {
- ret = _convert_raid(cmd, lv, lp);
- goto out;
- }
+ cache_check_for_warns(first_seg(cache_lv));
- /*
- * FIXME: add lv_is_striped() and lv_is_linear()?
- * This does not include raid0 which is caught by the test above.
- * If operations differ between striped and linear, split this case.
- */
- if (segtype_is_striped(seg->segtype) || segtype_is_linear(seg->segtype)) {
- ret = _convert_striped(cmd, lv, lp);
- goto out;
- }
+ if (!lv_update_and_reload(cache_lv))
+ return_0;
- /*
- * The intention is to explicitly check all cases above and never
- * reach here, but this covers anything that was missed.
- */
- log_error("Cannot convert LV %s.", display_lvname(lv));
+ log_print_unless_silent("Logical volume %s is now cached.",
+ display_lvname(cache_lv));
-out:
- return ret ? ECMD_PROCESSED : ECMD_FAILED;
+ return 1;
}
static struct convert_poll_id_list* _convert_poll_id_list_create(struct cmd_context *cmd,
@@ -4990,11 +3589,6 @@ int lvconvert_replace_pv_cmd(struct cmd_context *cmd, int argc, char **argv)
/*
- * snapshot-related lvconvert utilities
- */
-
-
-/*
* Merge a COW snapshot LV into its origin.
*/
@@ -5661,7 +4255,7 @@ static int _lvconvert_raid_types_single(struct cmd_context *cmd, struct logical_
lp->lv_to_poll = lv;
- ret = _lvconvert(cmd, lv, lp);
+ ret = _lvconvert_raid_types(cmd, lv, lp);
if (ret != ECMD_PROCESSED)
return_ECMD_FAILED;
@@ -5805,8 +4399,8 @@ static int _lvconvert_change_mirrorlog_single(struct cmd_context *cmd, struct lo
lp->pvh = use_pvh;
- /* FIXME: extract the mirrorlog functionality out of _lvconvert()? */
- return _lvconvert(cmd, lv, lp);
+ /* FIXME: extract the mirrorlog functionality out of _lvconvert_raid_types()? */
+ return _lvconvert_raid_types(cmd, lv, lp);
}
int lvconvert_change_mirrorlog_cmd(struct cmd_context * cmd, int argc, char **argv)
@@ -5861,8 +4455,8 @@ static int _lvconvert_split_mirror_images_single(struct cmd_context *cmd, struct
lp->pvh = use_pvh;
- /* FIXME: extract the split functionality out of _lvconvert()? */
- return _lvconvert(cmd, lv, lp);
+ /* FIXME: extract the split functionality out of _lvconvert_raid_types()? */
+ return _lvconvert_raid_types(cmd, lv, lp);
}
int lvconvert_split_mirror_images_cmd(struct cmd_context * cmd, int argc, char **argv)
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=46b2599d5c4e01ee…
Commit: 46b2599d5c4e01eee66be7c45aa6cf36d7cbc50f
Parent: a801b92b2c81213dddccc9f9a09794208f92bfc9
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Dec 19 15:53:21 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvconvert: use command defs for raid/mirror types
All lvconvert functionality has been moved out of the
previous monolithic lvconvert code, except conversions
related to raid/mirror/striped/linear. This switches
that remaining code to be based on command defs, and
standard process_each_lv arg processing. This final
switch results in quite a bit of dead code that is
also removed.
---
tools/command-lines.in | 7 +
tools/lvconvert.c | 1105 ++++++++++++++----------------------------------
tools/lvmcmdline.c | 13 +-
tools/tools.h | 3 +
4 files changed, 327 insertions(+), 801 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index a529685..ebe7006 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -337,24 +337,28 @@ OO: OO_LVCONVERT_RAID, OO_LVCONVERT
OP: PV ...
ID: lvconvert_raid_types
DESC: Convert LV to striped.
+RULE: all not lv_is_locked lv_is_pvmove
lvconvert --type mirror LV
OO: OO_LVCONVERT_RAID, OO_LVCONVERT, --mirrorlog MirrorLog
OP: PV ...
ID: lvconvert_raid_types
DESC: Convert LV to type mirror (also see type raid1).
+RULE: all not lv_is_locked lv_is_pvmove
lvconvert --type raid LV
OO: OO_LVCONVERT_RAID, OO_LVCONVERT
OP: PV ...
ID: lvconvert_raid_types
DESC: Convert LV to raid.
+RULE: all not lv_is_locked lv_is_pvmove
lvconvert --mirrors SNumber LV
OO: OO_LVCONVERT_RAID, OO_LVCONVERT, --mirrorlog MirrorLog
OP: PV ...
ID: lvconvert_raid_types
DESC: Convert LV to raid1 or mirror, or change number of mirror images.
+RULE: all not lv_is_locked lv_is_pvmove
---
@@ -366,12 +370,14 @@ OO: OO_LVCONVERT
OP: PV ...
ID: lvconvert_split_mirror_images
DESC: Split images from a raid1 or mirror LV and use them to create a new LV.
+RULE: all not lv_is_locked lv_is_pvmove
lvconvert --splitmirrors Number --trackchanges LV_raid1_cache
OO: OO_LVCONVERT
OP: PV ...
ID: lvconvert_split_mirror_images
DESC: Split images from a raid1 LV and track changes to origin.
+RULE: all not lv_is_locked lv_is_pvmove
lvconvert --mergemirrors LV_linear_raid|VG|Tag ...
OO: OO_LVCONVERT
@@ -384,6 +390,7 @@ OO: OO_LVCONVERT
OP: PV ...
ID: lvconvert_change_mirrorlog
DESC: Change the type of mirror log used by a mirror LV.
+RULE: all not lv_is_locked lv_is_pvmove
---
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 296d4e2..642d6b7 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -39,40 +39,15 @@
*/
typedef enum {
- /* Merge:
- * If merge_snapshot is also set:
- * merge thin snapshot LV into its origin
- * merge old snapshot COW into its origin
- * or if merge_mirror is also set
- * merge LV previously split from mirror back into mirror
- */
- CONV_MERGE = 1,
-
/* Split:
- * For a snapshot, split it apart into COW and origin for future recombination
- * For a cached LV, split it apart into the cached LV and its pool
* For a mirrored or raid LV, split mirror into two mirrors, optionally tracking
* future changes to the main mirror to allow future recombination.
*/
- CONV_SPLIT = 2,
- CONV_SPLIT_SNAPSHOT = 3,
- CONV_SPLIT_CACHE = 4,
- CONV_SPLIT_MIRRORS = 5,
-
- /* Start to cache an LV */
- CONV_CACHE = 6,
-
- /* Destroy the cache attached to a cached LV */
- CONV_UNCACHE = 7,
-
- /* Reconstruct a snapshot from its origin and COW */
- CONV_SNAPSHOT = 8,
-
- /* Convert normal LV into one in a thin pool */
- CONV_THIN = 11,
+ CONV_SPLIT = 1,
+ CONV_SPLIT_MIRRORS = 2,
/* Every other segment type or mirror log conversion we haven't separated out */
- CONV_OTHER = 12,
+ CONV_OTHER = 3,
} conversion_type_t;
struct lvconvert_params {
@@ -170,165 +145,6 @@ static void _set_conv_type(struct lvconvert_params *lp, int conv_type)
lp->conv_type = conv_type;
}
-static int _lvconvert_validate_names(struct lvconvert_params *lp)
-{
- unsigned i, j;
- const char *names[] = {
- (lp->lv_name == lp->pool_data_name) ? NULL : lp->lv_name, "converted",
- lp->pool_data_name, "pool",
- lp->pool_metadata_name, "pool metadata",
- lp->origin_name, "origin",
- };
-
- for (i = 0; i < DM_ARRAY_SIZE(names); i += 2)
- if (names[i])
- for (j = i + 2; j < DM_ARRAY_SIZE(names); j += 2)
- if (names[j] && !strcmp(names[i], names[j])) {
- log_error("Can't use same name %s for %s and %s volume.",
- names[i], names[i + 1], names[j + 1]);
- return 0;
- }
-
- return 1;
-}
-
-static int _lvconvert_name_params(struct lvconvert_params *lp,
- struct cmd_context *cmd,
- int *pargc, char ***pargv)
-{
- if (lp->merge) {
- /* FIXME Multiple arguments that mix snap and mirror? */
- if (!*pargc) {
- log_error("Please specify a logical volume path.");
- return 0;
- }
-
- if (!strstr((*pargv)[0], "_rimage_")) { /* Snapshot */
- lp->type_str = SEG_TYPE_NAME_SNAPSHOT;
- lp->merge_snapshot = 1;
-
- return 1;
- }
-
- /* Mirror */
- lp->merge_mirror = 1;
- }
-
- if (!*pargc) {
- if (lp->cache) {
- log_error("Logical volume name for caching is missing.");
- return 0;
- }
- if (lp->thin) {
- log_error("Please specify a logical volume to act as "
- "the external origin.");
- return 0;
- }
- if (lp->snapshot) {
- log_error("Please specify a logical volume to act as "
- "the snapshot exception store.");
- return 0;
- }
- if (lp->split) {
- log_error("Logical volume for split is missing.");
- return 0;
- }
- if (lp->splitcache) {
- log_error("Cache logical volume for split is missing.");
- return 0;
- }
- if (lp->uncache) {
- log_error("Cache logical volume for uncache is missing.");
- return 0;
- }
- if (!lp->lv_name_full) {
- log_error("Please provide logical volume path.");
- return 0;
- }
- } else if (!lp->lv_name_full) {
- lp->lv_name_full = (*pargv)[0];
- (*pargv)++, (*pargc)--;
- }
-
- if (!validate_restricted_lvname_param(cmd, &lp->vg_name, &lp->pool_metadata_name))
- return_0;
-
- if (!validate_restricted_lvname_param(cmd, &lp->vg_name, &lp->pool_data_name))
- return_0;
-
- if (!validate_restricted_lvname_param(cmd, &lp->vg_name, &lp->origin_name))
- return_0;
-
- if (!validate_restricted_lvname_param(cmd, &lp->vg_name, &lp->lv_split_name))
- return_0;
-
- if (!lp->vg_name && !strchr(lp->lv_name_full, '/')) {
- /* Check for $LVM_VG_NAME */
- if (!(lp->vg_name = extract_vgname(cmd, NULL))) {
- log_error("Please specify a logical volume path.");
- return 0;
- }
- }
-
- if (!validate_lvname_param(cmd, &lp->vg_name, &lp->lv_name_full))
- return_0;
-
- lp->lv_name = lp->lv_name_full;
-
- if (!validate_name(lp->vg_name)) {
- log_error("Please provide a valid volume group name");
- return 0;
- }
-
- /*
- * FIXME: avoid this distinct validation out of scope of _convert_*()
- *
- * We should not rely on namespace here any more!
- * It is the duty of lvcreate/lvrename to avoid reserved names.
- */
- if (!lp->merge_mirror &&
- !lp->keep_mimages &&
- !strstr(lp->lv_name, "_tdata") &&
- !strstr(lp->lv_name, "_tmeta") &&
- !strstr(lp->lv_name, "_cdata") &&
- !strstr(lp->lv_name, "_cmeta") &&
- !strstr(lp->lv_name, "_corig") &&
- !apply_lvname_restrictions(lp->lv_name))
- return_0;
-
- if (*pargc) {
- if (lp->snapshot) {
- log_error("Too many arguments provided for snapshots.");
- return 0;
- }
- if (lp->splitsnapshot) {
- log_error("Too many arguments provided with --splitsnapshot.");
- return 0;
- }
- if (lp->splitcache) {
- log_error("Too many arguments provided with --splitcache.");
- return 0;
- }
- if (lp->split) {
- log_error("Too many arguments provided with --split.");
- return 0;
- }
- if (lp->uncache) {
- log_error("Too many arguments provided with --uncache.");
- return 0;
- }
- if (lp->pool_data_name && lp->pool_metadata_name) {
- log_error("Too many arguments provided for pool.");
- return 0;
- }
- }
-
- if (!_lvconvert_validate_names(lp))
- return_0;
-
- return 1;
-}
-
/* -s/--snapshot and --type snapshot are synonyms */
static int _snapshot_type_requested(struct cmd_context *cmd, const char *type_str)
{
@@ -379,113 +195,9 @@ static int _read_conversion_type(struct cmd_context *cmd,
return 0;
}
-static int _read_pool_params(struct cmd_context *cmd, int *pargc, char ***pargv,
- struct lvconvert_params *lp)
-{
- int cachepool = 0;
- int thinpool = 0;
- struct segment_type *segtype;
-
- if ((lp->pool_data_name = arg_str_value(cmd, cachepool_ARG, NULL))) {
- if (lp->type_str[0] &&
- strcmp(lp->type_str, SEG_TYPE_NAME_CACHE) &&
- strcmp(lp->type_str, SEG_TYPE_NAME_CACHE_POOL)) {
- log_error("--cachepool argument is only valid with "
- "the cache or cache-pool segment type.");
- return 0;
- }
- cachepool = 1;
- lp->type_str = SEG_TYPE_NAME_CACHE_POOL;
- } else if (!strcmp(lp->type_str, SEG_TYPE_NAME_CACHE_POOL))
- cachepool = 1;
- else if ((lp->pool_data_name = arg_str_value(cmd, thinpool_ARG, NULL))) {
- if (lp->type_str[0] &&
- strcmp(lp->type_str, SEG_TYPE_NAME_THIN) &&
- strcmp(lp->type_str, SEG_TYPE_NAME_THIN_POOL)) {
- log_error("--thinpool argument is only valid with "
- "the thin or thin-pool segment type.");
- return 0;
- }
- thinpool = 1;
- lp->type_str = SEG_TYPE_NAME_THIN_POOL;
- } else if (!strcmp(lp->type_str, SEG_TYPE_NAME_THIN_POOL))
- thinpool = 1;
-
- if (lp->cache && !cachepool) {
- log_error("--cache requires --cachepool.");
- return 0;
- }
-
- if ((lp->cache || cachepool) &&
- !get_cache_params(cmd, &lp->cache_mode, &lp->policy_name, &lp->policy_settings)) {
- log_error("Failed to parse cache policy and/or settings.");
- return 0;
- }
-
- if (thinpool) {
- lp->discards = (thin_discards_t) arg_uint_value(cmd, discards_ARG, THIN_DISCARDS_PASSDOWN);
- lp->origin_name = arg_str_value(cmd, originname_ARG, NULL);
- } else {
- if (arg_from_list_is_set(cmd, "is valid only with thin pools",
- discards_ARG, originname_ARG, thinpool_ARG,
- -1))
- return_0;
- if (lp->thin) {
- log_error("--thin requires --thinpool.");
- return 0;
- }
- }
-
- if (thinpool || cachepool) {
- if (arg_from_list_is_set(cmd, "is invalid with pools",
- merge_ARG, mirrors_ARG, repair_ARG, snapshot_ARG,
- splitmirrors_ARG, splitsnapshot_ARG, -1))
- return_0;
-
- if (!(segtype = get_segtype_from_string(cmd, lp->type_str)))
- return_0;
-
- if (!get_pool_params(cmd, segtype, &lp->passed_args,
- &lp->pool_metadata_size,
- &lp->poolmetadataspare,
- &lp->chunk_size, &lp->discards,
- &lp->zero))
- return_0;
-
- if ((lp->pool_metadata_name = arg_str_value(cmd, poolmetadata_ARG, NULL)) &&
- arg_from_list_is_set(cmd, "is invalid with --poolmetadata",
- stripesize_ARG, stripes_long_ARG,
- readahead_ARG, -1))
- return_0;
-
- if (!lp->pool_data_name) {
- if (!*pargc) {
- log_error("Please specify the pool data LV.");
- return 0;
- }
- lp->pool_data_name = (*pargv)[0];
- (*pargv)++, (*pargc)--;
- }
-
- if (!lp->thin && !lp->cache)
- lp->lv_name_full = lp->pool_data_name;
-
- /* Hmm _read_activation_params */
- lp->read_ahead = arg_uint_value(cmd, readahead_ARG,
- cmd->default_settings.read_ahead);
-
- } else if (arg_from_list_is_set(cmd, "is valid only with pools",
- poolmetadatasize_ARG, poolmetadataspare_ARG,
- zero_ARG,
- -1))
- return_0;
-
- return 1;
-}
-
-static int _read_params(struct cmd_context *cmd, int argc, char **argv,
- struct lvconvert_params *lp)
+static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp)
{
+ const char *vg_name = NULL;
int region_size;
int pagesize = lvm_getpagesize();
@@ -506,16 +218,7 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
lp->mirrorlog = 1;
}
- if (arg_is_set(cmd, merge_ARG)) {
- if (arg_outside_list_is_set(cmd, "cannot be used with --merge",
- merge_ARG,
- background_ARG, interval_ARG,
- force_ARG, noudevsync_ARG, test_ARG,
- -1))
- return_0;
- lp->merge = 1;
- _set_conv_type(lp, CONV_MERGE);
- } else if (arg_is_set(cmd, split_ARG)) {
+ if (arg_is_set(cmd, split_ARG)) {
if (arg_outside_list_is_set(cmd, "cannot be used with --split",
split_ARG,
name_ARG,
@@ -524,79 +227,17 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
return_0;
lp->split = 1;
_set_conv_type(lp, CONV_SPLIT);
- } else if (arg_is_set(cmd, splitcache_ARG)) {
- if (arg_outside_list_is_set(cmd, "cannot be used with --splitcache",
- splitcache_ARG,
- force_ARG, noudevsync_ARG, test_ARG,
- -1))
- return_0;
- lp->splitcache = 1;
- _set_conv_type(lp, CONV_SPLIT_CACHE);
- } else if (arg_is_set(cmd, splitsnapshot_ARG)) {
- if (arg_outside_list_is_set(cmd, "cannot be used with --splitsnapshot",
- splitsnapshot_ARG,
- force_ARG, noudevsync_ARG, test_ARG,
- -1))
- return_0;
- lp->splitsnapshot = 1;
- _set_conv_type(lp, CONV_SPLIT_SNAPSHOT);
- } else if (arg_is_set(cmd, uncache_ARG)) {
- if (arg_outside_list_is_set(cmd, "cannot be used with --uncache",
- uncache_ARG,
- force_ARG, noudevsync_ARG, test_ARG,
- -1))
- return_0;
- lp->uncache = 1;
- _set_conv_type(lp, CONV_UNCACHE);
- }
-
- if (arg_is_set(cmd, cache_ARG)) {
- lp->cache = 1;
- _set_conv_type(lp, CONV_CACHE);
- }
-
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_CACHE))
- lp->cache = 1;
- else if (lp->cache) {
- if (lp->type_str[0]) {
- log_error("--cache is incompatible with --type %s", lp->type_str);
- return 0;
- }
- lp->type_str = SEG_TYPE_NAME_CACHE;
- }
-
- if (arg_is_set(cmd, thin_ARG)) {
- lp->thin = 1;
- _set_conv_type(lp, CONV_THIN);
- }
-
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_THIN))
- lp->thin = 1;
- else if (lp->thin) {
- if (lp->type_str[0]) {
- log_error("--thin is incompatible with --type %s", lp->type_str);
- return 0;
- }
- lp->type_str = SEG_TYPE_NAME_THIN;
}
-
+
if (arg_is_set(cmd, trackchanges_ARG))
lp->track_changes = 1;
- if (!_read_pool_params(cmd, &argc, &argv, lp))
- return_0;
-
- if (_snapshot_type_requested(cmd, lp->type_str)) {
- if (lp->merge) {
- log_error("--snapshot and --merge are mutually exclusive.");
- return 0;
+ if (lp->split) {
+ if ((lp->lv_split_name = arg_str_value(cmd, name_ARG, NULL))) {
+ if (!validate_restricted_lvname_param(cmd, &vg_name, &lp->lv_split_name))
+ return_0;
}
- lp->snapshot = 1;
- _set_conv_type(lp, CONV_SNAPSHOT);
- }
- if (lp->split) {
- lp->lv_split_name = arg_str_value(cmd, name_ARG, NULL);
/*
* The '--splitmirrors n' argument is equivalent to '--mirrors -n'
@@ -616,7 +257,11 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
return 0;
}
- lp->lv_split_name = arg_str_value(cmd, name_ARG, NULL);
+ if ((lp->lv_split_name = arg_str_value(cmd, name_ARG, NULL))) {
+ if (!validate_restricted_lvname_param(cmd, &vg_name, &lp->lv_split_name))
+ return_0;
+ }
+
lp->keep_mimages = 1;
_set_conv_type(lp, CONV_SPLIT_MIRRORS);
lp->mirrors = arg_uint_value(cmd, splitmirrors_ARG, 0);
@@ -633,22 +278,11 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
}
/* If no other case was identified, then use of --stripes means --type striped */
- if (!arg_is_set(cmd, type_ARG) && !*lp->type_str && !lp->merge && !lp->splitsnapshot &&
- !lp->splitcache && !lp->split && !lp->snapshot && !lp->uncache && !lp->cache && !lp->thin &&
- !lp->mirrorlog && !lp->corelog &&
+ if (!arg_is_set(cmd, type_ARG) && !*lp->type_str &&
+ !lp->split && !lp->mirrorlog && !lp->corelog &&
(arg_is_set(cmd, stripes_long_ARG) || arg_is_set(cmd, stripesize_ARG)))
lp->type_str = SEG_TYPE_NAME_STRIPED;
- if ((_snapshot_type_requested(cmd, lp->type_str) || lp->merge) &&
- (lp->mirrorlog || _mirror_or_raid_type_requested(cmd, lp->type_str) ||
- arg_is_set(cmd, thinpool_ARG) || _raid0_type_requested(lp->type_str) ||
- _striped_type_requested(lp->type_str))) {
- log_error("--snapshot/--type snapshot or --merge argument "
- "cannot be mixed with --mirrors/--type mirror/--type raid*/--stripes/--type striped/--type linear, "
- "--mirrorlog, --repair or --thinpool.");
- return 0;
- }
-
if ((arg_is_set(cmd, stripes_long_ARG) || arg_is_set(cmd, stripesize_ARG)) &&
!(_mirror_or_raid_type_requested(cmd, lp->type_str) || _striped_type_requested(lp->type_str) ||
_raid0_type_requested(lp->type_str) || arg_is_set(cmd, thinpool_ARG))) {
@@ -667,72 +301,22 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
lp->alloc = (alloc_policy_t) arg_uint_value(cmd, alloc_ARG, ALLOC_INHERIT);
/* We should have caught all these cases already. */
- if (lp->merge + lp->splitsnapshot + lp->splitcache + lp->split + lp->uncache +
- lp->cache + lp->thin + lp->keep_mimages + lp->snapshot > 1) {
+ if (lp->split + lp->keep_mimages > 1) {
log_error(INTERNAL_ERROR "Unexpected combination of incompatible options selected.");
return 0;
}
-
/*
* Final checking of each case:
- * lp->merge
- * lp->splitsnapshot
- * lp->splitcache
* lp->split
- * lp->uncache
- * lp->cache
- * lp->thin
* lp->keep_mimages
- * lp->snapshot
* --type mirror|raid lp->mirrorlog lp->corelog
* --type raid0|striped
*/
switch(lp->conv_type) {
- case CONV_MERGE: /* Snapshot or mirror merge */
case CONV_SPLIT:
- case CONV_SPLIT_CACHE:
case CONV_SPLIT_MIRRORS:
- case CONV_SPLIT_SNAPSHOT: /* Destroy snapshot retaining cow as separate LV */
- case CONV_CACHE:
- case CONV_UNCACHE:
- case CONV_THIN:
break;
- case CONV_SNAPSHOT: /* Snapshot creation from pre-existing cow */
- if (!argc) {
- log_error("Please provide logical volume path for snapshot origin.");
- return 0;
- }
- lp->origin_name = argv[0];
- argv++, argc--;
-
- if (arg_is_set(cmd, regionsize_ARG)) {
- log_error("--regionsize is only available with mirrors");
- return 0;
- }
-
- if (arg_is_set(cmd, stripesize_ARG) || arg_is_set(cmd, stripes_long_ARG)) {
- log_error("--stripes and --stripesize are only available with striped mirrors");
- return 0;
- }
-
- if (arg_is_set(cmd, chunksize_ARG) &&
- (arg_sign_value(cmd, chunksize_ARG, SIGN_NONE) == SIGN_MINUS)) {
- log_error("Negative chunk size is invalid.");
- return 0;
- }
-
- lp->chunk_size = arg_uint_value(cmd, chunksize_ARG, 8);
- if (lp->chunk_size < 8 || lp->chunk_size > 1024 ||
- !is_power_of_2(lp->chunk_size)) {
- log_error("Chunk size must be a power of 2 in the "
- "range 4K to 512K");
- return 0;
- }
- log_verbose("Setting chunk size to %s.", display_size(cmd, lp->chunk_size));
-
- lp->type_str = SEG_TYPE_NAME_SNAPSHOT;
- break;
case CONV_OTHER:
if (_mirror_or_raid_type_requested(cmd, lp->type_str) ||
@@ -803,15 +387,10 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
lp->force = arg_count(cmd, force_ARG);
lp->yes = arg_count(cmd, yes_ARG);
- if (!_lvconvert_name_params(lp, cmd, &argc, &argv))
- return_0;
-
- lp->pv_count = argc;
- lp->pvs = argv;
-
return 1;
}
+
static struct poll_functions _lvconvert_mirror_fns = {
.poll_progress = poll_mirror_progress,
.finish_copy = lvconvert_mirror_finish,
@@ -1256,22 +835,6 @@ static int _lvconvert_mirrors_parse_params(struct cmd_context *cmd,
}
/*
- * Collapsing a stack of mirrors:
- *
- * If called with no argument, try collapsing the resync layers
- */
- if (!lp->mirrors_supplied && !lp->mirrorlog &&
- !lp->corelog && !arg_is_set(cmd, regionsize_ARG) &&
- !lp->keep_mimages) {
- *new_mimage_count = *old_mimage_count;
- *new_log_count = *old_log_count;
-
- if (find_temporary_mirror(lv) || lv_is_converting(lv))
- lp->need_polling = 1;
- return 1;
- }
-
- /*
* Adjusting mimage count?
*/
if (!lp->mirrors_supplied && !lp->keep_mimages)
@@ -4431,7 +3994,7 @@ static int _convert_cache_volume_thin_pool(struct cmd_context *cmd, struct logic
static int _convert_cache_volume_snapshot(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
- return _lvconvert_snapshot(cmd, lv, lp);
+ return _lvconvert_snapshot(cmd, lv, lp->origin_name);
}
/*
@@ -4969,79 +4532,21 @@ static int _convert_mirror(struct cmd_context *cmd, struct logical_volume *lv,
if (segtype_is_raid(lp->segtype))
return _convert_mirror_raid(cmd, lv, lp);
- /*
- * FIXME: this is here to preserve old behavior, but an
- * explicit option should be added to enable this case,
- * rather than making it the result of an ambiguous
- * "lvconvert vg/lv" command.
- * Add 'lvconvert --poll-mirror vg/lv' for this case.
- *
- * Old behavior was described as:
- * "Collapsing a stack of mirrors.
- * If called with no argument, try collapsing the resync layers"
- */
- log_debug("Checking if LV %s is converting.", display_lvname(lv));
- if (lv_is_converting(lv)) {
- lp->need_polling = 1;
- return 1;
- }
-
- log_error("Operation not permitted on mirror LV %s.", display_lvname(lv));
- log_error("Operations permitted on a mirror LV are:\n"
- " --mirrors\n"
- " --splitmirrors\n"
- " --mirrorlog\n"
- " --repair\n"
- " --type linear\n"
- " --type raid*\n");
-
+ log_error("Unknown operation on mirror LV %s.", display_lvname(lv));
return 0;
}
static int _convert_raid(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
- /* Permitted convert options on visible or hidden RaidLVs */
- /* The --thinpool alternative for --type thin-pool is not preferred, so not shown. */
- const char *permitted_options = lv_is_visible(lv) ?
- " --mirrors\n"
- " --splitmirrors\n"
- " --merge\n"
- " --repair\n"
- " --replace\n"
- " --type snapshot\n"
- " --type thin\n"
- " --type cache\n"
- " --type thin-pool\n"
- " --type cache-pool\n"
- " --type raid*\n"
- " --type mirror\n"
- " --type striped\n"
- " --type linear\n"
- :
- " --mirrors\n"
- " --splitmirrors\n"
- " --repair\n"
- " --replace\n"
- " --type raid*\n"
- " --type mirror\n"
- " --type striped\n"
- " --type linear\n";
-
- /* Applicable to any hidden _or_ visible LVs. */
if (arg_is_set(cmd, mirrors_ARG))
return _convert_raid_number(cmd, lv, lp);
if (arg_is_set(cmd, splitmirrors_ARG))
return _convert_raid_splitmirrors(cmd, lv, lp);
- if (segtype_is_raid(lp->segtype)) {
- /* Only --type allowed on hidden RaidLV. */
- if (!lv_is_visible(lv) && !arg_is_set(cmd, type_ARG))
- goto out;
-
+ if (segtype_is_raid(lp->segtype))
return _convert_raid_raid(cmd, lv, lp);
- }
if (segtype_is_mirror(lp->segtype))
return _convert_raid_mirror(cmd, lv, lp);
@@ -5052,33 +4557,7 @@ static int _convert_raid(struct cmd_context *cmd, struct logical_volume *lv,
if (_linear_type_requested(lp->type_str))
return _convert_raid_linear(cmd, lv, lp);
- /* Applicable to visible LVs only. */
- if (lv_is_visible(lv)) {
- if (lp->merge)
- return _convert_raid_merge(cmd, lv, lp);
-
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_SNAPSHOT) || arg_is_set(cmd, snapshot_ARG))
- return _convert_raid_snapshot(cmd, lv, lp);
-
- if (lp->thin)
- return _convert_raid_thin(cmd, lv, lp);
-
- if (lp->cache)
- return _convert_raid_cache(cmd, lv, lp);
-
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_THIN_POOL) ||
- arg_is_set(cmd, thinpool_ARG))
- return _convert_raid_thin_pool(cmd, lv, lp);
-
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_CACHE_POOL) ||
- arg_is_set(cmd, cachepool_ARG))
- return _convert_raid_cache_pool(cmd, lv, lp);
- }
-
-out:
- log_error("Operation not permitted on raid LV %s.", display_lvname(lv));
- log_error("Operations permitted on a raid LV are:\n%s", permitted_options);
-
+ log_error("Unknown operation on raid LV %s.", display_lvname(lv));
return 0;
}
@@ -5087,27 +4566,6 @@ static int _convert_striped(struct cmd_context *cmd, struct logical_volume *lv,
{
const char *mirrors_type = find_config_tree_str(cmd, global_mirror_segtype_default_CFG, NULL);
- /* FIXME: add --merge-mirror to make this distinct from --merge-snapshot. */
- if (lp->merge)
- return _convert_striped_merge(cmd, lv, lp);
-
- if (lp->snapshot || !strcmp(lp->type_str, SEG_TYPE_NAME_SNAPSHOT))
- return _convert_striped_snapshot(cmd, lv, lp);
-
- if (lp->thin)
- return _convert_striped_thin(cmd, lv, lp);
-
- if (lp->cache)
- return _convert_striped_cache(cmd, lv, lp);
-
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_THIN_POOL) ||
- arg_is_set(cmd, thinpool_ARG))
- return _convert_striped_thin_pool(cmd, lv, lp);
-
- if (!strcmp(lp->type_str, SEG_TYPE_NAME_CACHE_POOL) ||
- arg_is_set(cmd, cachepool_ARG))
- return _convert_striped_cache_pool(cmd, lv, lp);
-
if (!strcmp(lp->type_str, SEG_TYPE_NAME_MIRROR))
return _convert_striped_mirror(cmd, lv, lp);
@@ -5122,19 +4580,7 @@ static int _convert_striped(struct cmd_context *cmd, struct logical_volume *lv,
if (arg_is_set(cmd, mirrors_ARG) && mirrors_type && !strcmp(mirrors_type, SEG_TYPE_NAME_RAID1))
return _convert_striped_raid(cmd, lv, lp);
- /* The --thinpool alternative for --type thin-pool is not preferred, so not shown. */
-
- log_error("Operation not permitted on striped or linear LV %s.", display_lvname(lv));
- log_error("Operations permitted on a striped or linear LV are:\n"
- " --merge\n"
- " --type snapshot\n"
- " --type thin\n"
- " --type cache\n"
- " --type thin-pool\n"
- " --type cache-pool\n"
- " --type mirror\n"
- " --type raid*\n");
-
+ log_error("Unknown operation on striped or linear LV %s.", display_lvname(lv));
return 0;
}
@@ -5163,39 +4609,6 @@ static int _lvconvert(struct cmd_context *cmd, struct logical_volume *lv,
struct lv_segment *seg = first_seg(lv);
int ret = 0;
- /*
- * Check some conditions that can never be processed.
- */
-
- if (lv_is_locked(lv)) {
- log_error("Cannot convert locked LV %s.", display_lvname(lv));
- goto out;
- }
-
- if (lv_is_pvmove(lv)) {
- log_error("Cannot convert pvmove LV %s.", display_lvname(lv));
- goto out;
- }
-
- if (!lv_is_visible(lv)) {
- /*
- * FIXME: there are some exceptions to the rule of only
- * operating on visible LVs. These should be fixed by running
- * the command on the visible LV with an option indicating
- * which sub LV is intended rather than naming the !visible LV.
- */
- if (!lv_is_cache_pool_metadata(lv) &&
- !lv_is_cache_pool_data(lv) &&
- !lv_is_thin_pool_metadata(lv) &&
- !lv_is_thin_pool_data(lv) &&
- !lv_is_used_cache_pool(lv) &&
- !lv_is_mirrored(lv) &&
- !lv_is_raid(lv)) {
- log_error("Cannot convert internal LV %s.", display_lvname(lv));
- goto out;
- }
- }
-
/* Set up segtype either from type_str or else to match the existing one. */
if (!*lp->type_str)
lp->segtype = seg->segtype;
@@ -5232,45 +4645,16 @@ static int _lvconvert(struct cmd_context *cmd, struct logical_volume *lv,
lp->stripes = 0;
}
- if (lp->snapshot)
- lp->zero = (lp->segtype->flags & SEG_CANNOT_BE_ZEROED) ? 0 : arg_int_value(cmd, zero_ARG, 1);
+ if (lv_is_cache(lv))
+ lv = seg_lv(first_seg(lv), 0);
- /*
- * Each LV type that can be converted.
- * (The existing type of the LV, not a requested type.)
- */
- if (lv_is_cow(lv)) {
- ret = _convert_cow_snapshot(cmd, lv, lp);
+ if (lv_is_mirror(lv)) {
+ ret = _convert_mirror(cmd, lv, lp);
goto out;
}
- if (lv_is_thin_volume(lv)) {
- ret = _convert_thin_volume(cmd, lv, lp);
- goto out;
- }
-
- if (lv_is_thin_pool(lv)) {
- ret = _convert_thin_pool(cmd, lv, lp);
- goto out;
- }
-
- if (lv_is_cache(lv)) {
- ret = _convert_cache_volume(cmd, lv, lp);
- goto out;
- }
-
- if (lv_is_cache_pool(lv)) {
- ret = _convert_cache_pool(cmd, lv, lp);
- goto out;
- }
-
- if (lv_is_mirror(lv)) {
- ret = _convert_mirror(cmd, lv, lp);
- goto out;
- }
-
- if (lv_is_raid(lv)) {
- ret = _convert_raid(cmd, lv, lp);
+ if (lv_is_raid(lv)) {
+ ret = _convert_raid(cmd, lv, lp);
goto out;
}
@@ -5315,149 +4699,6 @@ static struct convert_poll_id_list* _convert_poll_id_list_create(struct cmd_cont
return idl;
}
-static int _lvconvert_and_add_to_poll_list(struct cmd_context *cmd,
- struct lvconvert_params *lp,
- struct logical_volume *lv)
-{
- int ret;
- struct lvinfo info;
- struct convert_poll_id_list *idl;
-
- /* _lvconvert() call may alter the reference in lp->lv_to_poll */
- if ((ret = _lvconvert(cmd, lv, lp)) != ECMD_PROCESSED)
- stack;
- else if (lp->need_polling) {
- if (!lv_info(cmd, lp->lv_to_poll, 0, &info, 0, 0) || !info.exists)
- log_print_unless_silent("Conversion starts after activation.");
- else {
- if (!(idl = _convert_poll_id_list_create(cmd, lp->lv_to_poll)))
- return_ECMD_FAILED;
- dm_list_add(&lp->idls, &idl->list);
- }
- }
-
- return ret;
-}
-
-static int _lvconvert_single(struct cmd_context *cmd, struct logical_volume *lv,
- struct processing_handle *handle)
-{
- struct lvconvert_params *lp = (struct lvconvert_params *) handle->custom_handle;
- struct volume_group *vg = lv->vg;
-
- if (test_mode() && is_lockd_type(vg->lock_type)) {
- log_error("Test mode is not yet supported with lock type %s.",
- vg->lock_type);
- return ECMD_FAILED;
- }
-
- /*
- * lp->pvh holds the list of PVs available for allocation or removal
- */
- if (lp->pv_count) {
- if (!(lp->pvh = create_pv_list(cmd->mem, vg, lp->pv_count, lp->pvs, 0)))
- return_ECMD_FAILED;
- } else
- lp->pvh = &vg->pvs;
-
- lp->lv_to_poll = lv;
-
- return _lvconvert_and_add_to_poll_list(cmd, lp, lv);
-}
-
-static int _lvconvert_merge_single(struct cmd_context *cmd, struct logical_volume *lv,
- struct processing_handle *handle)
-{
- struct lvconvert_params *lp = (struct lvconvert_params *) handle->custom_handle;
-
- lp->lv_to_poll = lv;
-
- return _lvconvert_and_add_to_poll_list(cmd, lp, lv);
-}
-
-int lvconvert(struct cmd_context * cmd, int argc, char **argv)
-{
- int poll_ret, ret;
- struct convert_poll_id_list *idl;
- struct lvconvert_params lp = {
- .conv_type = CONV_OTHER,
- .target_attr = ~0,
- .idls = DM_LIST_HEAD_INIT(lp.idls),
- };
- struct processing_handle *handle = init_processing_handle(cmd, NULL);
-
- cmd->command->flags &= ~GET_VGNAME_FROM_OPTIONS;
-
- if (!handle) {
- log_error("Failed to initialize processing handle.");
- return ECMD_FAILED;
- }
-
- handle->custom_handle = &lp;
-
- if (!_read_params(cmd, argc, argv, &lp)) {
- ret = EINVALID_CMD_LINE;
- goto_out;
- }
-
- if (lp.merge) {
- ret = process_each_lv(cmd, argc, argv, NULL, NULL,
- READ_FOR_UPDATE, handle, NULL, &_lvconvert_merge_single);
- } else {
- int saved_ignore_suspended_devices = ignore_suspended_devices();
-
- if (lp.uncache) {
- init_ignore_suspended_devices(1);
- cmd->handles_missing_pvs = 1;
- }
-
- ret = process_each_lv(cmd, 0, NULL, lp.vg_name, lp.lv_name,
- READ_FOR_UPDATE, handle, NULL, &_lvconvert_single);
-
- init_ignore_suspended_devices(saved_ignore_suspended_devices);
- }
-
- dm_list_iterate_items(idl, &lp.idls) {
- poll_ret = _lvconvert_poll_by_id(cmd, idl->id,
- lp.wait_completion ? 0 : 1U,
- idl->is_merging_origin,
- idl->is_merging_origin_thin);
- if (poll_ret > ret)
- ret = poll_ret;
- }
-
-out:
- if (lp.policy_settings)
- dm_config_destroy(lp.policy_settings);
-
- destroy_processing_handle(cmd, handle);
-
- return ret;
-}
-
-/*
- * Below is code that has transitioned to using command defs.
- * ----------------------------------------------------------
- *
- * This code does not use read_params (or any other param reading
- * functions associated with it), or the lp struct. Those have
- * been primary vehicles for entangling all the lvconvert operations,
- * so avoiding them is important for untangling. They were also
- * heavily used for trying to figure out what the lvconvert operation
- * was meant to be doing, and that is no longer needed since the
- * command def provides it.
- *
- * All input data is already available from cmd->arg_values and
- * cmd->position_argv (the --option args in the former, the position
- * args in the later.) There is no need to copy these values into
- * another redundant struct of input values which just obfuscates.
- *
- * The new lvconvert_result struct, passed via custom_handle, is
- * used for *returning* data from processing, not for passing data
- * into processing.
- */
-
-
/*
* Data/results accumulated during processing.
*/
@@ -6399,9 +5640,274 @@ int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv
NULL, NULL, &_lvconvert_split_cachepool_single);
}
+static int _lvconvert_raid_types_single(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct lvconvert_params *lp = (struct lvconvert_params *) handle->custom_handle;
+ struct dm_list *use_pvh;
+ struct convert_poll_id_list *idl;
+ struct lvinfo info;
+ int ret;
+
+ if (cmd->position_argc > 1) {
+ /* First pos arg is required LV, remaining are optional PVs. */
+ if (!(use_pvh = create_pv_list(cmd->mem, lv->vg, cmd->position_argc - 1, cmd->position_argv + 1, 0)))
+ return_ECMD_FAILED;
+ lp->pv_count = cmd->position_argc - 1;
+ } else
+ use_pvh = &lv->vg->pvs;
+
+ lp->pvh = use_pvh;
+
+ lp->lv_to_poll = lv;
+
+ ret = _lvconvert(cmd, lv, lp);
+
+ if (ret != ECMD_PROCESSED)
+ return_ECMD_FAILED;
+
+ if (lp->need_polling) {
+ /* _lvconvert() call may alter the reference in lp->lv_to_poll */
+ if (!lv_info(cmd, lp->lv_to_poll, 0, &info, 0, 0) || !info.exists)
+ log_print_unless_silent("Conversion starts after activation.");
+ else {
+ if (!(idl = _convert_poll_id_list_create(cmd, lp->lv_to_poll)))
+ return_ECMD_FAILED;
+ dm_list_add(&lp->idls, &idl->list);
+ }
+ }
+
+ return ECMD_PROCESSED;
+}
+
+static int _lvconvert_raid_types_check(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg)
+{
+ int lvt_enum = get_lvt_enum(lv);
+ struct lv_types *lvtype = get_lv_type(lvt_enum);
+
+ if (!lv_is_visible(lv)) {
+ if (!lv_is_cache_pool_metadata(lv) &&
+ !lv_is_cache_pool_data(lv) &&
+ !lv_is_thin_pool_metadata(lv) &&
+ !lv_is_thin_pool_data(lv) &&
+ !lv_is_used_cache_pool(lv) &&
+ !lv_is_mirrored(lv) &&
+ !lv_is_raid(lv))
+ goto fail_hidden;
+ }
+
+ /*
+ * FIXME: this validation could be done by command defs.
+ *
+ * Outside the standard linear/striped/mirror/raid LV
+ * types, cache is the only special LV type that is handled
+ * (the command is redirected to origin).
+ */
+ switch (lvt_enum) {
+ case thin_LVT:
+ case thinpool_LVT:
+ case cachepool_LVT:
+ case snapshot_LVT:
+ log_error("Operation not permitted (%s %d) on LV %s type %s.",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ display_lvname(lv), lvtype ? lvtype->name : "unknown");
+ return 0;
+ }
+
+ return 1;
+
+ fail_hidden:
+ log_error("Operation not permitted (%s %d) on hidden LV %s.",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ display_lvname(lv));
+ return 0;
+}
+
+int lvconvert_raid_types_cmd(struct cmd_context * cmd, int argc, char **argv)
+{
+ int poll_ret, ret;
+ int saved_ignore_suspended_devices;
+ struct processing_handle *handle;
+ struct convert_poll_id_list *idl;
+ struct lvconvert_params lp = {
+ .conv_type = CONV_OTHER,
+ .target_attr = ~0,
+ .idls = DM_LIST_HEAD_INIT(lp.idls),
+ };
+
+ if (!(handle = init_processing_handle(cmd, NULL))) {
+ log_error("Failed to initialize processing handle.");
+ return ECMD_FAILED;
+ }
+
+ handle->custom_handle = &lp;
+
+ if (!_read_params(cmd, &lp)) {
+ ret = EINVALID_CMD_LINE;
+ goto_out;
+ }
+
+ saved_ignore_suspended_devices = ignore_suspended_devices();
+
+ ret = process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ handle, &_lvconvert_raid_types_check, &_lvconvert_raid_types_single);
+
+ init_ignore_suspended_devices(saved_ignore_suspended_devices);
+
+ dm_list_iterate_items(idl, &lp.idls) {
+ poll_ret = _lvconvert_poll_by_id(cmd, idl->id,
+ lp.wait_completion ? 0 : 1U,
+ idl->is_merging_origin,
+ idl->is_merging_origin_thin);
+ if (poll_ret > ret)
+ ret = poll_ret;
+ }
+
+out:
+ destroy_processing_handle(cmd, handle);
+
+ return ret;
+}
+
+/*
+ * change mirror log
+ */
+
+static int _lvconvert_visible_check(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg)
+{
+ if (!lv_is_visible(lv)) {
+ log_error("Operation not permitted (%s %d) on hidden LV %s.",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ display_lvname(lv));
+ return 0;
+ }
+
+ return 1;
+}
+
+static int _lvconvert_change_mirrorlog_single(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct lvconvert_params *lp = (struct lvconvert_params *) handle->custom_handle;
+ struct dm_list *use_pvh;
+
+ if (cmd->position_argc > 1) {
+ /* First pos arg is required LV, remaining are optional PVs. */
+ if (!(use_pvh = create_pv_list(cmd->mem, lv->vg, cmd->position_argc - 1, cmd->position_argv + 1, 0)))
+ return_ECMD_FAILED;
+ lp->pv_count = cmd->position_argc - 1;
+ } else
+ use_pvh = &lv->vg->pvs;
+
+ lp->pvh = use_pvh;
+
+ /* FIXME: extract the mirrorlog functionality out of _lvconvert()? */
+ return _lvconvert(cmd, lv, lp);
+}
+
+int lvconvert_change_mirrorlog_cmd(struct cmd_context * cmd, int argc, char **argv)
+{
+ struct processing_handle *handle;
+ struct lvconvert_params lp = {
+ .conv_type = CONV_OTHER,
+ .target_attr = ~0,
+ .idls = DM_LIST_HEAD_INIT(lp.idls),
+ };
+ int ret;
+
+ if (!(handle = init_processing_handle(cmd, NULL))) {
+ log_error("Failed to initialize processing handle.");
+ return ECMD_FAILED;
+ }
+
+ handle->custom_handle = &lp;
+
+ /* FIXME: extract the relevant bits of read_params and put here. */
+ if (!_read_params(cmd, &lp)) {
+ ret = EINVALID_CMD_LINE;
+ goto_out;
+ }
+
+ ret = process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ handle, &_lvconvert_visible_check, &_lvconvert_change_mirrorlog_single);
+
+out:
+ destroy_processing_handle(cmd, handle);
+
+ return ret;
+}
+
+/*
+ * split mirror images
+ */
+
+static int _lvconvert_split_mirror_images_single(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct lvconvert_params *lp = (struct lvconvert_params *) handle->custom_handle;
+ struct dm_list *use_pvh;
+
+ if (cmd->position_argc > 1) {
+ /* First pos arg is required LV, remaining are optional PVs. */
+ if (!(use_pvh = create_pv_list(cmd->mem, lv->vg, cmd->position_argc - 1, cmd->position_argv + 1, 0)))
+ return_ECMD_FAILED;
+ lp->pv_count = cmd->position_argc - 1;
+ } else
+ use_pvh = &lv->vg->pvs;
+
+ lp->pvh = use_pvh;
+
+ /* FIXME: extract the split functionality out of _lvconvert()? */
+ return _lvconvert(cmd, lv, lp);
+}
+
+int lvconvert_split_mirror_images_cmd(struct cmd_context * cmd, int argc, char **argv)
+{
+ struct processing_handle *handle;
+ struct lvconvert_params lp = {
+ .conv_type = CONV_OTHER,
+ .target_attr = ~0,
+ .idls = DM_LIST_HEAD_INIT(lp.idls),
+ };
+ int ret;
+
+ if (!(handle = init_processing_handle(cmd, NULL))) {
+ log_error("Failed to initialize processing handle.");
+ return ECMD_FAILED;
+ }
+
+ handle->custom_handle = &lp;
+
+ /* FIXME: extract the relevant bits of read_params and put here. */
+ if (!_read_params(cmd, &lp)) {
+ ret = EINVALID_CMD_LINE;
+ goto_out;
+ }
+
+ /* FIXME: are there any hidden LVs that should be disallowed? */
+
+ ret = process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ handle, NULL, &_lvconvert_split_mirror_images_single);
+
+out:
+ destroy_processing_handle(cmd, handle);
+
+ return ret;
+}
+
+/*
+ * merge mirror images
+ *
+ * Called from both lvconvert --mergemirrors and lvconvert --merge.
+ */
+
static int _lvconvert_merge_mirror_images_single(struct cmd_context *cmd,
- struct logical_volume *lv,
- struct processing_handle *handle)
+ struct logical_volume *lv,
+ struct processing_handle *handle)
{
if (!lv_raid_merge(lv))
return ECMD_FAILED;
@@ -6411,10 +5917,11 @@ static int _lvconvert_merge_mirror_images_single(struct cmd_context *cmd,
int lvconvert_merge_mirror_images_cmd(struct cmd_context *cmd, int argc, char **argv)
{
+ /* arg can be a VG name, which is the standard option usage */
cmd->command->flags &= ~GET_VGNAME_FROM_OPTIONS;
return process_each_lv(cmd, cmd->position_argc, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
- NULL, NULL, &_lvconvert_merge_mirror_images_single);
+ NULL, &_lvconvert_visible_check, &_lvconvert_merge_mirror_images_single);
}
static int _lvconvert_merge_generic_single(struct cmd_context *cmd,
@@ -6471,3 +5978,15 @@ int lvconvert_merge_cmd(struct cmd_context *cmd, int argc, char **argv)
return ret;
}
+/*
+ * All lvconvert command defs have their own function,
+ * so the generic function name is unused.
+ */
+
+int lvconvert(struct cmd_context *cmd, int argc, char **argv)
+{
+ log_error(INTERNAL_ERROR "Missing function for command definition %s.",
+ cmd->command->command_line_id);
+ return ECMD_FAILED;
+}
+
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index c100311..4f1718b 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -147,20 +147,17 @@ struct command_function command_functions[COMMAND_ID_COUNT] = {
{ lvconvert_split_and_keep_cachepool_CMD, lvconvert_split_cachepool_cmd },
{ lvconvert_split_and_remove_cachepool_CMD, lvconvert_split_cachepool_cmd },
+ /* lvconvert raid-related type conversions */
+ { lvconvert_raid_types_CMD, lvconvert_raid_types_cmd },
+
/* lvconvert utilities for raid/mirror */
- { lvconvert_merge_mirror_images_CMD, lvconvert_merge_mirror_images_cmd },
-#if 0
- { lvconvert_split_mirror_images_CMD, lvconvert_split_mirror_images_cmd },
+ { lvconvert_split_mirror_images_CMD, lvconvert_split_mirror_images_cmd},
{ lvconvert_change_mirrorlog_CMD, lvconvert_change_mirrorlog_cmd },
-#endif
+ { lvconvert_merge_mirror_images_CMD, lvconvert_merge_mirror_images_cmd },
/* redirected to merge_snapshot/merge_thin/merge_mirrors */
{ lvconvert_merge_CMD, lvconvert_merge_cmd },
-#if 0
- /* all raid-related type conversions */
- { lvconvert_raid_types_CMD, lvconvert_raid_types_cmd },
-#endif
};
diff --git a/tools/tools.h b/tools/tools.h
index 4bba46c..89ee8ad 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -271,7 +271,10 @@ int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **a
int lvconvert_merge_thin_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_raid_types_cmd(struct cmd_context * cmd, int argc, char **argv);
+int lvconvert_split_mirror_images_cmd(struct cmd_context * cmd, int argc, char **argv);
int lvconvert_merge_mirror_images_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_change_mirrorlog_cmd(struct cmd_context * cmd, int argc, char **argv);
int lvconvert_merge_cmd(struct cmd_context *cmd, int argc, char **argv);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a801b92b2c81213d…
Commit: a801b92b2c81213dddccc9f9a09794208f92bfc9
Parent: 86d8ab493bbfbc0130a2bbe7717557ecc7fa33fd
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Dec 9 15:54:59 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
tests: use swapmetadata
and some other pool/cache/thin related changes
---
test/shell/lvconvert-cache.sh | 42 ++++++++++++------------
test/shell/lvconvert-repair-thin.sh | 8 ++--
test/shell/lvextend-thin-full.sh | 2 +-
test/shell/lvextend-thin-metadata-dmeventd.sh | 12 +++---
test/shell/thin-flags.sh | 2 +-
5 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/test/shell/lvconvert-cache.sh b/test/shell/lvconvert-cache.sh
index 31fe4e8..5263028 100644
--- a/test/shell/lvconvert-cache.sh
+++ b/test/shell/lvconvert-cache.sh
@@ -60,7 +60,7 @@ check lv_field $vg/$lv2 cache_settings "random_threshold=56,sequential_threshold
# Check swap of cache pool metadata
lvconvert --yes --type cache-pool --poolmetadata $lv4 $vg/$lv3
UUID=$(get lv_field $vg/$lv5 uuid)
-lvconvert --yes --cachepool $vg/$lv3 --poolmetadata $lv5
+lvconvert --yes --swapmetadata --poolmetadata $lv5 $vg/$lv3
check lv_field $vg/${lv3}_cmeta uuid "$UUID"
@@ -108,30 +108,30 @@ lvcreate -an -Zn -L 8 -n $lv4 $vg
invalid lvconvert --type cache --poolmetadata $vg/$lv2 $vg/$lv1
# Cannot mix with thins
-invalid lvconvert --type cache --poolmetadata $vg/$lv2 --thinpool $vg/$lv1
-invalid lvconvert --type cache --thin --poolmetadata $vg/$lv2 $vg/$lv1
+not lvconvert --type cache --poolmetadata $vg/$lv2 --thinpool $vg/$lv1
+not lvconvert --type cache --thin --poolmetadata $vg/$lv2 $vg/$lv1
# Undefined cached volume
-invalid lvconvert --type cache --cachepool $vg/$lv1
-invalid lvconvert --cache --cachepool $vg/$lv1
+not lvconvert --type cache --cachepool $vg/$lv1
+not lvconvert --cache --cachepool $vg/$lv1
# Single vg is required
-invalid lvconvert --type cache --cachepool $vg/$lv1 --poolmetadata $vg1/$lv2 $vg/$lv3
-invalid lvconvert --type cache --cachepool $vg/$lv1 --poolmetadata $lv2 $vg1/$lv3
-invalid lvconvert --type cache --cachepool $vg1/$lv1 --poolmetadata $vg2/$lv2 $vg/$lv3
-invalid lvconvert --type cache-pool --poolmetadata $vg2/$lv2 $vg1/$lv1
+not lvconvert --type cache --cachepool $vg/$lv1 --poolmetadata $vg1/$lv2 $vg/$lv3
+not lvconvert --type cache --cachepool $vg/$lv1 --poolmetadata $lv2 $vg1/$lv3
+not lvconvert --type cache --cachepool $vg1/$lv1 --poolmetadata $vg2/$lv2 $vg/$lv3
+not lvconvert --type cache-pool --poolmetadata $vg2/$lv2 $vg1/$lv1
-invalid lvconvert --cachepool $vg1/$lv1 --poolmetadata $vg2/$lv2
+not lvconvert --cachepool $vg1/$lv1 --poolmetadata $vg2/$lv2
# Invalid syntax, vg is unknown
-invalid lvconvert --yes --cachepool $lv3 --poolmetadata $lv4
+not lvconvert --yes --cachepool $lv3 --poolmetadata $lv4
# Invalid chunk size is <32KiB >1GiB
-invalid lvconvert --type cache-pool --chunksize 16 --poolmetadata $lv2 $vg/$lv1
-invalid lvconvert --type cache-pool --chunksize 2G --poolmetadata $lv2 $vg/$lv1
+not lvconvert --type cache-pool --chunksize 16 --poolmetadata $lv2 $vg/$lv1
+not lvconvert --type cache-pool --chunksize 2G --poolmetadata $lv2 $vg/$lv1
# Invalid chunk size is bigger then data size, needs to open VG
-fail lvconvert --yes --type cache-pool --chunksize 16M --poolmetadata $lv2 $vg/$lv1
+not lvconvert --yes --type cache-pool --chunksize 16M --poolmetadata $lv2 $vg/$lv1
lvremove -f $vg
@@ -142,7 +142,7 @@ lvcreate --type cache-pool -an -v -L 2 -n cpool $vg
lvcreate -H -L 4 -n corigin --cachepool $vg/cpool
# unsupported yet
-fail lvconvert --repair $vg/cpool 2>&1 | tee out
+not lvconvert --repair $vg/cpool 2>&1 | tee out
#grep "Cannot convert internal LV" out
lvremove -f $vg
@@ -154,13 +154,13 @@ lvcreate --type cache-pool -L10 $vg/$lv1
lvcreate --cache -L20 $vg/$lv1
lvcreate -L10 -n $lv2 $vg
-fail lvconvert --yes --type cache $vg/$lv2 --cachepool $vg/$lv1
-fail lvconvert --yes --type cache $vg/$lv1 --cachepool $vg/$lv2
-fail lvconvert --yes --type cache-pool $vg/$lv1
-fail lvconvert --yes --type mirror -m1 $vg/$lv1
+not lvconvert --yes --type cache $vg/$lv2 --cachepool $vg/$lv1
+not lvconvert --yes --type cache $vg/$lv1 --cachepool $vg/$lv2
+not lvconvert --yes --type cache-pool $vg/$lv1
+not lvconvert --yes --type mirror -m1 $vg/$lv1
not aux have_raid 1 0 0 || fail lvconvert --yes --type raid1 -m1 $vg/$lv1
-fail lvconvert --yes --type snapshot $vg/$lv1 $vg/$lv2
-fail lvconvert --yes --type snapshot $vg/$lv2 $vg/$lv1
+not lvconvert --yes --type snapshot $vg/$lv1 $vg/$lv2
+not lvconvert --yes --type snapshot $vg/$lv2 $vg/$lv1
not aux have_thin 1 0 0 || fail lvconvert --yes -T --thinpool $vg/$lv2 $vg/$lv1
lvremove -f $vg
diff --git a/test/shell/lvconvert-repair-thin.sh b/test/shell/lvconvert-repair-thin.sh
index 8930894..923b9c8 100644
--- a/test/shell/lvconvert-repair-thin.sh
+++ b/test/shell/lvconvert-repair-thin.sh
@@ -45,7 +45,7 @@ lvchange -an $vg/$lv2 $vg/$lv1 $vg/pool $vg/repair
# Manual repair steps:
# Test swapping - swap out thin-pool's metadata with our repair volume
-lvconvert -y -f --poolmetadata $vg/repair --thinpool $vg/pool
+lvconvert -y -f --swapmetadata --poolmetadata $vg/repair $vg/pool
lvchange -ay $vg/repair
@@ -74,7 +74,7 @@ not "$LVM_TEST_THIN_DUMP_CMD" "$DM_DEV_DIR/$vg/repair" | tee dump
lvchange -an $vg
# Swap repaired metadata back
-lvconvert -y -f --poolmetadata $vg/fixed --thinpool $vg/pool
+lvconvert -y -f --swapmetadata --poolmetadata $vg/fixed $vg/pool
# Check pool still preserves its original settings
check lv_field $vg/pool chunksize "128.00k"
@@ -87,7 +87,7 @@ vgchange -ay $vg
vgchange -an $vg
# Put back 'broken' metadata
-lvconvert -y -f --poolmetadata $vg/repair --thinpool $vg/pool
+lvconvert -y -f --swapmetadata --poolmetadata $vg/repair $vg/pool
# Check --repair usage
lvconvert -v --repair $vg/pool
@@ -98,7 +98,7 @@ lvchange -ay $vg/pool
vgchange -an $vg
# Restore damaged metadata
-lvconvert -y -f --poolmetadata $vg/pool_meta0 --thinpool $vg/pool
+lvconvert -y -f --swapmetadata --poolmetadata $vg/pool_meta0 $vg/pool
# Check lvremove -ff works even with damaged pool
lvremove -ff $vg
diff --git a/test/shell/lvextend-thin-full.sh b/test/shell/lvextend-thin-full.sh
index 3bafad4..5b7b9e7 100644
--- a/test/shell/lvextend-thin-full.sh
+++ b/test/shell/lvextend-thin-full.sh
@@ -38,7 +38,7 @@ lvchange -an $vg
lvcreate -L2M -n $lv1 $vg
"$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1"
-lvconvert -y --thinpool $vg/pool --poolmetadata $vg/$lv1
+lvconvert -y --swapmetadata --poolmetadata $vg/$lv1 $vg/pool
# Cannot resize if set to 0%
not lvextend --use-policies --config 'activation{thin_pool_autoextend_percent = 0}' $vg/pool 2>&1 | tee err
diff --git a/test/shell/lvextend-thin-metadata-dmeventd.sh b/test/shell/lvextend-thin-metadata-dmeventd.sh
index 6d27600..2cfa1c3 100644
--- a/test/shell/lvextend-thin-metadata-dmeventd.sh
+++ b/test/shell/lvextend-thin-metadata-dmeventd.sh
@@ -78,7 +78,7 @@ fake_metadata_ 400 2 >data
"$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1"
# Swap volume with restored fake metadata
-lvconvert -y --chunksize 64k --thinpool $vg/pool --poolmetadata $vg/$lv1
+lvconvert -y --chunksize 64k --swapmetadata --poolmetadata $vg/$lv1 $vg/pool
# Not alllowed when thin-pool metadata free space is <75% for 2M meta
fail lvcreate -V20 $vg/pool
@@ -91,7 +91,7 @@ lvchange -an $vg/pool
fake_metadata_ 7400 2 >data
"$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv2"
# Swap volume with restored fake metadata
-lvconvert -y --chunksize 64k --thinpool $vg/pool --poolmetadata $vg/$lv2
+lvconvert -y --chunksize 64k --swapmetadata --poolmetadata $vg/$lv2 $vg/pool
lvchange -ay $vg/pool
# Check generated metadata consume more then 88%
test "$(meta_percent_)" -gt "88"
@@ -138,7 +138,7 @@ lvchange -an $vg/thin $vg/thin2 $vg/pool
# Transaction_id is lower by 1 and there are no messages -> ERROR
fake_metadata_ 10 0 >data
"$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1"
-lvconvert -y --thinpool $vg/pool --poolmetadata $vg/$lv1
+lvconvert -y --swapmetadata --poolmetadata $vg/$lv1 $vg/pool
not vgchange -ay $vg 2>&1 | tee out
grep expected out
@@ -147,7 +147,7 @@ check inactive $vg pool_tmeta
# Transaction_id is higher by 1
fake_metadata_ 10 3 >data
"$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1"
-lvconvert -y --thinpool $vg/pool --poolmetadata $vg/$lv1
+lvconvert -y --swapmetadata --poolmetadata $vg/$lv1 $vg/pool
not vgchange -ay $vg 2>&1 | tee out
grep expected out
@@ -158,7 +158,7 @@ fake_metadata_ 400 2 >data
"$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1"
# Swap volume with restored fake metadata
-lvconvert -y --chunksize 64k --thinpool $vg/pool --poolmetadata $vg/$lv1
+lvconvert -y --chunksize 64k --swapmetadata --poolmetadata $vg/$lv1 $vg/pool
vgchange -ay $vg
@@ -173,7 +173,7 @@ fake_metadata_ 350 2 >data
lvchange -ay $vg/$lv1
"$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1"
-lvconvert -y --chunksize 64k --thinpool $vg/pool --poolmetadata $vg/$lv1
+lvconvert -y --chunksize 64k --swapmetadata --poolmetadata $vg/$lv1 $vg/pool
lvchange -ay $vg/pool $vg/$lv1
lvs -a $vg
diff --git a/test/shell/thin-flags.sh b/test/shell/thin-flags.sh
index 7d87553..cbf9d19 100644
--- a/test/shell/thin-flags.sh
+++ b/test/shell/thin-flags.sh
@@ -71,7 +71,7 @@ aux prepare_thin_metadata 490 1 | tee data
"$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv1"
# Swap volume with restored fake metadata
-lvconvert -y --thinpool $vg/pool --poolmetadata $vg/$lv1
+lvconvert -y --swapmetadata --poolmetadata $vg/$lv1 $vg/pool
lvchange -ay $vg
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=86d8ab493bbfbc01…
Commit: 86d8ab493bbfbc0130a2bbe7717557ecc7fa33fd
Parent: 95e38607ecf44fece40dd4a1b078582554c93da1
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Dec 9 14:39:57 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvconvert: use command defs for mergemirrors
and route the generic --merge to one of the
specific merge functions
---
tools/args.h | 1 +
tools/command-lines.in | 54 ++++++++++++++---------------------
tools/lvconvert.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
tools/lvmcmdline.c | 20 ++++++++-----
tools/tools.h | 4 ++
5 files changed, 111 insertions(+), 40 deletions(-)
diff --git a/tools/args.h b/tools/args.h
index c904609..559bf16 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -60,6 +60,7 @@ arg(locktype_ARG, '\0', "locktype", locktype_VAL, 0, 0)
arg(logonly_ARG, '\0', "logonly", 0, 0, 0)
arg(maxrecoveryrate_ARG, '\0', "maxrecoveryrate", sizekb_VAL, 0, 0)
arg(merge_ARG, '\0', "merge", 0, 0, 0)
+arg(mergemirrors_ARG, '\0', "mergemirrors", 0, 0, 0)
arg(mergesnapshot_ARG, '\0', "mergesnapshot", 0, 0, 0)
arg(mergethin_ARG, '\0', "mergethin", 0, 0, 0)
arg(mergedconfig_ARG, '\0', "mergedconfig", 0, 0, 0)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 5804723..a529685 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -373,6 +373,12 @@ OP: PV ...
ID: lvconvert_split_mirror_images
DESC: Split images from a raid1 LV and track changes to origin.
+lvconvert --mergemirrors LV_linear_raid|VG|Tag ...
+OO: OO_LVCONVERT
+ID: lvconvert_merge_mirror_images
+DESC: Merge LV images that were split from a raid1 LV.
+RULE: all not lv_is_locked lv_is_pvmove lv_is_merging_origin lv_is_virtual_origin lv_is_external_origin lv_is_merging_cow
+
lvconvert --mirrorlog MirrorLog LV_mirror
OO: OO_LVCONVERT
OP: PV ...
@@ -486,37 +492,30 @@ DESC: Swap metadata LV in a thin pool or cache pool (for repair only).
---
-# FIXME: lvconvert --merge is an extremely ambiguous command.
+# lvconvert --merge is an extremely ambiguous command.
# It can do very different operations, but which one depends
# on knowing the LV type. So, the command doesn't know what
# it's actually doing until quite late, when processing a
-# single LV.
-#
-# Use different option names for different merge operations
-# so that we can have different command definitions,
-# different behaviors, different optional options, etc:
-#
-# lvconvert --merge-mirror LV_linear_striped_raid ...
-# DESC: Merge LV that was previously split from a mirror.
-#
-# lvconvert --merge-thin LV_thin
-# DESC: Merge thin LV into its origin LV.
-#
-# lvconvert --merge-snapshot LV_snapshot
-# DESC: Merge COW snapshot LV into its origin.
-#
-# Then we could add VG|Tag to --merge-mirror arg pos 1, because
-# "lvconvert --merge VG|Tag" is a terrible command. It will do
-# different operations on each LV it finds, depending on the
-# current LV type.
+# single LV. When passed a VG or tag, it will do different
+# operations on each LV it finds, depending on the current LV type.
lvconvert --merge LV_linear_striped_raid_thin_snapshot|VG|Tag ...
OO: --background, --interval Number, OO_LVCONVERT
ID: lvconvert_merge
-DESC: Merge LV that was previously split from a mirror.
+DESC: Merge LV that was split from a mirror (variant, use --mergemirrors).
+DESC: Merge thin LV into its origin LV (variant, use --mergethin).
+DESC: Merge COW snapshot LV into its origin (variant, use --mergesnapshot).
+RULE: all not lv_is_locked lv_is_pvmove lv_is_merging_origin lv_is_virtual_origin lv_is_external_origin lv_is_merging_cow
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvconvert --mergethin LV_thin ...
+OO: OO_LVCONVERT
+ID: lvconvert_merge_thin
DESC: Merge thin LV into its origin LV.
-DESC: Merge COW snapshot LV into its origin.
RULE: all not lv_is_locked lv_is_pvmove lv_is_merging_origin lv_is_virtual_origin lv_is_external_origin lv_is_merging_cow
+RULE: all and lv_is_visible
---
@@ -526,7 +525,7 @@ RULE: all not lv_is_locked lv_is_pvmove lv_is_merging_origin lv_is_virtual_origi
lvconvert --mergesnapshot LV_snapshot ...
OO: --background, --interval Number, OO_LVCONVERT
ID: lvconvert_merge_snapshot
-DESC: Merge LV that was previously split from a mirror.
+DESC: Merge COW snapshot LV into its origin.
RULE: all not lv_is_locked lv_is_pvmove lv_is_merging_origin lv_is_virtual_origin lv_is_external_origin lv_is_merging_cow
RULE: all and lv_is_visible
@@ -889,15 +888,6 @@ DESC: (infers --type thin).
---
-lvconvert --mergethin LV_thin ...
-OO: --background, --interval Number, OO_LVCONVERT
-ID: lvconvert_merge_thin
-DESC: Merge thin LV into its origin LV.
-RULE: all not lv_is_locked lv_is_pvmove lv_is_merging_origin lv_is_virtual_origin lv_is_external_origin lv_is_merging_cow
-RULE: all and lv_is_visible
-
----
-
# stripes option is not intuitive when creating a thin LV,
# but here it applies to creating the new thin pool that
# is used for the thin LV
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index da70cbd..296d4e2 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -6399,3 +6399,75 @@ int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv
NULL, NULL, &_lvconvert_split_cachepool_single);
}
+static int _lvconvert_merge_mirror_images_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ if (!lv_raid_merge(lv))
+ return ECMD_FAILED;
+
+ return ECMD_PROCESSED;
+}
+
+int lvconvert_merge_mirror_images_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ cmd->command->flags &= ~GET_VGNAME_FROM_OPTIONS;
+
+ return process_each_lv(cmd, cmd->position_argc, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, NULL, &_lvconvert_merge_mirror_images_single);
+}
+
+static int _lvconvert_merge_generic_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ int ret;
+
+ if (lv_is_cow(lv))
+ ret = _lvconvert_merge_snapshot_single(cmd, lv, handle);
+
+ else if (lv_is_thin_volume(lv))
+ ret = _lvconvert_merge_thin_single(cmd, lv, handle);
+
+ else
+ ret = _lvconvert_merge_mirror_images_single(cmd, lv, handle);
+
+ return ret;
+}
+
+int lvconvert_merge_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ struct processing_handle *handle;
+ struct lvconvert_result lr = { 0 };
+ struct convert_poll_id_list *idl;
+ int ret, poll_ret;
+
+ dm_list_init(&lr.poll_idls);
+
+ if (!(handle = init_processing_handle(cmd, NULL))) {
+ log_error("Failed to initialize processing handle.");
+ return ECMD_FAILED;
+ }
+
+ handle->custom_handle = &lr;
+
+ cmd->command->flags &= ~GET_VGNAME_FROM_OPTIONS;
+
+ ret = process_each_lv(cmd, cmd->position_argc, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ handle, NULL, &_lvconvert_merge_generic_single);
+
+ /* polling is only used by merge_snapshot */
+ if (lr.need_polling) {
+ dm_list_iterate_items(idl, &lr.poll_idls) {
+ poll_ret = _lvconvert_poll_by_id(cmd, idl->id,
+ arg_is_set(cmd, background_ARG), 1, 0);
+ if (poll_ret > ret)
+ ret = poll_ret;
+ }
+ }
+
+ destroy_processing_handle(cmd, handle);
+
+ return ret;
+}
+
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 85fd1b8..c100311 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -146,19 +146,23 @@ struct command_function command_functions[COMMAND_ID_COUNT] = {
{ lvconvert_merge_thin_CMD, lvconvert_merge_thin_cmd },
{ lvconvert_split_and_keep_cachepool_CMD, lvconvert_split_cachepool_cmd },
{ lvconvert_split_and_remove_cachepool_CMD, lvconvert_split_cachepool_cmd },
-};
+ /* lvconvert utilities for raid/mirror */
+ { lvconvert_merge_mirror_images_CMD, lvconvert_merge_mirror_images_cmd },
#if 0
- /* all raid-related type conversions */
- { lvconvert_raid_types_CMD, lvconvert_raid_types_fn },
+ { lvconvert_split_mirror_images_CMD, lvconvert_split_mirror_images_cmd },
+ { lvconvert_change_mirrorlog_CMD, lvconvert_change_mirrorlog_cmd },
+#endif
- /* raid-related utilities (move into lvconvert_raid_types?) */
- { lvconvert_split_mirror_images_CMD, lvconvert_split_mirror_images_fn },
- { lvconvert_change_mirrorlog_CMD, lvconvert_change_mirrorlog_fn },
+ /* redirected to merge_snapshot/merge_thin/merge_mirrors */
+ { lvconvert_merge_CMD, lvconvert_merge_cmd },
- /* directed to one of the other merges (snap,thin,mirror) when all are implemented */
- { lvconvert_merge_CMD, lvconvert_merge_fn },
+#if 0
+ /* all raid-related type conversions */
+ { lvconvert_raid_types_CMD, lvconvert_raid_types_cmd },
#endif
+};
+
/* Command line args */
unsigned arg_count(const struct cmd_context *cmd, int a)
diff --git a/tools/tools.h b/tools/tools.h
index 2deded9..4bba46c 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -271,4 +271,8 @@ int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **a
int lvconvert_merge_thin_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_merge_mirror_images_cmd(struct cmd_context *cmd, int argc, char **argv);
+
+int lvconvert_merge_cmd(struct cmd_context *cmd, int argc, char **argv);
+
#endif
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=95e38607ecf44fec…
Commit: 95e38607ecf44fece40dd4a1b078582554c93da1
Parent: 0e3e611a137a264a343335d18d500fce7af8e0f7
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Dec 9 13:30:42 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
toollib: find VG name in option values when needed
---
tools/commands.h | 2 +-
tools/lvconvert.c | 2 +
tools/toollib.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
tools/tools.h | 2 +
4 files changed, 162 insertions(+), 2 deletions(-)
diff --git a/tools/commands.h b/tools/commands.h
index c663207..4739479 100644
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -47,7 +47,7 @@ xx(lvchange,
xx(lvconvert,
"Change logical volume layout",
- 0)
+ GET_VGNAME_FROM_OPTIONS)
xx(lvcreate,
"Create a logical volume",
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 979d94d..da70cbd 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -5386,6 +5386,8 @@ int lvconvert(struct cmd_context * cmd, int argc, char **argv)
};
struct processing_handle *handle = init_processing_handle(cmd, NULL);
+ cmd->command->flags &= ~GET_VGNAME_FROM_OPTIONS;
+
if (!handle) {
log_error("Failed to initialize processing handle.");
return ECMD_FAILED;
diff --git a/tools/toollib.c b/tools/toollib.c
index 6f9e294..36599e0 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -3364,6 +3364,157 @@ static int _get_arg_lvnames(struct cmd_context *cmd,
return ret_max;
}
+/*
+ * This is a non-standard way of finding vgname/lvname to process. It exists
+ * because an earlier form of lvconvert did not follow the standard form, and
+ * came up with its own inconsistent approach.
+ *
+ * In this case, when the position arg is a single name, it is treated as an LV
+ * name (not a VG name). This leaves the VG unknown. So, other option values
+ * must be searched for a VG name. If one of those option values contains a
+ * vgname/lvname value, then the VG name is extracted and used for the LV
+ * position arg.
+ *
+ * Other option values that are searched for a VG name are:
+ * --thinpool, --cachepool.
+ *
+ * . command vg/lv1
+ * . add vg to arg_vgnames
+ * . add vg/lv1 to arg_lvnames
+ *
+ * command lv1
+ * . error: no vg name
+ *
+ * command --option vg/lv1 vg/lv2
+ * . verify both vg names match
+ * . add vg to arg_vgnames
+ * . add vg/lv2 to arg_lvnames
+ *
+ * command --option lv1 lv2
+ * . error: no vg name
+ *
+ * command --option vg/lv1 lv2
+ * . add vg to arg_vgnames
+ * . add vg/lv2 to arg_lvnames
+ *
+ * command --option lv1 vg/lv2
+ * . add vg to arg_vgnames
+ * . add vg/lv2 to arg_lvnames
+ */
+
+static int _get_arg_lvnames_using_options(struct cmd_context *cmd,
+ int argc, char **argv,
+ struct dm_list *arg_vgnames,
+ struct dm_list *arg_lvnames,
+ struct dm_list *arg_tags)
+{
+ const char *pos_name = NULL;
+ const char *arg_name = NULL;
+ const char *pos_vgname = NULL;
+ const char *opt_vgname = NULL;
+ const char *pos_lvname = NULL;
+ const char *use_vgname = NULL;
+ char *tmp_name;
+ char *split;
+ char *vglv;
+ size_t vglv_sz;
+
+ if (argc != 1) {
+ log_error("One LV position arg is required.");
+ return ECMD_FAILED;
+ }
+
+ if (!(pos_name = dm_pool_strdup(cmd->mem, argv[0]))) {
+ log_error("string alloc failed.");
+ return ECMD_FAILED;
+ }
+
+ if (*pos_name == '@') {
+ if (!validate_tag(pos_name + 1)) {
+ log_error("Skipping invalid tag %s.", pos_name);
+ return ECMD_FAILED;
+ }
+ if (!str_list_add(cmd->mem, arg_tags,
+ dm_pool_strdup(cmd->mem, pos_name + 1))) {
+ log_error("strlist allocation failed.");
+ return ECMD_FAILED;
+ }
+ return ECMD_PROCESSED;
+ }
+
+ if ((split = strchr(pos_name, '/'))) {
+ pos_vgname = pos_name;
+ pos_lvname = split + 1;
+ *split = '\0';
+ } else {
+ pos_lvname = pos_name;
+ pos_vgname = NULL;
+ }
+
+ if (arg_is_set(cmd, thinpool_ARG))
+ arg_name = arg_str_value(cmd, thinpool_ARG, NULL);
+ else if (arg_is_set(cmd, cachepool_ARG))
+ arg_name = arg_str_value(cmd, cachepool_ARG, NULL);
+
+ if (!pos_vgname && !arg_name) {
+ log_error("Cannot find VG name for LV %s.", pos_lvname);
+ return ECMD_FAILED;
+ }
+
+ if (arg_name && (split = strchr(arg_name, '/'))) {
+ /* combined VG/LV */
+
+ if (!(tmp_name = dm_pool_strdup(cmd->mem, arg_name))) {
+ log_error("string alloc failed.");
+ return ECMD_FAILED;
+ }
+
+ if (!(split = strchr(tmp_name, '/')))
+ return ECMD_FAILED;
+
+ opt_vgname = tmp_name;
+ /* Don't care about opt lvname. */
+ /* opt_lvname = split + 1; */
+ *split = '\0';
+ } else {
+ /* Don't care about opt lvname. */
+ /* opt_lvname = arg_name; */
+ opt_vgname = NULL;
+ }
+
+ if (!pos_vgname && !opt_vgname) {
+ log_error("Cannot find VG name for LV %s.", pos_lvname);
+ return ECMD_FAILED;
+ }
+
+ if (pos_vgname && opt_vgname && strcmp(pos_vgname, opt_vgname)) {
+ log_error("VG name mismatch from position arg (%s) and option arg (%s).",
+ pos_vgname, opt_vgname);
+ return ECMD_FAILED;
+ }
+
+ use_vgname = pos_vgname ? pos_vgname : opt_vgname;
+
+ if (!str_list_add(cmd->mem, arg_vgnames, dm_pool_strdup(cmd->mem, use_vgname))) {
+ log_error("strlist allocation failed.");
+ return ECMD_FAILED;
+ }
+
+ vglv_sz = strlen(use_vgname) + strlen(pos_lvname) + 2;
+
+ if (!(vglv = dm_pool_alloc(cmd->mem, vglv_sz)) ||
+ dm_snprintf(vglv, vglv_sz, "%s/%s", use_vgname, pos_lvname) < 0) {
+ log_error("vg/lv string alloc failed.");
+ return ECMD_FAILED;
+ }
+ if (!str_list_add(cmd->mem, arg_lvnames, vglv)) {
+ log_error("strlist allocation failed.");
+ return ECMD_FAILED;
+ }
+
+ return ECMD_PROCESSED;
+}
+
static int _process_lv_vgnameid_list(struct cmd_context *cmd, uint32_t read_flags,
struct dm_list *vgnameids_to_process,
struct dm_list *arg_vgnames,
@@ -3523,7 +3674,12 @@ int process_each_lv(struct cmd_context *cmd,
/*
* Find any LVs, VGs or tags explicitly provided on the command line.
*/
- if ((ret = _get_arg_lvnames(cmd, argc, argv, one_vgname, one_lvname, &arg_vgnames, &arg_lvnames, &arg_tags) != ECMD_PROCESSED)) {
+ if (cmd->command->flags & GET_VGNAME_FROM_OPTIONS)
+ ret = _get_arg_lvnames_using_options(cmd, argc, argv, &arg_vgnames, &arg_lvnames, &arg_tags);
+ else
+ ret = _get_arg_lvnames(cmd, argc, argv, one_vgname, one_lvname, &arg_vgnames, &arg_lvnames, &arg_tags);
+
+ if (ret != ECMD_PROCESSED) {
ret_max = ret;
goto_out;
}
diff --git a/tools/tools.h b/tools/tools.h
index f310570..2deded9 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -162,6 +162,8 @@ struct lv_types {
#define ENABLE_DUPLICATE_DEVS 0x00000400
/* Command does not accept tags as args. */
#define DISALLOW_TAG_ARGS 0x00000800
+/* Command may need to find VG name in an option value. */
+#define GET_VGNAME_FROM_OPTIONS 0x00001000
void usage(const char *name);
1
0
13 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0e3e611a137a264a…
Commit: 0e3e611a137a264a343335d18d500fce7af8e0f7
Parent: d71aaca07b2c14049130ab368221510c65236af7
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Dec 7 14:30:57 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvconvert: use command defs for thin/cache/pool creation
Everything related to thin and cache.
---
test/shell/lvconvert-thin.sh | 18 +-
test/shell/thin-merge.sh | 4 +-
test/shell/thin-vglock.sh | 2 +-
tools/args.h | 2 +
tools/command-lines.in | 45 +-
tools/lvconvert.c | 1361 ++++++++++++++++++++++++++++++++++++++++--
tools/lvmcmdline.c | 39 +-
tools/toollib.c | 6 +-
tools/toollib.h | 2 +
tools/tools.h | 9 +
10 files changed, 1404 insertions(+), 84 deletions(-)
diff --git a/test/shell/lvconvert-thin.sh b/test/shell/lvconvert-thin.sh
index 3878fcb..2a54614 100644
--- a/test/shell/lvconvert-thin.sh
+++ b/test/shell/lvconvert-thin.sh
@@ -81,9 +81,9 @@ grep "Pool zeroing and large" err
UUID=$(get lv_field $vg/$lv2 uuid)
# Fail is pool is active
# TODO maybe detect inactive pool and deactivate
-fail lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $lv2
+fail lvconvert --swapmetadata --yes --poolmetadata $lv2 $vg/$lv1
lvchange -an $vg
-lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $lv2
+lvconvert --swapmetadata --yes --poolmetadata $lv2 $vg/$lv1
check lv_field $vg/${lv1}_tmeta uuid "$UUID"
lvremove -f $vg
@@ -96,20 +96,20 @@ lvcreate -L1M -n $lv3 $vg
# chunk size is bigger then size of thin pool data
fail lvconvert --yes -c 1G --thinpool $vg/$lv3
# stripes can't be used with poolmetadata
-invalid lvconvert --stripes 2 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+not lvconvert --stripes 2 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
# too small metadata (<2M)
fail lvconvert --yes -c 64 --thinpool $vg/$lv1 --poolmetadata $vg/$lv3
# too small chunk size fails
-invalid lvconvert -c 4 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+not lvconvert -c 4 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
# too big chunk size fails
-invalid lvconvert -c 2G --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+not lvconvert -c 2G --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
# negative chunk size fails
-invalid lvconvert -c -256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+not lvconvert -c -256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
# non multiple of 64KiB fails
-invalid lvconvert -c 88 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
+not lvconvert -c 88 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
# cannot use same LV for pool and convertion
-invalid lvconvert --yes --thinpool $vg/$lv3 -T $vg/$lv3
+not lvconvert --yes --thinpool $vg/$lv3 -T $vg/$lv3
# Warning about smaller then suggested
lvconvert --yes -c 256 --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 2>&1 | tee err
@@ -129,7 +129,7 @@ if test "$TSIZE" = 64T; then
lvcreate -L24T -n $lv1 $vg
# Warning about bigger then needed (24T data and 16G -> 128K chunk)
lvconvert --yes -c 64 --thinpool $vg/$lv1 2>&1 | tee err
-grep "WARNING: Chunk size is too small" err
+grep "too small" err
lvremove -f $vg
fi
diff --git a/test/shell/thin-merge.sh b/test/shell/thin-merge.sh
index b3ad007..d932924 100644
--- a/test/shell/thin-merge.sh
+++ b/test/shell/thin-merge.sh
@@ -44,7 +44,7 @@ touch mntsnap/test_snap
lvs -o+tags,thin_id $vg
-lvconvert --merge $vg/snap
+lvconvert --mergethin $vg/snap
umount mnt
@@ -107,7 +107,7 @@ fsck -n "$DM_DEV_DIR/$vg/$lv1"
check lv_not_exists $vg oldsnapof_${lv1}
# Add old snapshot to thin snapshot
lvcreate -s -L10 -n oldsnapof_snap $vg/snap
-lvconvert --merge $vg/snap
+lvconvert --mergethin $vg/snap
lvremove -f $vg/oldsnapof_snap
vgremove -ff $vg
diff --git a/test/shell/thin-vglock.sh b/test/shell/thin-vglock.sh
index 40f3adf..0b96b4b 100644
--- a/test/shell/thin-vglock.sh
+++ b/test/shell/thin-vglock.sh
@@ -34,7 +34,7 @@ mount "$DM_DEV_DIR/$vg/$lv1" mnt
lvcreate -s -n snap $vg/$lv1
check lv_field $vg/snap thin_id "3"
-lvconvert --merge $vg/snap
+lvconvert --mergethin $vg/snap
umount mnt
diff --git a/tools/args.h b/tools/args.h
index 3560c9c..c904609 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -61,6 +61,7 @@ arg(logonly_ARG, '\0', "logonly", 0, 0, 0)
arg(maxrecoveryrate_ARG, '\0', "maxrecoveryrate", sizekb_VAL, 0, 0)
arg(merge_ARG, '\0', "merge", 0, 0, 0)
arg(mergesnapshot_ARG, '\0', "mergesnapshot", 0, 0, 0)
+arg(mergethin_ARG, '\0', "mergethin", 0, 0, 0)
arg(mergedconfig_ARG, '\0', "mergedconfig", 0, 0, 0)
arg(metadatacopies_ARG, '\0', "metadatacopies", metadatacopies_VAL, 0, 0)
arg(metadataignore_ARG, '\0', "metadataignore", bool_VAL, 0, 0)
@@ -120,6 +121,7 @@ arg(showdeprecated_ARG, '\0', "showdeprecated", 0, 0, 0)
arg(showunsupported_ARG, '\0', "showunsupported", 0, 0, 0)
arg(startpoll_ARG, '\0', "startpoll", 0, 0, 0)
arg(stripes_long_ARG, '\0', "stripes", number_VAL, 0, 0)
+arg(swapmetadata_ARG, '\0', "swapmetadata", 0, 0, 0)
arg(syncaction_ARG, '\0', "syncaction", syncaction_VAL, 0, 0)
arg(sysinit_ARG, '\0', "sysinit", 0, 0, 0)
arg(systemid_ARG, '\0', "systemid", string_VAL, 0, 0)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 4704747..5804723 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -384,18 +384,22 @@ DESC: Change the type of mirror log used by a mirror LV.
# lvconvert utilities for creating/maintaining thin and cache objects.
# Create a new command set for these and migrate them out of lvconvert?
-lvconvert --type thin --thinpool LV LV_linear_striped_raid
+lvconvert --type thin --thinpool LV LV_linear_striped_raid_cache
OO: --thin, --originname LV_new, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
ID: lvconvert_to_thin_with_external
-DESC: Convert LV to type thin with an external origin.
+DESC: Convert LV to a thin LV, using the original LV as an external origin.
+RULE: all and lv_is_visible
+RULE: all not lv_is_locked
# alternate form of lvconvert --type thin
-lvconvert --thin --thinpool LV LV_linear_striped_raid
+lvconvert --thin --thinpool LV LV_linear_striped_raid_cache
OO: --type thin, --originname LV_new, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
ID: lvconvert_to_thin_with_external
-DESC: Convert LV to type thin with an external origin
+DESC: Convert LV to a thin LV, using the original LV as an external origin.
DESC: (variant, infers --type thin).
FLAGS: SECONDARY_SYNTAX
+RULE: all and lv_is_visible
+RULE: all not lv_is_locked
---
@@ -404,6 +408,7 @@ OO: --cache, --cachemode CacheMode, --cachepolicy String,
--cachesettings String, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
ID: lvconvert_to_cache_vol
DESC: Convert LV to type cache.
+RULE: all and lv_is_visible
# alternate form of lvconvert --type cache
lvconvert --cache --cachepool LV LV_linear_striped_raid_thinpool
@@ -412,6 +417,7 @@ OO: --type cache, --cachemode CacheMode, --cachepolicy String,
ID: lvconvert_to_cache_vol
DESC: Convert LV to type cache (variant, infers --type cache).
FLAGS: SECONDARY_SYNTAX
+RULE: all and lv_is_visible
---
@@ -421,14 +427,18 @@ OO: --stripes_long Number, --stripesize SizeKB,
OP: PV ...
ID: lvconvert_to_thinpool
DESC: Convert LV to type thin-pool.
+RULE: all and lv_is_visible
+RULE: all not lv_is_locked lv_is_origin lv_is_merging_origin lv_is_external_origin lv_is_virtual
# alternate form of lvconvert --type thin-pool
# deprecated because of non-standard syntax (missing positional arg)
+# Commands in this form are converted to standard form so that
+# the validation of LV types and rules specified above will apply.
lvconvert --thinpool LV_linear_striped_raid_cache
OO: --type thin-pool, --stripes_long Number, --stripesize SizeKB,
--discards Discards, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
OP: PV ...
-ID: lvconvert_to_thinpool
+ID: lvconvert_to_thinpool_noarg
DESC: Convert LV to type thin-pool (variant, use --type thin-pool).
FLAGS: SECONDARY_SYNTAX
@@ -443,10 +453,13 @@ DESC: Convert LV to type cache-pool.
# alternate form of lvconvert --type cache-pool
# deprecated because of non-standard syntax (missing positional arg)
+# Commands in this form are converted to standard form so that
+# the validation of LV types and rules specified above will apply.
lvconvert --cachepool LV_linear_striped_raid
OO: --type cache-pool, OO_LVCONVERT_POOL, OO_LVCONVERT,
--cachemode CacheMode, --cachepolicy String, --cachesettings String
-ID: lvconvert_to_cachepool
+OP: PV ...
+ID: lvconvert_to_cachepool_noarg
DESC: Convert LV to type cache-pool (variant, use --type cache-pool).
FLAGS: SECONDARY_SYNTAX
@@ -461,18 +474,15 @@ DESC: Separate and keep the cache pool from a cache LV.
lvconvert --uncache LV_cache_thinpool
OO: OO_LVCONVERT
-ID: lvconvert_split_and_delete_cachepool
+ID: lvconvert_split_and_remove_cachepool
DESC: Separate and delete the cache pool from a cache LV.
---
-# FIXME: add a new option defining this operation, e.g. --swapmetadata
-
-lvconvert --poolmetadata LV LV_thinpool_cachepool
-OO: OO_LVCONVERT
+lvconvert --swapmetadata --poolmetadata LV LV_thinpool_cachepool
+OO: --chunksize SizeKB, OO_LVCONVERT
ID: lvconvert_swap_pool_metadata
-DESC: Swap metadata LV in a thin pool or cache pool (temporary command).
-FLAGS: SECONDARY_SYNTAX
+DESC: Swap metadata LV in a thin pool or cache pool (for repair only).
---
@@ -879,6 +889,15 @@ DESC: (infers --type thin).
---
+lvconvert --mergethin LV_thin ...
+OO: --background, --interval Number, OO_LVCONVERT
+ID: lvconvert_merge_thin
+DESC: Merge thin LV into its origin LV.
+RULE: all not lv_is_locked lv_is_pvmove lv_is_merging_origin lv_is_virtual_origin lv_is_external_origin lv_is_merging_cow
+RULE: all and lv_is_visible
+
+---
+
# stripes option is not intuitive when creating a thin LV,
# but here it applies to creating the new thin pool that
# is used for the thin LV
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index b7621b5..979d94d 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -17,6 +17,7 @@
#include "polldaemon.h"
#include "lv_alloc.h"
#include "lvconvert_poll.h"
+#include "command-lines-count.h"
/*
* Guidelines for mapping options to operations.
@@ -2051,14 +2052,12 @@ static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volu
return 1;
}
-
-static int _lvconvert_split_cached(struct cmd_context *cmd,
- struct logical_volume *lv)
+static int _lvconvert_split_and_keep_cachepool(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct logical_volume *cachepool_lv)
{
- struct logical_volume *cache_pool_lv = first_seg(lv)->pool_lv;
-
- log_debug("Detaching cache pool %s from cached LV %s.",
- display_lvname(cache_pool_lv), display_lvname(lv));
+ log_debug("Detaching cache pool %s from cache LV %s.",
+ display_lvname(cachepool_lv), display_lvname(lv));
if (!archive(lv->vg))
return_0;
@@ -2072,27 +2071,18 @@ static int _lvconvert_split_cached(struct cmd_context *cmd,
backup(lv->vg);
log_print_unless_silent("Logical volume %s is not cached and cache pool %s is unused.",
- display_lvname(lv), display_lvname(cache_pool_lv));
+ display_lvname(lv), display_lvname(cachepool_lv));
return 1;
}
-static int _lvconvert_uncache(struct cmd_context *cmd,
- struct logical_volume *lv,
- struct lvconvert_params *lp)
+static int _lvconvert_split_and_remove_cachepool(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct logical_volume *cachepool_lv)
{
struct lv_segment *seg;
struct logical_volume *remove_lv;
- if (lv_is_thin_pool(lv))
- lv = seg_lv(first_seg(lv), 0); /* cached _tdata ? */
-
- if (!lv_is_cache(lv)) {
- log_error("Cannot uncache non-cached logical volume %s.",
- display_lvname(lv));
- return 0;
- }
-
seg = first_seg(lv);
if (lv_is_partial(seg_lv(seg, 0))) {
@@ -2113,7 +2103,7 @@ static int _lvconvert_uncache(struct cmd_context *cmd,
/* TODO: Check for failed cache as well to get prompting? */
if (lv_is_partial(lv)) {
if (first_seg(seg->pool_lv)->cache_mode != CACHE_MODE_WRITETHROUGH) {
- if (!lp->force) {
+ if (!arg_count(cmd, force_ARG)) {
log_error("Conversion aborted.");
log_error("Cannot uncache writethrough cache volume %s without --force.",
display_lvname(lv));
@@ -2123,14 +2113,12 @@ static int _lvconvert_uncache(struct cmd_context *cmd,
display_lvname(lv));
}
- if (!lp->yes &&
+ if (!arg_count(cmd, yes_ARG) &&
yes_no_prompt("Do you really want to uncache %s with missing LVs? [y/n]: ",
display_lvname(lv)) == 'n') {
log_error("Conversion aborted.");
return 0;
}
- cmd->handles_missing_pvs = 1;
- cmd->partial_activation = 1;
}
if (lvremove_single(cmd, remove_lv, NULL) != ECMD_PROCESSED)
@@ -2348,8 +2336,7 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd,
}
static int _lvconvert_merge_thin_snapshot(struct cmd_context *cmd,
- struct logical_volume *lv,
- struct lvconvert_params *lp)
+ struct logical_volume *lv)
{
int origin_is_active = 0, r = 0;
struct lv_segment *snap_seg = first_seg(lv);
@@ -2765,6 +2752,144 @@ revert_new_lv:
return 0;
}
+static int _lvconvert_to_thin_with_external(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct logical_volume *thinpool_lv)
+{
+ struct volume_group *vg = lv->vg;
+ struct logical_volume *thin_lv;
+ const char *origin_name;
+
+ struct lvcreate_params lvc = {
+ .activate = CHANGE_AEY,
+ .alloc = ALLOC_INHERIT,
+ .major = -1,
+ .minor = -1,
+ .suppress_zero_warn = 1, /* Suppress warning for this thin */
+ .permission = LVM_READ,
+ .pool_name = thinpool_lv->name,
+ .pvh = &vg->pvs,
+ .read_ahead = DM_READ_AHEAD_AUTO,
+ .stripes = 1,
+ .virtual_extents = lv->le_count,
+ };
+
+ if (lv == thinpool_lv) {
+ log_error("Can't use same LV %s for thin pool and thin volume.",
+ display_lvname(thinpool_lv));
+ return 0;
+ }
+
+ if ((origin_name = arg_str_value(cmd, originname_ARG, NULL)))
+ if (!validate_restricted_lvname_param(cmd, &vg->name, &origin_name))
+ return_0;
+
+ /*
+ * If NULL, an auto-generated 'lvol' name is used.
+ * If set, the lv create code checks the name isn't used.
+ */
+ lvc.lv_name = origin_name;
+
+ if (is_lockd_type(vg->lock_type)) {
+ /*
+ * FIXME: external origins don't work in lockd VGs.
+ * Prior to the lvconvert, there's a lock associated with
+ * the uuid of the external origin LV. After the convert,
+ * that uuid belongs to the new thin LV, and a new LV with
+ * a new uuid exists as the non-thin, readonly external LV.
+ * We'd need to remove the lock for the previous uuid
+ * (the new thin LV will have no lock), and create a new
+ * lock for the new LV uuid used by the external LV.
+ */
+ log_error("Can't use lock_type %s LV as external origin.",
+ vg->lock_type);
+ return 0;
+ }
+
+ dm_list_init(&lvc.tags);
+
+ if (!pool_supports_external_origin(first_seg(thinpool_lv), lv))
+ return_0;
+
+ if (!(lvc.segtype = get_segtype_from_string(cmd, SEG_TYPE_NAME_THIN)))
+ return_0;
+
+ if (!archive(vg))
+ return_0;
+
+ /*
+ * New thin LV needs to be created (all messages sent to pool) In this
+ * case thin volume is created READ-ONLY and also warn about not
+ * zeroing is suppressed.
+ *
+ * The new thin LV is created with the origin_name, or an autogenerated
+ * 'lvol' name. Then the names and ids are swapped between the thin LV
+ * and the original/external LV. So, the thin LV gets the name and id
+ * of the original LV arg, and the original LV arg gets the origin_name
+ * or the autogenerated name.
+ */
+
+ if (!(thin_lv = lv_create_single(vg, &lvc)))
+ return_0;
+
+ if (!deactivate_lv(cmd, thin_lv)) {
+ log_error("Aborting. Unable to deactivate new LV. "
+ "Manual intervention required.");
+ return 0;
+ }
+
+ /*
+ * Crashing till this point will leave plain thin volume
+ * which could be easily removed by the user after i.e. power-off
+ */
+
+ if (!swap_lv_identifiers(cmd, thin_lv, lv)) {
+ stack;
+ goto revert_new_lv;
+ }
+
+ /* Preserve read-write status of original LV here */
+ thin_lv->status |= (lv->status & LVM_WRITE);
+
+ if (!attach_thin_external_origin(first_seg(thin_lv), lv)) {
+ stack;
+ goto revert_new_lv;
+ }
+
+ if (!lv_update_and_reload(thin_lv)) {
+ stack;
+ goto deactivate_and_revert_new_lv;
+ }
+
+ log_print_unless_silent("Converted %s to thin volume with external origin %s.",
+ display_lvname(thin_lv), display_lvname(lv));
+
+ return 1;
+
+deactivate_and_revert_new_lv:
+ if (!swap_lv_identifiers(cmd, thin_lv, lv))
+ stack;
+
+ if (!deactivate_lv(cmd, thin_lv)) {
+ log_error("Unable to deactivate failed new LV. "
+ "Manual intervention required.");
+ return 0;
+ }
+
+ if (!detach_thin_external_origin(first_seg(thin_lv)))
+ return_0;
+
+revert_new_lv:
+ /* FIXME Better to revert to backup of metadata? */
+ if (!lv_remove(thin_lv) || !vg_write(vg) || !vg_commit(vg))
+ log_error("Manual intervention may be required to remove "
+ "abandoned LV(s) before retrying.");
+ else
+ backup(vg);
+
+ return 0;
+}
+
static int _lvconvert_update_pool_params(struct logical_volume *pool_lv,
struct lvconvert_params *lp)
{
@@ -3340,31 +3465,732 @@ revert_new_lv:
#endif
}
+static int _lvconvert_swap_pool_metadata(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct logical_volume *metadata_lv)
+{
+ struct volume_group *vg = lv->vg;
+ struct logical_volume *prev_metadata_lv;
+ struct lv_segment *seg;
+ struct lv_types *lvtype;
+ char meta_name[NAME_LEN];
+ const char *swap_name;
+ uint32_t chunk_size;
+ int is_thinpool;
+ int is_cachepool;
+ int lvt_enum;
+
+ is_thinpool = lv_is_thin_pool(lv);
+ is_cachepool = lv_is_cache_pool(lv);
+ lvt_enum = get_lvt_enum(metadata_lv);
+ lvtype = get_lv_type(lvt_enum);
+
+ if (lvt_enum != striped_LVT && lvt_enum != linear_LVT && lvt_enum != raid_LVT) {
+ log_error("LV %s with type %s cannot be used as a metadata LV.",
+ display_lvname(metadata_lv), lvtype ? lvtype->name : "unknown");
+ return 0;
+ }
+
+ if (!lv_is_visible(metadata_lv)) {
+ log_error("Can't convert internal LV %s.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
+
+ if (lv_is_locked(metadata_lv)) {
+ log_error("Can't convert locked LV %s.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
+
+ if (lv_is_origin(metadata_lv) ||
+ lv_is_merging_origin(metadata_lv) ||
+ lv_is_external_origin(metadata_lv) ||
+ lv_is_virtual(metadata_lv)) {
+ log_error("Pool metadata LV %s is of an unsupported type.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
+
+ /* FIXME cache pool */
+ if (is_thinpool && pool_is_active(lv)) {
+ /* If any volume referencing pool active - abort here */
+ log_error("Cannot convert pool %s with active volumes.",
+ display_lvname(lv));
+ return 0;
+ }
+
+ if ((dm_snprintf(meta_name, sizeof(meta_name), "%s%s", lv->name, is_cachepool ? "_cmeta" : "_tmeta") < 0)) {
+ log_error("Failed to create internal lv names, pool name is too long.");
+ return 0;
+ }
+
+ seg = first_seg(lv);
+
+ /* Normally do NOT change chunk size when swapping */
+
+ if (arg_is_set(cmd, chunksize_ARG)) {
+ chunk_size = arg_uint_value(cmd, chunksize_ARG, 0);
+
+ if ((chunk_size != seg->chunk_size) && !dm_list_empty(&lv->segs_using_this_lv)) {
+ if (arg_count(cmd, force_ARG) == PROMPT) {
+ log_error("Chunk size can be only changed with --force. Conversion aborted.");
+ return 0;
+ }
+
+ if (!validate_pool_chunk_size(cmd, seg->segtype, chunk_size))
+ return_0;
+
+ log_warn("WARNING: Changing chunk size %s to %s for %s pool volume.",
+ display_size(cmd, seg->chunk_size),
+ display_size(cmd, chunk_size),
+ display_lvname(lv));
+
+ /* Ok, user has likely some serious reason for this */
+ if (!arg_count(cmd, yes_ARG) &&
+ yes_no_prompt("Do you really want to change chunk size for %s pool volume? [y/n]: ",
+ display_lvname(lv)) == 'n') {
+ log_error("Conversion aborted.");
+ return 0;
+ }
+ }
+
+ seg->chunk_size = chunk_size;
+ }
+
+ if (!arg_count(cmd, yes_ARG) &&
+ yes_no_prompt("Do you want to swap metadata of %s pool with metadata volume %s? [y/n]: ",
+ display_lvname(lv),
+ display_lvname(metadata_lv)) == 'n') {
+ log_error("Conversion aborted.");
+ return 0;
+ }
+
+ if (!deactivate_lv(cmd, metadata_lv)) {
+ log_error("Aborting. Failed to deactivate %s.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
+
+ if (!archive(vg))
+ return_0;
+
+ /* Swap names between old and new metadata LV */
+
+ if (!detach_pool_metadata_lv(seg, &prev_metadata_lv))
+ return_0;
+
+ swap_name = metadata_lv->name;
+
+ if (!lv_rename_update(cmd, metadata_lv, "pvmove_tmeta", 0))
+ return_0;
+
+ /* Give the previous metadata LV the name of the LV replacing it. */
+
+ if (!lv_rename_update(cmd, prev_metadata_lv, swap_name, 0))
+ return_0;
+
+ /* Rename deactivated metadata LV to have _tmeta suffix */
+
+ if (!lv_rename_update(cmd, metadata_lv, meta_name, 0))
+ return_0;
+
+ if (!attach_pool_metadata_lv(seg, metadata_lv))
+ return_0;
+
+ if (!vg_write(vg) || !vg_commit(vg))
+ return_0;
+
+ backup(vg);
+ return 1;
+}
+
/*
- * Convert origin into a cache LV by attaching a cache pool.
+ * Create a new pool LV, using the lv arg as the data sub LV.
+ * The metadata sub LV is either a new LV created here, or an
+ * existing LV specified by --poolmetadata.
*/
-static int _lvconvert_cache(struct cmd_context *cmd,
- struct logical_volume *origin_lv,
- struct lvconvert_params *lp)
+
+static int _lvconvert_to_pool(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ int to_thinpool,
+ int to_cachepool,
+ struct dm_list *use_pvh)
+{
+ struct volume_group *vg = lv->vg;
+ struct logical_volume *metadata_lv = NULL; /* existing or created */
+ struct logical_volume *data_lv; /* lv arg renamed */
+ struct logical_volume *pool_lv; /* new lv created here */
+ const char *pool_metadata_name; /* user-specified lv name */
+ const char *pool_name; /* name of original lv arg */
+ char meta_name[NAME_LEN]; /* generated sub lv name */
+ char data_name[NAME_LEN]; /* generated sub lv name */
+ struct segment_type *pool_segtype; /* thinpool or cachepool */
+ struct lv_segment *seg;
+ unsigned int target_attr = ~0;
+ unsigned int passed_args = 0;
+ unsigned int activate_pool;
+ unsigned int zero_metadata;
+ uint64_t meta_size;
+ uint32_t meta_extents;
+ uint32_t chunk_size;
+ int chunk_calc;
+ int r = 0;
+
+ /* for handling lvmlockd cases */
+ char *lockd_data_args = NULL;
+ char *lockd_meta_args = NULL;
+ char *lockd_data_name = NULL;
+ char *lockd_meta_name = NULL;
+ struct id lockd_data_id;
+ struct id lockd_meta_id;
+
+
+ if (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) {
+ log_error(INTERNAL_ERROR "LV %s is already a pool.", display_lvname(lv));
+ return 0;
+ }
+
+ pool_segtype = to_cachepool ? get_segtype_from_string(cmd, SEG_TYPE_NAME_CACHE_POOL) :
+ get_segtype_from_string(cmd, SEG_TYPE_NAME_THIN_POOL);
+
+ if (!pool_segtype->ops->target_present(cmd, NULL, &target_attr)) {
+ log_error("%s: Required device-mapper target(s) not detected in your kernel.", pool_segtype->name);
+ return 0;
+ }
+
+ /* Allow to have only thinpool active and restore it's active state. */
+ activate_pool = to_thinpool && lv_is_active(lv);
+
+ /* Wipe metadata_lv by default, but allow skipping this for cache pools. */
+ zero_metadata = to_cachepool ? arg_int_value(cmd, zero_ARG, 1) : 1;
+
+ /* An existing LV needs to have its lock freed once it becomes a data LV. */
+ if (is_lockd_type(vg->lock_type) && lv->lock_args) {
+ lockd_data_args = dm_pool_strdup(cmd->mem, lv->lock_args);
+ lockd_data_name = dm_pool_strdup(cmd->mem, lv->name);
+ memcpy(&lockd_data_id, &lv->lvid.id[1], sizeof(struct id));
+ }
+
+ /*
+ * If an existing LV is to be used as the metadata LV,
+ * verify that it's in a usable state. These checks are
+ * not done by command def rules because this LV is not
+ * processed by process_each_lv.
+ */
+
+ if ((pool_metadata_name = arg_str_value(cmd, poolmetadata_ARG, NULL))) {
+ if (!(metadata_lv = find_lv(vg, pool_metadata_name))) {
+ log_error("Unknown pool metadata LV %s.", pool_metadata_name);
+ return 0;
+ }
+
+ /* An existing LV needs to have its lock freed once it becomes a meta LV. */
+ if (is_lockd_type(vg->lock_type) && metadata_lv->lock_args) {
+ lockd_meta_args = dm_pool_strdup(cmd->mem, metadata_lv->lock_args);
+ lockd_meta_name = dm_pool_strdup(cmd->mem, metadata_lv->name);
+ memcpy(&lockd_meta_id, &metadata_lv->lvid.id[1], sizeof(struct id));
+ }
+
+ if (metadata_lv == lv) {
+ log_error("Can't use same LV for pool data and metadata LV %s.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
+
+ if (!lv_is_visible(metadata_lv)) {
+ log_error("Can't convert internal LV %s.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
+
+ if (lv_is_locked(metadata_lv)) {
+ log_error("Can't convert locked LV %s.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
+
+ if (lv_is_mirror(metadata_lv)) {
+ log_error("Mirror logical volumes cannot be used for pool metadata.");
+ log_print_unless_silent("Try \"%s\" segment type instead.", SEG_TYPE_NAME_RAID1);
+ return 0;
+ }
+
+ /* FIXME Tidy up all these type restrictions. */
+ if (lv_is_cache_type(metadata_lv) ||
+ lv_is_thin_type(metadata_lv) ||
+ lv_is_cow(metadata_lv) || lv_is_merging_cow(metadata_lv) ||
+ lv_is_origin(metadata_lv) || lv_is_merging_origin(metadata_lv) ||
+ lv_is_external_origin(metadata_lv) ||
+ lv_is_virtual(metadata_lv)) {
+ log_error("Pool metadata LV %s is of an unsupported type.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
+ }
+
+ /*
+ * Determine the size of the metadata LV and the chunk size. When an
+ * existing LV is to be used for metadata, this introduces some
+ * constraints/defaults. When chunk_size=0 and/or meta_extents=0 are
+ * passed to the "update params" function, defaults are calculated and
+ * returned.
+ */
+
+ if (arg_is_set(cmd, chunksize_ARG)) {
+ passed_args |= PASS_ARG_CHUNK_SIZE;
+ chunk_size = arg_uint_value(cmd, chunksize_ARG, 0);
+ if (!validate_pool_chunk_size(cmd, pool_segtype, chunk_size))
+ return_0;
+ } else {
+ /* A default will be chosen by the "update" function. */
+ chunk_size = 0;
+ }
+
+ if (arg_is_set(cmd, poolmetadatasize_ARG)) {
+ meta_size = arg_uint64_value(cmd, poolmetadatasize_ARG, UINT64_C(0));
+ meta_extents = extents_from_size(cmd, meta_size, vg->extent_size);
+ passed_args |= PASS_ARG_POOL_METADATA_SIZE;
+ } else if (metadata_lv) {
+ meta_extents = metadata_lv->le_count;
+ passed_args |= PASS_ARG_POOL_METADATA_SIZE;
+ } else {
+ /* A default will be chosen by the "update" function. */
+ meta_extents = 0;
+ }
+
+ /* Tell the "update" function to ignore these, they are handled below. */
+ passed_args |= PASS_ARG_DISCARDS | PASS_ARG_ZERO;
+
+ /*
+ * Validate and/or choose defaults for meta_extents and chunk_size,
+ * this involves some complicated calculations.
+ */
+
+ if (to_cachepool) {
+ if (!update_cache_pool_params(pool_segtype, vg, target_attr,
+ passed_args, lv->le_count,
+ &meta_extents,
+ &chunk_calc,
+ &chunk_size))
+ return_0;
+ } else {
+ if (!update_thin_pool_params(pool_segtype, vg, target_attr,
+ passed_args, lv->le_count,
+ &meta_extents,
+ &chunk_calc,
+ &chunk_size,
+ NULL, NULL))
+ return_0;
+ }
+
+ if ((uint64_t)chunk_size > ((uint64_t)lv->le_count * vg->extent_size)) {
+ log_error("Pool data LV %s is too small (%s) for specified chunk size (%s).",
+ display_lvname(lv),
+ display_size(cmd, (uint64_t)lv->le_count * vg->extent_size),
+ display_size(cmd, chunk_size));
+ return 0;
+ }
+
+ if (metadata_lv && (meta_extents > metadata_lv->le_count)) {
+ log_error("Pool metadata LV %s is too small (%u extents) for required metadata (%u extents).",
+ display_lvname(metadata_lv), metadata_lv->le_count, meta_extents);
+ return 0;
+ }
+
+ log_verbose("Pool metadata extents %u chunk_size %u", meta_extents, chunk_size);
+
+
+ /*
+ * Verify that user wants to use these LVs.
+ */
+
+ log_warn("WARNING: Converting logical volume %s%s%s to %s pool's data%s %s metadata wiping.",
+ display_lvname(lv),
+ metadata_lv ? " and " : "",
+ metadata_lv ? display_lvname(metadata_lv) : "",
+ to_cachepool ? "cache" : "thin",
+ metadata_lv ? " and metadata volumes" : " volume",
+ zero_metadata ? "with" : "WITHOUT");
+
+ if (zero_metadata)
+ log_warn("THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.)");
+ else if (to_cachepool)
+ log_warn("WARNING: Using mismatched cache pool metadata MAY DESTROY YOUR DATA!");
+
+ if (!arg_count(cmd, yes_ARG) &&
+ yes_no_prompt("Do you really want to convert %s%s%s? [y/n]: ",
+ display_lvname(lv),
+ metadata_lv ? " and " : "",
+ metadata_lv ? display_lvname(metadata_lv) : "") == 'n') {
+ log_error("Conversion aborted.");
+ return 0;
+ }
+
+ /*
+ * The internal LV names for pool data/meta LVs.
+ */
+
+ if ((dm_snprintf(meta_name, sizeof(meta_name), "%s%s", lv->name, to_cachepool ? "_cmeta" : "_tmeta") < 0) ||
+ (dm_snprintf(data_name, sizeof(data_name), "%s%s", lv->name, to_cachepool ? "_cdata" : "_tdata") < 0)) {
+ log_error("Failed to create internal lv names, pool name is too long.");
+ return 0;
+ }
+
+ /*
+ * If a new metadata LV needs to be created, collect the settings for
+ * the new LV and create it.
+ *
+ * If an existing LV is used for metadata, deactivate/activate/wipe it.
+ */
+
+ if (!metadata_lv) {
+ uint32_t meta_stripes;
+ uint32_t meta_stripe_size;
+ uint32_t meta_readahead;
+ alloc_policy_t meta_alloc;
+ unsigned meta_stripes_supplied;
+ unsigned meta_stripe_size_supplied;
+
+ if (!get_stripe_params(cmd, get_segtype_from_string(cmd, SEG_TYPE_NAME_STRIPED),
+ &meta_stripes,
+ &meta_stripe_size,
+ &meta_stripes_supplied,
+ &meta_stripe_size_supplied))
+ return_0;
+
+ meta_readahead = arg_uint_value(cmd, readahead_ARG, cmd->default_settings.read_ahead);
+ meta_alloc = (alloc_policy_t) arg_uint_value(cmd, alloc_ARG, ALLOC_INHERIT);
+
+ if (!archive(vg))
+ return_0;
+
+ if (!(metadata_lv = alloc_pool_metadata(lv,
+ meta_name,
+ meta_readahead,
+ meta_stripes,
+ meta_stripe_size,
+ meta_extents,
+ meta_alloc,
+ use_pvh)))
+ return_0;
+ } else {
+ if (!deactivate_lv(cmd, metadata_lv)) {
+ log_error("Aborting. Failed to deactivate %s.",
+ display_lvname(metadata_lv));
+ return 0;
+ }
+
+ if (!archive(vg))
+ return_0;
+
+ if (zero_metadata) {
+ metadata_lv->status |= LV_TEMPORARY;
+ if (!activate_lv_local(cmd, metadata_lv)) {
+ log_error("Aborting. Failed to activate metadata lv.");
+ return 0;
+ }
+
+ if (!wipe_lv(metadata_lv, (struct wipe_params) { .do_zero = 1 })) {
+ log_error("Aborting. Failed to wipe metadata lv.");
+ return 0;
+ }
+ }
+ }
+
+ /*
+ * Deactivate the data LV and metadata LV.
+ * We are changing target type, so deactivate first.
+ */
+
+ if (!deactivate_lv(cmd, metadata_lv)) {
+ log_error("Aborting. Failed to deactivate metadata lv. "
+ "Manual intervention required.");
+ return 0;
+ }
+
+ if (!deactivate_lv(cmd, lv)) {
+ log_error("Aborting. Failed to deactivate logical volume %s.",
+ display_lvname(lv));
+ return 0;
+ }
+
+ /*
+ * When the LV referenced by the original function arg "lv"
+ * is renamed, it is then referenced as "data_lv".
+ *
+ * pool_name pool name taken from lv arg
+ * data_name sub lv name, generated
+ * meta_name sub lv name, generated
+ *
+ * pool_lv new lv for pool object, created here
+ * data_lv sub lv, was lv arg, now renamed
+ * metadata_lv sub lv, existing or created here
+ */
+
+ data_lv = lv;
+ pool_name = lv->name; /* Use original LV name for pool name */
+
+ /*
+ * Rename the original LV arg to the internal data LV naming scheme.
+ *
+ * Since we wish to have underlaying devs to match _[ct]data
+ * rename data LV to match pool LV subtree first,
+ * also checks for visible LV.
+ *
+ * FIXME: any more types prohibited here?
+ */
+
+ if (!lv_rename_update(cmd, data_lv, data_name, 0))
+ return_0;
+
+ /*
+ * Create LV structures for the new pool LV object,
+ * and connect it to the data/meta LVs.
+ */
+
+ if (!(pool_lv = lv_create_empty(pool_name, NULL,
+ (to_cachepool ? CACHE_POOL : THIN_POOL) | VISIBLE_LV | LVM_READ | LVM_WRITE,
+ ALLOC_INHERIT, vg))) {
+ log_error("Creation of pool LV failed.");
+ return 0;
+ }
+
+ /* Allocate a new pool segment */
+ if (!(seg = alloc_lv_segment(pool_segtype, pool_lv, 0, data_lv->le_count,
+ pool_lv->status, 0, NULL, 1,
+ data_lv->le_count, 0, 0, 0, NULL)))
+ return_0;
+
+ /* Add the new segment to the layer LV */
+ dm_list_add(&pool_lv->segments, &seg->list);
+ pool_lv->le_count = data_lv->le_count;
+ pool_lv->size = data_lv->size;
+
+ if (!attach_pool_data_lv(seg, data_lv))
+ return_0;
+
+ /*
+ * Create a new lock for a thin pool LV. A cache pool LV has no lock.
+ * Locks are removed from existing LVs that are being converted to
+ * data and meta LVs (they are unlocked and deleted below.)
+ */
+ if (is_lockd_type(vg->lock_type)) {
+ if (to_cachepool) {
+ data_lv->lock_args = NULL;
+ metadata_lv->lock_args = NULL;
+ } else {
+ data_lv->lock_args = NULL;
+ metadata_lv->lock_args = NULL;
+
+ if (!strcmp(vg->lock_type, "sanlock"))
+ pool_lv->lock_args = "pending";
+ else if (!strcmp(vg->lock_type, "dlm"))
+ pool_lv->lock_args = "dlm";
+ /* The lock_args will be set in vg_write(). */
+ }
+ }
+
+ /*
+ * Apply settings to the new pool seg, from command line, from
+ * defaults, sometimes adjusted.
+ */
+
+ seg->transaction_id = 0;
+ seg->chunk_size = chunk_size;
+
+ if (to_cachepool) {
+ cache_mode_t cache_mode = 0;
+ const char *policy_name = NULL;
+ struct dm_config_tree *policy_settings = NULL;
+
+ if (!get_cache_params(cmd, &cache_mode, &policy_name, &policy_settings))
+ return_0;
+
+ if (cache_mode &&
+ !cache_set_cache_mode(seg, cache_mode))
+ return_0;
+
+ if ((policy_name || policy_settings) &&
+ !cache_set_policy(seg, policy_name, policy_settings))
+ return_0;
+
+ if (policy_settings)
+ dm_config_destroy(policy_settings);
+ } else {
+ const char *discards_name;
+
+ if (arg_is_set(cmd, zero_ARG))
+ seg->zero_new_blocks = arg_int_value(cmd, zero_ARG, 0);
+ else
+ seg->zero_new_blocks = find_config_tree_bool(cmd, allocation_thin_pool_zero_CFG, vg->profile);
+
+ if (arg_is_set(cmd, discards_ARG))
+ seg->discards = (thin_discards_t) arg_uint_value(cmd, discards_ARG, THIN_DISCARDS_PASSDOWN);
+ else {
+ if (!(discards_name = find_config_tree_str(cmd, allocation_thin_pool_discards_CFG, vg->profile)))
+ return_0;
+ if (!set_pool_discards(&seg->discards, discards_name))
+ return_0;
+ }
+ }
+
+ /*
+ * Rename deactivated metadata LV to have _tmeta suffix.
+ * Implicit checks if metadata_lv is visible.
+ */
+ if (pool_metadata_name &&
+ !lv_rename_update(cmd, metadata_lv, meta_name, 0))
+ return_0;
+
+ if (!attach_pool_metadata_lv(seg, metadata_lv))
+ return_0;
+
+ if (!handle_pool_metadata_spare(vg,
+ metadata_lv->le_count,
+ use_pvh,
+ arg_int_value(cmd, poolmetadataspare_ARG, DEFAULT_POOL_METADATA_SPARE)))
+ return_0;
+
+ if (!vg_write(vg) || !vg_commit(vg))
+ return_0;
+
+ if (seg->zero_new_blocks &&
+ seg->chunk_size >= DEFAULT_THIN_POOL_CHUNK_SIZE_PERFORMANCE * 2)
+ log_warn("WARNING: Pool zeroing and large %s chunk size slows down provisioning.",
+ display_size(cmd, seg->chunk_size));
+
+ if (activate_pool && !lockd_lv(cmd, pool_lv, "ex", LDLV_PERSISTENT)) {
+ log_error("Failed to lock pool LV %s.", display_lvname(pool_lv));
+ goto out;
+ }
+
+ if (activate_pool &&
+ !activate_lv_excl(cmd, pool_lv)) {
+ log_error("Failed to activate pool logical volume %s.",
+ display_lvname(pool_lv));
+ /* Deactivate subvolumes */
+ if (!deactivate_lv(cmd, seg_lv(seg, 0)))
+ log_error("Failed to deactivate pool data logical volume %s.",
+ display_lvname(seg_lv(seg, 0)));
+ if (!deactivate_lv(cmd, seg->metadata_lv))
+ log_error("Failed to deactivate pool metadata logical volume %s.",
+ display_lvname(seg->metadata_lv));
+ goto out;
+ }
+
+ r = 1;
+
+out:
+ backup(vg);
+
+ if (r)
+ log_print_unless_silent("Converted %s to %s pool.",
+ display_lvname(lv),
+ to_cachepool ? "cache" : "thin");
+
+ /*
+ * Unlock and free the locks from existing LVs that became pool data
+ * and meta LVs.
+ */
+ if (lockd_data_name) {
+ if (!lockd_lv_name(cmd, vg, lockd_data_name, &lockd_data_id, lockd_data_args, "un", LDLV_PERSISTENT))
+ log_error("Failed to unlock pool data LV %s/%s", vg->name, lockd_data_name);
+ lockd_free_lv(cmd, vg, lockd_data_name, &lockd_data_id, lockd_data_args);
+ }
+
+ if (lockd_meta_name) {
+ if (!lockd_lv_name(cmd, vg, lockd_meta_name, &lockd_meta_id, lockd_meta_args, "un", LDLV_PERSISTENT))
+ log_error("Failed to unlock pool metadata LV %s/%s", vg->name, lockd_meta_name);
+ lockd_free_lv(cmd, vg, lockd_meta_name, &lockd_meta_id, lockd_meta_args);
+ }
+
+ return r;
+#if 0
+revert_new_lv:
+ /* TBD */
+ if (!pool_metadata_lv_name) {
+ if (!deactivate_lv(cmd, metadata_lv)) {
+ log_error("Failed to deactivate metadata lv.");
+ return 0;
+ }
+ if (!lv_remove(metadata_lv) || !vg_write(vg) || !vg_commit(vg))
+ log_error("Manual intervention may be required to remove "
+ "abandoned LV(s) before retrying.");
+ else
+ backup(vg);
+ }
+
+ return 0;
+#endif
+}
+
+/*
+ * Convert origin into a cache LV by attaching a cache pool.
+ */
+static int _lvconvert_cache(struct cmd_context *cmd,
+ struct logical_volume *origin_lv,
+ struct lvconvert_params *lp)
+{
+ struct logical_volume *pool_lv = lp->pool_data_lv;
+ struct logical_volume *cache_lv;
+
+ if (!validate_lv_cache_create_pool(pool_lv))
+ return_0;
+
+ if (!archive(origin_lv->vg))
+ return_0;
+
+ if (!(cache_lv = lv_cache_create(pool_lv, origin_lv)))
+ return_0;
+
+ if (!cache_set_cache_mode(first_seg(cache_lv), lp->cache_mode))
+ return_0;
+
+ if (!cache_set_policy(first_seg(cache_lv), lp->policy_name, lp->policy_settings))
+ return_0;
+
+ cache_check_for_warns(first_seg(cache_lv));
+
+ if (!lv_update_and_reload(cache_lv))
+ return_0;
+
+ log_print_unless_silent("Logical volume %s is now cached.",
+ display_lvname(cache_lv));
+
+ return 1;
+}
+
+static int _lvconvert_to_cache_vol(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct logical_volume *cachepool_lv)
{
- struct logical_volume *pool_lv = lp->pool_data_lv;
struct logical_volume *cache_lv;
+ cache_mode_t cache_mode = 0;
+ const char *policy_name = NULL;
+ struct dm_config_tree *policy_settings = NULL;
- if (!validate_lv_cache_create_pool(pool_lv))
+ if (!validate_lv_cache_create_pool(cachepool_lv))
return_0;
- if (!archive(origin_lv->vg))
+ if (!get_cache_params(cmd, &cache_mode, &policy_name, &policy_settings))
return_0;
- if (!(cache_lv = lv_cache_create(pool_lv, origin_lv)))
+ if (!archive(lv->vg))
return_0;
- if (!cache_set_cache_mode(first_seg(cache_lv), lp->cache_mode))
+ if (!(cache_lv = lv_cache_create(cachepool_lv, lv)))
return_0;
- if (!cache_set_policy(first_seg(cache_lv), lp->policy_name, lp->policy_settings))
+ if (!cache_set_cache_mode(first_seg(cache_lv), cache_mode))
+ return_0;
+
+ if (!cache_set_policy(first_seg(cache_lv), policy_name, policy_settings))
return_0;
+ if (policy_settings)
+ dm_config_destroy(policy_settings);
+
cache_check_for_warns(first_seg(cache_lv));
if (!lv_update_and_reload(cache_lv))
@@ -3420,7 +4246,7 @@ static int _convert_cow_snapshot_merge(struct cmd_context *cmd, struct logical_v
static int _convert_thin_volume_merge(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
- return _lvconvert_merge_thin_snapshot(cmd, lv, lp);
+ return _lvconvert_merge_thin_snapshot(cmd, lv);
}
/*
@@ -3439,7 +4265,8 @@ static int _convert_thin_pool_splitcache(struct cmd_context *cmd, struct logical
return 0;
}
- return _lvconvert_split_cached(cmd, sublv1);
+ /* return _lvconvert_split_cached(cmd, sublv1); */
+ return 0;
}
/*
@@ -3458,7 +4285,8 @@ static int _convert_thin_pool_uncache(struct cmd_context *cmd, struct logical_vo
return 0;
}
- return _lvconvert_uncache(cmd, sublv1, lp);
+ /* return _lvconvert_uncache(cmd, sublv1, lp); */
+ return 0;
}
/*
@@ -3507,7 +4335,8 @@ static int _convert_thin_pool_swapmetadata(struct cmd_context *cmd, struct logic
static int _convert_cache_volume_splitcache(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
- return _lvconvert_split_cached(cmd, lv);
+ /* return _lvconvert_split_cached(cmd, lv); */
+ return 0;
}
/*
@@ -3517,7 +4346,8 @@ static int _convert_cache_volume_splitcache(struct cmd_context *cmd, struct logi
static int _convert_cache_volume_uncache(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
- return _lvconvert_uncache(cmd, lv, lp);
+ /* return _lvconvert_uncache(cmd, lv, lp); */
+ return 0;
}
/*
@@ -3630,7 +4460,8 @@ static int _convert_cache_pool_splitcache(struct cmd_context *cmd, struct logica
return 0;
}
- return _lvconvert_split_cached(cmd, sublv1);
+ /* return _lvconvert_split_cached(cmd, sublv1); */
+ return 0;
}
/*
@@ -5120,3 +5951,449 @@ int lvconvert_start_poll_cmd(struct cmd_context *cmd, int argc, char **argv)
return ret;
}
+static int _lvconvert_to_pool_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct dm_list *use_pvh = NULL;
+ int to_thinpool = 0;
+ int to_cachepool = 0;
+
+ switch (cmd->command->command_line_enum) {
+ case lvconvert_to_thinpool_CMD:
+ to_thinpool = 1;
+ break;
+ case lvconvert_to_cachepool_CMD:
+ to_cachepool = 1;
+ break;
+ default:
+ log_error(INTERNAL_ERROR "Invalid lvconvert pool command");
+ return 0;
+ };
+
+ if (cmd->position_argc > 1) {
+ /* First pos arg is required LV, remaining are optional PVs. */
+ if (!(use_pvh = create_pv_list(cmd->mem, lv->vg, cmd->position_argc - 1, cmd->position_argv + 1, 0)))
+ return_ECMD_FAILED;
+ } else
+ use_pvh = &lv->vg->pvs;
+
+ if (!_lvconvert_to_pool(cmd, lv, to_thinpool, to_cachepool, use_pvh))
+ return_ECMD_FAILED;
+
+ return ECMD_PROCESSED;
+}
+
+/*
+ * The LV position arg is used as thinpool/cachepool data LV.
+ */
+
+int lvconvert_to_pool_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ return process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, NULL, &_lvconvert_to_pool_single);
+}
+
+/*
+ * Reformats non-standard command form into standard command form.
+ *
+ * In the command variants with no position LV arg, the LV arg is taken from
+ * the --thinpool/--cachepool arg, and the position args are modified to match
+ * the standard command form.
+ */
+
+int lvconvert_to_pool_noarg_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ struct command *new_command;
+ char *pool_data_name;
+ int i, p;
+
+ switch (cmd->command->command_line_enum) {
+ case lvconvert_to_thinpool_noarg_CMD:
+ pool_data_name = (char *)arg_str_value(cmd, thinpool_ARG, NULL);
+ new_command = get_command(lvconvert_to_thinpool_CMD);
+ break;
+ case lvconvert_to_cachepool_noarg_CMD:
+ pool_data_name = (char *)arg_str_value(cmd, cachepool_ARG, NULL);
+ new_command = get_command(lvconvert_to_cachepool_CMD);
+ break;
+ default:
+ log_error(INTERNAL_ERROR "Unknown pool conversion.");
+ return 0;
+ };
+
+ log_debug("Changing command line id %s %d to standard form %s %d",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ new_command->command_line_id, new_command->command_line_enum);
+
+ /* Make the LV the first position arg. */
+
+ p = cmd->position_argc;
+ for (i = 0; i < cmd->position_argc; i++)
+ cmd->position_argv[p] = cmd->position_argv[p-1];
+
+ cmd->position_argv[0] = pool_data_name;
+ cmd->position_argc++;
+ cmd->command = new_command;
+
+ return lvconvert_to_pool_cmd(cmd, argc, argv);
+}
+
+static int _lvconvert_to_cache_vol_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct volume_group *vg = lv->vg;
+ struct logical_volume *cachepool_lv;
+ const char *cachepool_name;
+ uint32_t chunk_size = 0;
+
+ if (!(cachepool_name = arg_str_value(cmd, cachepool_ARG, NULL)))
+ goto_out;
+
+ if (!validate_lvname_param(cmd, &vg->name, &cachepool_name))
+ goto_out;
+
+ if (!(cachepool_lv = find_lv(vg, cachepool_name))) {
+ log_error("Cache pool %s not found.", cachepool_name);
+ goto out;
+ }
+
+ /*
+ * If cachepool_lv is not yet a cache pool, convert it to one.
+ * If using an existing cache pool, wipe it.
+ */
+
+ if (!lv_is_cache_pool(cachepool_lv)) {
+ int lvt_enum = get_lvt_enum(cachepool_lv);
+ struct lv_types *lvtype = get_lv_type(lvt_enum);
+
+ if (lvt_enum != striped_LVT && lvt_enum != linear_LVT && lvt_enum != raid_LVT) {
+ log_error("LV %s with type %s cannot be converted to a cache pool.",
+ display_lvname(cachepool_lv), lvtype ? lvtype->name : "unknown");
+ goto out;
+ }
+
+ if (!_lvconvert_to_pool(cmd, cachepool_lv, 0, 1, &vg->pvs)) {
+ log_error("LV %s could not be converted to a cache pool.",
+ display_lvname(cachepool_lv));
+ goto out;
+ }
+
+ if (!(cachepool_lv = find_lv(vg, cachepool_name))) {
+ log_error("LV %s cannot be found.", display_lvname(cachepool_lv));
+ goto out;
+ }
+
+ if (!lv_is_cache_pool(cachepool_lv)) {
+ log_error("LV %s is not a cache pool.", display_lvname(cachepool_lv));
+ goto out;
+ }
+ } else {
+ if (!dm_list_empty(&cachepool_lv->segs_using_this_lv)) {
+ log_error("Cache pool %s is already in use.", cachepool_name);
+ goto out;
+ }
+
+ if (arg_is_set(cmd, chunksize_ARG))
+ chunk_size = arg_uint_value(cmd, chunksize_ARG, 0);
+ if (!chunk_size)
+ chunk_size = first_seg(cachepool_lv)->chunk_size;
+
+ /* FIXME: why is chunk_size read and checked if it's not used? */
+
+ if (!validate_lv_cache_chunk_size(cachepool_lv, chunk_size))
+ goto_out;
+
+ /* Note: requires rather deep know-how to skip zeroing */
+ if (!arg_is_set(cmd, zero_ARG)) {
+ if (!arg_is_set(cmd, yes_ARG) &&
+ yes_no_prompt("Do you want wipe existing metadata of cache pool %s? [y/n]: ",
+ display_lvname(cachepool_lv)) == 'n') {
+ log_error("Conversion aborted.");
+ log_error("To preserve cache metadata add option \"--zero n\".");
+ log_warn("WARNING: Reusing mismatched cache pool metadata MAY DESTROY YOUR DATA!");
+ goto out;
+ }
+ /* Wiping confirmed, go ahead */
+ if (!wipe_cache_pool(cachepool_lv))
+ goto_out;
+ } else if (arg_int_value(cmd, zero_ARG, 0)) {
+ if (!wipe_cache_pool(cachepool_lv))
+ goto_out;
+ } else {
+ log_warn("WARNING: Reusing cache pool metadata %s for volume caching.",
+ display_lvname(cachepool_lv));
+ }
+
+ }
+
+ /* When the lv arg is a thinpool, redirect command to data sub lv. */
+
+ if (lv_is_thin_pool(lv)) {
+ lv = seg_lv(first_seg(lv), 0);
+ log_verbose("Redirecting operation to data sub LV %s.", display_lvname(lv));
+ }
+
+ /* Convert lv to cache vol using cachepool_lv. */
+
+ if (!_lvconvert_to_cache_vol(cmd, lv, cachepool_lv))
+ goto_out;
+
+ return ECMD_PROCESSED;
+
+ out:
+ return ECMD_FAILED;
+}
+
+int lvconvert_to_cache_vol_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ return process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, NULL, &_lvconvert_to_cache_vol_single);
+}
+
+static int _lvconvert_to_thin_with_external_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct volume_group *vg = lv->vg;
+ struct logical_volume *thinpool_lv;
+ const char *thinpool_name;
+
+ if (!(thinpool_name = arg_str_value(cmd, thinpool_ARG, NULL)))
+ goto_out;
+
+ if (!validate_lvname_param(cmd, &vg->name, &thinpool_name))
+ goto_out;
+
+ if (!(thinpool_lv = find_lv(vg, thinpool_name))) {
+ log_error("Thin pool %s not found.", thinpool_name);
+ goto out;
+ }
+
+ /* If thinpool_lv is not yet a thin pool, convert it to one. */
+
+ if (!lv_is_thin_pool(thinpool_lv)) {
+ int lvt_enum = get_lvt_enum(thinpool_lv);
+ struct lv_types *lvtype = get_lv_type(lvt_enum);
+
+ if (lvt_enum != striped_LVT && lvt_enum != linear_LVT && lvt_enum != raid_LVT) {
+ log_error("LV %s with type %s cannot be converted to a thin pool.",
+ display_lvname(thinpool_lv), lvtype ? lvtype->name : "unknown");
+ goto out;
+ }
+
+ if (!_lvconvert_to_pool(cmd, thinpool_lv, 1, 0, &vg->pvs)) {
+ log_error("LV %s could not be converted to a thin pool.",
+ display_lvname(thinpool_lv));
+ goto out;
+ }
+
+ if (!(thinpool_lv = find_lv(vg, thinpool_name))) {
+ log_error("LV %s cannot be found.", display_lvname(thinpool_lv));
+ goto out;
+ }
+
+ if (!lv_is_thin_pool(thinpool_lv)) {
+ log_error("LV %s is not a thin pool.", display_lvname(thinpool_lv));
+ goto out;
+ }
+ }
+
+ /* If lv is a cache volume, all data must be flushed. */
+
+ if (lv_is_cache(lv)) {
+ const struct lv_segment *pool_seg = first_seg(first_seg(lv)->pool_lv);
+ int is_clean;
+
+ if (pool_seg->cache_mode != CACHE_MODE_WRITETHROUGH) {
+ log_error("Cannot convert cache volume %s with %s cache mode to external origin.",
+ display_lvname(lv), get_cache_mode_name(pool_seg));
+ log_error("To proceed, run 'lvchange --cachemode writethrough %s'.",
+ display_lvname(lv));
+ goto out;
+ }
+
+ if (!lv_cache_wait_for_clean(lv, &is_clean))
+ goto_out;
+
+ if (!is_clean) {
+ log_error("Cache %s is not clean, refusing to convert to external origin.",
+ display_lvname(lv));
+ goto out;
+ }
+ }
+
+ /* Convert lv to thin with external origin using thinpool_lv. */
+
+ if (!_lvconvert_to_thin_with_external(cmd, lv, thinpool_lv))
+ goto_out;
+
+ return ECMD_PROCESSED;
+
+ out:
+ return ECMD_FAILED;
+}
+
+int lvconvert_to_thin_with_external_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ return process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, NULL, &_lvconvert_to_thin_with_external_single);
+}
+
+static int _lvconvert_swap_pool_metadata_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct volume_group *vg = lv->vg;
+ struct logical_volume *metadata_lv;
+ const char *metadata_name;
+
+ if (!(metadata_name = arg_str_value(cmd, poolmetadata_ARG, NULL)))
+ goto_out;
+
+ if (!validate_lvname_param(cmd, &vg->name, &metadata_name))
+ goto_out;
+
+ if (!(metadata_lv = find_lv(vg, metadata_name))) {
+ log_error("Metadata LV %s not found.", metadata_name);
+ goto out;
+ }
+
+ if (metadata_lv == lv) {
+ log_error("Can't use same LV for pool data and metadata LV %s.",
+ display_lvname(metadata_lv));
+ goto out;
+ }
+
+ if (!_lvconvert_swap_pool_metadata(cmd, lv, metadata_lv))
+ goto_out;
+
+ return ECMD_PROCESSED;
+
+ out:
+ return ECMD_FAILED;
+}
+
+int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ return process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, NULL, &_lvconvert_swap_pool_metadata_single);
+}
+
+#if 0
+int lvconvert_swap_pool_metadata_noarg_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ struct command *new_command;
+ char *pool_name;
+
+ switch (cmd->command->command_line_enum) {
+ case lvconvert_swap_thinpool_metadata_CMD:
+ pool_name = (char *)arg_str_value(cmd, thinpool_ARG, NULL);
+ break;
+ case lvconvert_swap_cachepool_metadata_CMD:
+ pool_name = (char *)arg_str_value(cmd, cachepool_ARG, NULL);
+ break;
+ default:
+ log_error(INTERNAL_ERROR "Unknown pool conversion.");
+ return 0;
+ };
+
+ new_command = get_command(lvconvert_swap_pool_metadata_CMD);
+
+ log_debug("Changing command line id %s %d to standard form %s %d",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ new_command->command_line_id, new_command->command_line_enum);
+
+ /* Make the LV the first position arg. */
+
+ cmd->position_argv[0] = pool_name;
+ cmd->position_argc++;
+ cmd->command = new_command;
+
+ return lvconvert_swap_pool_metadata_cmd(cmd, argc, argv);
+}
+#endif
+
+static int _lvconvert_merge_thin_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ if (!_lvconvert_merge_thin_snapshot(cmd, lv))
+ return ECMD_FAILED;
+
+ return ECMD_PROCESSED;
+}
+
+int lvconvert_merge_thin_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ return process_each_lv(cmd, cmd->position_argc, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, NULL, &_lvconvert_merge_thin_single);
+}
+
+static int _lvconvert_split_cachepool_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct logical_volume *cache_lv = NULL;
+ struct logical_volume *cachepool_lv = NULL;
+ struct lv_segment *seg;
+ int ret;
+
+ if (lv_is_cache(lv)) {
+ cache_lv = lv;
+ cachepool_lv = first_seg(cache_lv)->pool_lv;
+
+ } else if (lv_is_cache_pool(lv)) {
+ cachepool_lv = lv;
+
+ if ((dm_list_size(&cachepool_lv->segs_using_this_lv) == 1) &&
+ (seg = get_only_segment_using_this_lv(cachepool_lv)) &&
+ seg_is_cache(seg))
+ cache_lv = seg->lv;
+
+ } else if (lv_is_thin_pool(lv)) {
+ cache_lv = seg_lv(first_seg(lv), 0); /* cached _tdata */
+ cachepool_lv = first_seg(cache_lv)->pool_lv;
+ }
+
+ if (!cache_lv) {
+ log_error("Cannot find cache LV from %s.", display_lvname(lv));
+ return ECMD_FAILED;
+ }
+
+ if (!cachepool_lv) {
+ log_error("Cannot find cache pool LV from %s.", display_lvname(lv));
+ return ECMD_FAILED;
+ }
+
+ switch (cmd->command->command_line_enum) {
+ case lvconvert_split_and_keep_cachepool_CMD:
+ ret = _lvconvert_split_and_keep_cachepool(cmd, cache_lv, cachepool_lv);
+ break;
+
+ case lvconvert_split_and_remove_cachepool_CMD:
+ ret = _lvconvert_split_and_remove_cachepool(cmd, cache_lv, cachepool_lv);
+ break;
+ default:
+ log_error(INTERNAL_ERROR "Unknown cache pool split.");
+ ret = 0;
+ }
+
+ if (!ret)
+ return ECMD_FAILED;
+
+ return ECMD_PROCESSED;
+}
+
+int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ if (cmd->command->command_line_enum == lvconvert_split_and_remove_cachepool_CMD) {
+ cmd->handles_missing_pvs = 1;
+ cmd->partial_activation = 1;
+ }
+
+ return process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, NULL, &_lvconvert_split_cachepool_single);
+}
+
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 83deaf1..85fd1b8 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -134,30 +134,29 @@ struct command_function command_functions[COMMAND_ID_COUNT] = {
/* lvconvert utility to trigger polling on an LV. */
{ lvconvert_start_poll_CMD, lvconvert_start_poll_cmd },
+
+ /* lvconvert utilities for creating/maintaining thin and cache objects. */
+ { lvconvert_to_thinpool_CMD, lvconvert_to_pool_cmd },
+ { lvconvert_to_thinpool_noarg_CMD, lvconvert_to_pool_noarg_cmd },
+ { lvconvert_to_cachepool_CMD, lvconvert_to_pool_cmd },
+ { lvconvert_to_cachepool_noarg_CMD, lvconvert_to_pool_noarg_cmd },
+ { lvconvert_to_thin_with_external_CMD, lvconvert_to_thin_with_external_cmd },
+ { lvconvert_to_cache_vol_CMD, lvconvert_to_cache_vol_cmd },
+ { lvconvert_swap_pool_metadata_CMD, lvconvert_swap_pool_metadata_cmd },
+ { lvconvert_merge_thin_CMD, lvconvert_merge_thin_cmd },
+ { lvconvert_split_and_keep_cachepool_CMD, lvconvert_split_cachepool_cmd },
+ { lvconvert_split_and_remove_cachepool_CMD, lvconvert_split_cachepool_cmd },
};
#if 0
/* all raid-related type conversions */
-
{ lvconvert_raid_types_CMD, lvconvert_raid_types_fn },
/* raid-related utilities (move into lvconvert_raid_types?) */
-
{ lvconvert_split_mirror_images_CMD, lvconvert_split_mirror_images_fn },
{ lvconvert_change_mirrorlog_CMD, lvconvert_change_mirrorlog_fn },
- /* utilities for creating/maintaining thin and cache objects. */
-
- { lvconvert_to_thin_with_external_CMD, lvconvert_to_thin_with_external_fn },
- { lvconvert_to_cache_vol_CMD, lvconvert_to_cache_vol_fn },
- { lvconvert_to_thinpool_CMD, lvconvert_to_thinpool_fn },
- { lvconvert_to_cachepool_CMD, lvconvert_to_cachepool_fn },
- { lvconvert_split_and_keep_cachepool_CMD, lvconvert_split_and_keep_cachepool_fn },
- { lvconvert_split_and_delete_cachepool_CMD, lvconvert_split_and_delete_cachepool_fn },
- { lvconvert_swap_pool_metadata_CMD, lvconvert_swap_pool_metadata_fn },
-
- /* other misc. */
-
+ /* directed to one of the other merges (snap,thin,mirror) when all are implemented */
{ lvconvert_merge_CMD, lvconvert_merge_fn },
#endif
@@ -1136,6 +1135,18 @@ struct lv_types *get_lv_type(int lvt_enum)
return &_lv_types[lvt_enum];
}
+struct command *get_command(int cmd_enum)
+{
+ int i;
+
+ for (i = 0; i < COMMAND_COUNT; i++) {
+ if (commands[i].command_line_enum == cmd_enum)
+ return &commands[i];
+ }
+
+ return NULL;
+}
+
/*
* Also see merge_synonym(). The command definitions
* are written using just one variation of the option
diff --git a/tools/toollib.c b/tools/toollib.c
index 13e9b6f..6f9e294 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -2539,7 +2539,7 @@ static int _lv_is_type(struct cmd_context *cmd, struct logical_volume *lv, int l
return 0;
}
-static int _get_lvt_enum(struct logical_volume *lv)
+int get_lvt_enum(struct logical_volume *lv)
{
struct lv_segment *seg = first_seg(lv);
@@ -2700,7 +2700,7 @@ static int _check_lv_types(struct cmd_context *cmd, struct logical_volume *lv, i
ret = _lv_types_match(cmd, lv, cmd->command->required_pos_args[pos-1].def.lvt_bits, NULL, NULL);
if (!ret) {
- int lvt_enum = _get_lvt_enum(lv);
+ int lvt_enum = get_lvt_enum(lv);
struct lv_types *type = get_lv_type(lvt_enum);
log_warn("Operation on LV %s which has invalid type %s.",
display_lvname(lv), type ? type->name : "unknown");
@@ -2723,7 +2723,7 @@ static int _check_lv_rules(struct cmd_context *cmd, struct logical_volume *lv)
int ret = 1;
int i;
- lvt_enum = _get_lvt_enum(lv);
+ lvt_enum = get_lvt_enum(lv);
if (lvt_enum)
lvtype = get_lv_type(lvt_enum);
diff --git a/tools/toollib.h b/tools/toollib.h
index 67e45a2..504721e 100644
--- a/tools/toollib.h
+++ b/tools/toollib.h
@@ -240,4 +240,6 @@ int validate_restricted_lvname_param(struct cmd_context *cmd, const char **vg_na
int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv,
struct processing_handle *handle __attribute__((unused)));
+int get_lvt_enum(struct logical_volume *lv);
+
#endif
diff --git a/tools/tools.h b/tools/tools.h
index a152fcf..f310570 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -241,6 +241,7 @@ int vgchange_background_polling(struct cmd_context *cmd, struct volume_group *vg
struct lv_props *get_lv_prop(int lvp_enum);
struct lv_types *get_lv_type(int lvt_enum);
+struct command *get_command(int cmd_enum);
int lvchange_properties_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvchange_activate_cmd(struct cmd_context *cmd, int argc, char **argv);
@@ -260,4 +261,12 @@ int lvconvert_combine_split_snapshot_cmd(struct cmd_context *cmd, int argc, char
int lvconvert_start_poll_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_to_pool_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_to_pool_noarg_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_to_cache_vol_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_to_thin_with_external_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_swap_pool_metadata_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_merge_thin_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_split_cachepool_cmd(struct cmd_context *cmd, int argc, char **argv);
+
#endif
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d71aaca07b2c1404…
Commit: d71aaca07b2c14049130ab368221510c65236af7
Parent: fa2a728a395639a32707bb75e6bb4197b02769de
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Mon Dec 19 15:38:03 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvconvert: add startpoll command using command def
This is a new explicit version of 'lvconvert LV'
which has been an obscure way of triggering polling
to be restarted on an LV that was previously converted.
---
test/shell/lvconvert-mirror.sh | 21 ++++++--------
tools/args.h | 1 +
tools/command-lines.in | 17 +++++++++---
tools/lvconvert.c | 57 ++++++++++++++++++++++++++++++++++++++++
tools/lvmcmdline.c | 6 +++-
tools/tools.h | 2 +
6 files changed, 86 insertions(+), 18 deletions(-)
diff --git a/test/shell/lvconvert-mirror.sh b/test/shell/lvconvert-mirror.sh
index 1d4fb08..5008f15 100644
--- a/test/shell/lvconvert-mirror.sh
+++ b/test/shell/lvconvert-mirror.sh
@@ -85,12 +85,9 @@ offset=$(( offset + 2 ))
# update in case mirror ever gets faster and allows parallel read
aux delay_dev "$dev2" 0 2000 ${offset}:1
lvcreate -aey -l5 -Zn -Wn --type mirror --regionsize 16K -m2 -n $lv1 $vg "$dev1" "$dev2" "$dev4" "$dev3:$DEVRANGE"
-# FIXME: add a new explicit option to define the polling behavior
-# done here with 'lvconvert vg/lv'. That option can specify
-# that the command succeeds even if the LV doesn't need polling.
should not lvconvert -m-1 $vg/$lv1 "$dev1"
aux enable_dev "$dev2"
-should lvconvert $vg/$lv1 # wait
+lvconvert --startpoll $vg/$lv1 || true # wait
lvconvert -m2 $vg/$lv1 "$dev1" "$dev2" "$dev4" "$dev3:0" # If the above "should" failed...
aux wait_for_sync $vg $lv1
@@ -116,7 +113,7 @@ LVM_TEST_TAG="kill_me_$PREFIX" lvconvert -m+1 -b $vg/$lv1 "$dev4"
# Next convert should fail b/c we can't have 2 at once
should not lvconvert -m+1 $vg/$lv1 "$dev5"
aux enable_dev "$dev4"
-should lvconvert $vg/$lv1 # wait
+lvconvert --startpoll $vg/$lv1 || true # wait
lvconvert -m2 $vg/$lv1 # In case the above "should" actually failed
check mirror $vg $lv1 "$dev3"
@@ -159,7 +156,7 @@ lvcreate -aey -l2 --type mirror -m1 -n $lv1 $vg "$dev1" "$dev2" "$dev3:$DEVRANGE
lvchange -an $vg/$lv1
lvconvert -m+1 $vg/$lv1 "$dev4"
lvchange -aey $vg/$lv1
-should lvconvert $vg/$lv1 # wait
+lvconvert --startpoll $vg/$lv1 || true # wait
check mirror $vg $lv1 "$dev3"
check mirror_no_temporaries $vg $lv1
lvremove -ff $vg
@@ -171,7 +168,7 @@ lvremove -ff $vg
lvcreate -aey -l2 --type mirror -m1 -n $lv1 $vg "$dev1" "$dev2" "$dev3:$DEVRANGE"
LVM_TEST_TAG="kill_me_$PREFIX" lvconvert -m+1 -b $vg/$lv1 "$dev4"
lvconvert -m-1 $vg/$lv1 "$dev4"
-should lvconvert $vg/$lv1 # wait
+lvconvert --startpoll $vg/$lv1 || true # wait
check mirror $vg $lv1 "$dev3"
check mirror_no_temporaries $vg $lv1
@@ -182,7 +179,7 @@ lvremove -ff $vg
lvcreate -aey -l2 --type mirror -m1 -n $lv1 $vg "$dev1" "$dev2" "$dev3:$DEVRANGE"
LVM_TEST_TAG="kill_me_$PREFIX" lvconvert -m+2 -b $vg/$lv1 "$dev4" "$dev5"
lvconvert -m-1 $vg/$lv1 "$dev4"
-should lvconvert $vg/$lv1 # wait
+lvconvert --startpoll $vg/$lv1 || true # wait
check mirror $vg $lv1 "$dev3"
check mirror_no_temporaries $vg $lv1
@@ -195,9 +192,9 @@ LVM_TEST_TAG="kill_me_$PREFIX" lvconvert -m+1 -b $vg/$lv1 "$dev4"
# FIXME: Extra wait here for mirror upconvert synchronization
# otherwise we may fail her on parallel upconvert and downconvert
# lvconvert-mirror-updown.sh tests this errornous case separately
-should lvconvert $vg/$lv1
+lvconvert --startpoll $vg/$lv1 || true
lvconvert -m-1 $vg/$lv1 "$dev2"
-should lvconvert $vg/$lv1
+lvconvert --startpoll $vg/$lv1 || true
check mirror $vg $lv1 "$dev3"
check mirror_no_temporaries $vg $lv1
@@ -210,9 +207,9 @@ LVM_TEST_TAG="kill_me_$PREFIX" lvconvert -m+1 -b $vg/$lv1 "$dev4"
# FIXME: Extra wait here for mirror upconvert synchronization
# otherwise we may fail her on parallel upconvert and downconvert
# lvconvert-mirror-updown.sh tests this errornous case separately
-should lvconvert $vg/$lv1
+lvconvert --startpoll $vg/$lv1 || true
lvconvert -m-1 $vg/$lv1 "$dev2"
-should lvconvert $vg/$lv1
+lvconvert --startpoll $vg/$lv1 || true
check mirror $vg $lv1 "$dev3"
check mirror_no_temporaries $vg $lv1
diff --git a/tools/args.h b/tools/args.h
index a015318..3560c9c 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -118,6 +118,7 @@ arg(splitmirrors_ARG, '\0', "splitmirrors", number_VAL, 0, 0)
arg(splitsnapshot_ARG, '\0', "splitsnapshot", 0, 0, 0)
arg(showdeprecated_ARG, '\0', "showdeprecated", 0, 0, 0)
arg(showunsupported_ARG, '\0', "showunsupported", 0, 0, 0)
+arg(startpoll_ARG, '\0', "startpoll", 0, 0, 0)
arg(stripes_long_ARG, '\0', "stripes", number_VAL, 0, 0)
arg(syncaction_ARG, '\0', "syncaction", syncaction_VAL, 0, 0)
arg(sysinit_ARG, '\0', "sysinit", 0, 0, 0)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 98623a1..4704747 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -592,13 +592,22 @@ RULE: all not lv_is_locked lv_is_pvmove
---
-# FIXME: add a new option defining this operation, e.g. --poll-mirror
-# The purpose of this command is not entirely clear.
+# This command just (re)starts the polling process on the LV
+# to continue a previous conversion.
+lvconvert --startpoll LV_mirror
+OO: OO_LVCONVERT
+ID: lvconvert_start_poll
+DESC: Poll LV to continue conversion.
+RULE: all and lv_is_converting
+
+# alternate form of lvconvert --startpoll, this is only kept
+# for compat since this was how it used to be done.
lvconvert LV_mirror
OO: OO_LVCONVERT
-ID: lvconvert_poll_start
-DESC: Poll mirror LV to collapse resync layers.
+ID: lvconvert_start_poll
+DESC: Poll LV to continue conversion.
+RULE: all and lv_is_converting
FLAGS: SECONDARY_SYNTAX
---
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 9f3a475..b7621b5 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -5063,3 +5063,60 @@ int lvconvert_combine_split_snapshot_cmd(struct cmd_context *cmd, int argc, char
NULL, NULL, &_lvconvert_combine_split_snapshot_single);
}
+static int _lvconvert_start_poll_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct lvconvert_result *lr = (struct lvconvert_result *) handle->custom_handle;
+ struct convert_poll_id_list *idl;
+
+ if (!(idl = _convert_poll_id_list_create(cmd, lv)))
+ return_ECMD_FAILED;
+ dm_list_add(&lr->poll_idls, &idl->list);
+
+ lr->need_polling = 1;
+
+ return ECMD_PROCESSED;
+}
+
+int lvconvert_start_poll_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ struct processing_handle *handle;
+ struct lvconvert_result lr = { 0 };
+ struct convert_poll_id_list *idl;
+ int saved_ignore_suspended_devices;
+ int ret, poll_ret;
+
+ dm_list_init(&lr.poll_idls);
+
+ if (!(handle = init_processing_handle(cmd, NULL))) {
+ log_error("Failed to initialize processing handle.");
+ return ECMD_FAILED;
+ }
+
+ handle->custom_handle = &lr;
+
+ saved_ignore_suspended_devices = ignore_suspended_devices();
+ init_ignore_suspended_devices(1);
+
+ cmd->handles_missing_pvs = 1;
+
+ ret = process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ handle, NULL, &_lvconvert_start_poll_single);
+
+ init_ignore_suspended_devices(saved_ignore_suspended_devices);
+
+ if (lr.need_polling) {
+ dm_list_iterate_items(idl, &lr.poll_idls) {
+ poll_ret = _lvconvert_poll_by_id(cmd, idl->id,
+ arg_is_set(cmd, background_ARG), 0, 0);
+ if (poll_ret > ret)
+ ret = poll_ret;
+ }
+ }
+
+ destroy_processing_handle(cmd, handle);
+
+ return ret;
+}
+
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index e3904d6..83deaf1 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -131,7 +131,11 @@ struct command_function command_functions[COMMAND_ID_COUNT] = {
{ lvconvert_split_cow_snapshot_CMD, lvconvert_split_snapshot_cmd },
{ lvconvert_merge_snapshot_CMD, lvconvert_merge_snapshot_cmd },
{ lvconvert_combine_split_snapshot_CMD, lvconvert_combine_split_snapshot_cmd },
+
+ /* lvconvert utility to trigger polling on an LV. */
+ { lvconvert_start_poll_CMD, lvconvert_start_poll_cmd },
};
+
#if 0
/* all raid-related type conversions */
@@ -155,8 +159,6 @@ struct command_function command_functions[COMMAND_ID_COUNT] = {
/* other misc. */
{ lvconvert_merge_CMD, lvconvert_merge_fn },
- { lvconvert_poll_start_CMD, lvconvert_poll_start_fn },
-
#endif
/* Command line args */
diff --git a/tools/tools.h b/tools/tools.h
index 8ac98e8..a152fcf 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -258,4 +258,6 @@ int lvconvert_merge_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv)
int lvconvert_split_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_combine_split_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_start_poll_cmd(struct cmd_context *cmd, int argc, char **argv);
+
#endif
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fa2a728a395639a3…
Commit: fa2a728a395639a32707bb75e6bb4197b02769de
Parent: 254bffb95d6330662632eda472991b2fc0008d94
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Nov 18 13:16:04 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvconvert: snapshot: use command definitions
Lift all the snapshot utilities (merge, split, combine)
out of the monolithic lvconvert implementation, using
the command definitions. The old code associated with
these commands is now unused and will be removed separately.
---
test/shell/lvconvert-cache-snapshot.sh | 2 +-
.../shell/lvmetad-pvscan-autoactivation-polling.sh | 2 +-
test/shell/snapshot-merge-stack.sh | 2 +-
test/shell/snapshot-merge.sh | 16 +-
test/shell/thin-merge.sh | 2 +-
tools/args.h | 1 +
tools/command-lines.in | 64 +++--
tools/lvconvert.c | 313 +++++++++++++-------
tools/lvmcmdline.c | 11 +-
tools/tools.h | 4 +
10 files changed, 277 insertions(+), 140 deletions(-)
diff --git a/test/shell/lvconvert-cache-snapshot.sh b/test/shell/lvconvert-cache-snapshot.sh
index 8f0ab53..4ecec70 100644
--- a/test/shell/lvconvert-cache-snapshot.sh
+++ b/test/shell/lvconvert-cache-snapshot.sh
@@ -33,7 +33,7 @@ lvcreate -L3 -n cow $vg
not lvconvert -s cow $vg/$lv1
# Use cached LV with 'striped' cow volume
-lvconvert -y -s $vg/$lv1 cow
+lvconvert -y -s $vg/$lv1 $vg/cow
check lv_field $vg/cow segtype linear
check lv_field $vg/$lv1 segtype cache
diff --git a/test/shell/lvmetad-pvscan-autoactivation-polling.sh b/test/shell/lvmetad-pvscan-autoactivation-polling.sh
index 34139df..58afbed 100644
--- a/test/shell/lvmetad-pvscan-autoactivation-polling.sh
+++ b/test/shell/lvmetad-pvscan-autoactivation-polling.sh
@@ -54,7 +54,7 @@ mkdir test_mnt
setup_merge_ $vg1 $lv1
mount "$(lvdev_ $vg1 $lv1)" test_mnt
-lvconvert --merge $vg1/$(snap_lv_name_ $lv1)
+lvconvert --mergesnapshot $vg1/$(snap_lv_name_ $lv1)
umount test_mnt
vgchange -an $vg1
diff --git a/test/shell/snapshot-merge-stack.sh b/test/shell/snapshot-merge-stack.sh
index 2fdfaa4..f9d2e62 100644
--- a/test/shell/snapshot-merge-stack.sh
+++ b/test/shell/snapshot-merge-stack.sh
@@ -32,7 +32,7 @@ snap_and_merge() {
SLEEP_PID=$(aux hold_device_open $vg $lv1 20)
# initiate background merge
- lvconvert -b --merge $vg/$lv2
+ lvconvert -b --mergesnapshot $vg/$lv2
lvs -a -o+lv_merging,lv_merge_failed $vg
get lv_field $vg/$lv1 lv_attr | grep "Owi-ao"
diff --git a/test/shell/snapshot-merge.sh b/test/shell/snapshot-merge.sh
index a301d22..0d3e1cb 100644
--- a/test/shell/snapshot-merge.sh
+++ b/test/shell/snapshot-merge.sh
@@ -51,15 +51,15 @@ mkdir test_mnt
# test full merge of a single LV
setup_merge_ $vg $lv1
-# make sure lvconvert --merge requires explicit LV listing
-not lvconvert --merge
-lvconvert --merge $vg/$(snap_lv_name_ $lv1)
+# make sure lvconvert --mergesnapshot requires explicit LV listing
+not lvconvert --mergesnapshot
+lvconvert --mergesnapshot $vg/$(snap_lv_name_ $lv1)
lvremove -f $vg/$lv1
# test that an actively merging snapshot may not be removed
setup_merge_ $vg $lv1
-lvconvert -i+100 --merge --background $vg/$(snap_lv_name_ $lv1)
+lvconvert -i+100 --mergesnapshot --background $vg/$(snap_lv_name_ $lv1)
not lvremove -f $vg/$(snap_lv_name_ $lv1)
lvremove -f $vg/$lv1
@@ -67,7 +67,7 @@ lvremove -f $vg/$lv1
# "onactivate merge" test
setup_merge_ $vg $lv1
mount "$(lvdev_ $vg $lv1)" test_mnt
-lvconvert --merge $vg/$(snap_lv_name_ $lv1)
+lvconvert --mergesnapshot $vg/$(snap_lv_name_ $lv1)
# -- refresh LV while FS is still mounted (merge must not start),
# verify 'snapshot-origin' target is still being used
lvchange --refresh $vg/$lv1
@@ -88,7 +88,7 @@ lvremove -f $vg/$lv1
# to make sure preload of origin's metadata is _not_ performed
setup_merge_ $vg $lv1
mount "$(lvdev_ $vg $lv1)" test_mnt
-lvconvert --merge $vg/$(snap_lv_name_ $lv1)
+lvconvert --mergesnapshot $vg/$(snap_lv_name_ $lv1)
# -- refresh LV while FS is still mounted (merge must not start),
# verify 'snapshot-origin' target is still being used
lvchange --refresh $vg/$lv1
@@ -99,7 +99,7 @@ lvremove -f $vg/$lv1
# test multiple snapshot merge; tests copy out that is driven by merge
setup_merge_ $vg $lv1 1
-lvconvert --merge $vg/$(snap_lv_name_ $lv1)
+lvconvert --mergesnapshot $vg/$(snap_lv_name_ $lv1)
lvremove -f $vg/$lv1
@@ -108,7 +108,7 @@ setup_merge_ $vg $lv1
setup_merge_ $vg $lv2
lvchange --addtag this_is_a_test $vg/$(snap_lv_name_ $lv1)
lvchange --addtag this_is_a_test $vg/$(snap_lv_name_ $lv2)
-lvconvert --merge @this_is_a_test
+lvconvert --mergesnapshot @this_is_a_test
lvs $vg | tee out
not grep $(snap_lv_name_ $lv1) out
not grep $(snap_lv_name_ $lv2) out
diff --git a/test/shell/thin-merge.sh b/test/shell/thin-merge.sh
index f044f57..b3ad007 100644
--- a/test/shell/thin-merge.sh
+++ b/test/shell/thin-merge.sh
@@ -102,7 +102,7 @@ lvcreate -s -n snap $vg/$lv1
lvcreate -s -L10 -n oldsnapof_${lv1} $vg/$lv1
not lvconvert --merge $vg/snap
$MKFS "$DM_DEV_DIR/$vg/oldsnapof_${lv1}"
-lvconvert --merge $vg/oldsnapof_${lv1}
+lvconvert --mergesnapshot $vg/oldsnapof_${lv1}
fsck -n "$DM_DEV_DIR/$vg/$lv1"
check lv_not_exists $vg oldsnapof_${lv1}
# Add old snapshot to thin snapshot
diff --git a/tools/args.h b/tools/args.h
index 8f5f0ec..a015318 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -60,6 +60,7 @@ arg(locktype_ARG, '\0', "locktype", locktype_VAL, 0, 0)
arg(logonly_ARG, '\0', "logonly", 0, 0, 0)
arg(maxrecoveryrate_ARG, '\0', "maxrecoveryrate", sizekb_VAL, 0, 0)
arg(merge_ARG, '\0', "merge", 0, 0, 0)
+arg(mergesnapshot_ARG, '\0', "mergesnapshot", 0, 0, 0)
arg(mergedconfig_ARG, '\0', "mergedconfig", 0, 0, 0)
arg(metadatacopies_ARG, '\0', "metadatacopies", metadatacopies_VAL, 0, 0)
arg(metadataignore_ARG, '\0', "metadataignore", bool_VAL, 0, 0)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index 597ebc5..98623a1 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -476,9 +476,6 @@ FLAGS: SECONDARY_SYNTAX
---
-# lvconvert utilities related to snapshots and repair.
-# Create a new command set for these and migrate them out of lvconvert?
-
# FIXME: lvconvert --merge is an extremely ambiguous command.
# It can do very different operations, but which one depends
# on knowing the LV type. So, the command doesn't know what
@@ -509,29 +506,61 @@ ID: lvconvert_merge
DESC: Merge LV that was previously split from a mirror.
DESC: Merge thin LV into its origin LV.
DESC: Merge COW snapshot LV into its origin.
-RULE: all not lv_is_merging_origin lv_is_virtual_origin lv_is_external_origin lv_is_merging_cow
+RULE: all not lv_is_locked lv_is_pvmove lv_is_merging_origin lv_is_virtual_origin lv_is_external_origin lv_is_merging_cow
+
+---
+
+# lvconvert snapshot-related utilities
+# Create a new command set for these and migrate them out of lvconvert?
+
+lvconvert --mergesnapshot LV_snapshot ...
+OO: --background, --interval Number, OO_LVCONVERT
+ID: lvconvert_merge_snapshot
+DESC: Merge LV that was previously split from a mirror.
+RULE: all not lv_is_locked lv_is_pvmove lv_is_merging_origin lv_is_virtual_origin lv_is_external_origin lv_is_merging_cow
+RULE: all and lv_is_visible
+
+---
+
+lvconvert --splitsnapshot LV_snapshot
+OO: OO_LVCONVERT
+ID: lvconvert_split_cow_snapshot
+DESC: Separate a COW snapshot from its origin LV.
+RULE: all not lv_is_locked lv_is_pvmove lv_is_origin lv_is_external_origin lv_is_merging_cow
---
-# FIXME: by using two different positional args, this is the
-# single violation of the standard method of using process_each_lv().
-# Before calling process_each, it steals the first positional arg
-# and adjusts argv/argc so it's not seen by process_each.
+# NB: an unsual use of position args here, the first pos arg
+# (will become origin LV) is not passed to process_each,
+# the second pos arg (will become cow LV) is given to
+# process_each. Because the first pos LV is not handled
+# by process_each_lv, it cannot be checked against this
+# command def, so a specific LV type in the first pos
+# will not be checked.
# alternate form of lvconvert --snapshot
-lvconvert --type snapshot LV_linear_striped_raid LV_snapshot
+lvconvert --type snapshot LV LV_linear
OO: --snapshot, --chunksize SizeKB, --zero Bool, OO_LVCONVERT
ID: lvconvert_combine_split_snapshot
-DESC: Combine LV with a previously split snapshot LV.
+DESC: Combine a former COW snapshot (second arg) with a former
+DESC: origin LV (first arg) to reverse a splitsnapshot command.
FLAGS: SECONDARY_SYNTAX
+RULE: all not lv_is_locked lv_is_pvmove
+RULE: all and lv_is_visible
-lvconvert --snapshot LV_linear_striped_raid LV_snapshot
+lvconvert --snapshot LV LV_linear
OO: --type snapshot, --chunksize SizeKB, --zero Bool, OO_LVCONVERT
ID: lvconvert_combine_split_snapshot
-DESC: Combine LV with a previously split snapshot LV.
+DESC: Combine a former COW snapshot (second arg) with a former
+DESC: origin LV (first arg) to reverse a splitsnapshot command.
+RULE: all not lv_is_locked lv_is_pvmove
+RULE: all and lv_is_visible
---
+# lvconvert repair/replace utilitiles
+# Create a new command set for these and migrate them out of lvconvert?
+
# FIXME: use specific option names to distinguish these two
# very different commands, e.g.
#
@@ -552,21 +581,14 @@ OP: PV ...
ID: lvconvert_repair_pvs_or_thinpool
DESC: Replace failed PVs in a raid or mirror LV.
DESC: Repair a thin pool.
-
----
+RULE: all not lv_is_locked lv_is_pvmove
lvconvert --replace PV LV_raid
OO: OO_LVCONVERT
OP: PV ...
ID: lvconvert_replace_pv
DESC: Replace specific PV(s) in a raid* LV with another PV.
-
----
-
-lvconvert --splitsnapshot LV_snapshot
-OO: OO_LVCONVERT
-ID: lvconvert_split_cow_snapshot
-DESC: Separate a COW snapshot from its origin LV.
+RULE: all not lv_is_locked lv_is_pvmove
---
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 1c5c6ff..9f3a475 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1999,37 +1999,16 @@ try_new_takeover_or_reshape:
return 0;
}
-static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volume *cow,
- struct lvconvert_params *lp)
+static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volume *cow)
{
struct volume_group *vg = cow->vg;
const char *cow_name = display_lvname(cow);
- if (!lv_is_cow(cow)) {
- log_error("%s is not a snapshot.", cow_name);
- return 0;
- }
-
- if (lv_is_origin(cow) || lv_is_external_origin(cow)) {
- log_error("Unable to split LV %s that is a snapshot origin.", cow_name);
- return 0;
- }
-
- if (lv_is_merging_cow(cow)) {
- log_error("Unable to split off snapshot %s being merged into its origin.", cow_name);
- return 0;
- }
-
if (lv_is_virtual_origin(origin_from_cow(cow))) {
log_error("Unable to split off snapshot %s with virtual origin.", cow_name);
return 0;
}
- if (lv_is_thin_pool(cow) || lv_is_pool_metadata_spare(cow)) {
- log_error("Unable to split off LV %s needed by thin volume(s).", cow_name);
- return 0;
- }
-
if (!(vg->fid->fmt->features & FMT_MDAS)) {
log_error("Unable to split off snapshot %s using old LVM1-style metadata.", cow_name);
return 0;
@@ -2041,19 +2020,12 @@ static int _lvconvert_splitsnapshot(struct cmd_context *cmd, struct logical_volu
return 0;
}
- if (!vg_check_status(vg, LVM_WRITE))
- return_0;
-
- if (lv_is_pvmove(cow) || lv_is_mirror_type(cow) || lv_is_raid_type(cow) || lv_is_thin_type(cow)) {
- log_error("LV %s type is unsupported with --splitsnapshot.", display_lvname(cow));
- return 0;
- }
-
if (lv_is_active_locally(cow)) {
if (!lv_check_not_in_use(cow, 1))
return_0;
- if ((lp->force == PROMPT) && !lp->yes &&
+ if ((arg_count(cmd, force_ARG) == PROMPT) &&
+ !arg_count(cmd, yes_ARG) &&
lv_is_visible(cow) &&
lv_is_active(cow)) {
if (yes_no_prompt("Do you really want to split off active "
@@ -2172,60 +2144,54 @@ static int _lvconvert_uncache(struct cmd_context *cmd,
static int _lvconvert_snapshot(struct cmd_context *cmd,
struct logical_volume *lv,
- struct lvconvert_params *lp)
+ const char *origin_name)
{
struct logical_volume *org;
const char *snap_name = display_lvname(lv);
+ uint32_t chunk_size;
+ int zero;
- if (lv_is_cache_type(lv)) {
- log_error("Snapshots are not yet supported with cache type LVs %s.",
- snap_name);
- return 0;
- }
-
- if (lv_is_mirrored(lv)) {
- log_error("Unable to convert mirrored LV %s into a snapshot.", snap_name);
+ if (!(org = find_lv(lv->vg, origin_name))) {
+ log_error("Couldn't find origin volume %s in Volume group %s.",
+ origin_name, lv->vg->name);
return 0;
}
- if (lv_is_origin(lv)) {
- /* Unsupported stack */
- log_error("Unable to convert origin %s into a snapshot.", snap_name);
+ if (org == lv) {
+ log_error("Unable to use %s as both snapshot and origin.", snap_name);
return 0;
}
- if (lv_is_pool(lv)) {
- log_error("Unable to convert pool LVs %s into a snapshot.", snap_name);
+ chunk_size = arg_uint_value(cmd, chunksize_ARG, 8);
+ if (chunk_size < 8 || chunk_size > 1024 || !is_power_of_2(chunk_size)) {
+ log_error("Chunk size must be a power of 2 in the range 4K to 512K.");
return 0;
}
+ log_verbose("Setting chunk size to %s.", display_size(cmd, chunk_size));
- if (!(org = find_lv(lv->vg, lp->origin_name))) {
- log_error("Couldn't find origin volume %s in Volume group %s.",
- lp->origin_name, lv->vg->name);
- return 0;
- }
+ if (!cow_has_min_chunks(lv->vg, lv->le_count, chunk_size))
+ return_0;
- if (org == lv) {
- log_error("Unable to use %s as both snapshot and origin.", snap_name);
+ /*
+ * check_lv_rules() checks cannot be done via command definition
+ * rules because this LV is not processed by process_each_lv.
+ */
+ if (lv_is_locked(org) || lv_is_pvmove(org)) {
+ log_error("Unable to use LV %s as snapshot origin: LV is %s.",
+ display_lvname(lv), lv_is_locked(org) ? "locked" : "pvmove");
return 0;
}
- if (!cow_has_min_chunks(lv->vg, lv->le_count, lp->chunk_size))
- return_0;
-
- if (lv_is_locked(org) ||
- (lv_is_cache_type(org) && !lv_is_cache(org)) ||
+ /*
+ * check_lv_types() checks cannot be done via command definition
+ * LV_foo specification because this LV is not processed by process_each_lv.
+ */
+ if ((lv_is_cache_type(org) && !lv_is_cache(org)) ||
lv_is_thin_type(org) ||
- lv_is_pvmove(org) ||
lv_is_mirrored(org) ||
lv_is_cow(org)) {
- log_error("Unable to convert an LV into a snapshot of a %s LV.",
- lv_is_locked(org) ? "locked" :
- lv_is_cache_type(org) ? "cache type" :
- lv_is_thin_type(org) ? "thin type" :
- lv_is_pvmove(org) ? "pvmove" :
- lv_is_mirrored(org) ? "mirrored" :
- "snapshot");
+ log_error("Unable to use LV %s as snapshot origin: invald LV type.",
+ display_lvname(lv));
return 0;
}
@@ -2233,7 +2199,7 @@ static int _lvconvert_snapshot(struct cmd_context *cmd,
snap_name);
log_warn("THIS WILL DESTROY CONTENT OF LOGICAL VOLUME (filesystem etc.)");
- if (!lp->yes &&
+ if (!arg_count(cmd, yes_ARG) &&
yes_no_prompt("Do you really want to convert %s? [y/n]: ",
snap_name) == 'n') {
log_error("Conversion aborted.");
@@ -2245,7 +2211,12 @@ static int _lvconvert_snapshot(struct cmd_context *cmd,
return 0;
}
- if (!lp->zero || !(lv->status & LVM_WRITE))
+ if (first_seg(lv)->segtype->flags & SEG_CANNOT_BE_ZEROED)
+ zero = 0;
+ else
+ zero = arg_int_value(cmd, zero_ARG, 1);
+
+ if (!zero || !(lv->status & LVM_WRITE))
log_warn("WARNING: %s not zeroed.", snap_name);
else {
lv->status |= LV_TEMPORARY;
@@ -2265,7 +2236,7 @@ static int _lvconvert_snapshot(struct cmd_context *cmd,
if (!archive(lv->vg))
return_0;
- if (!vg_add_snapshot(org, lv, NULL, org->le_count, lp->chunk_size)) {
+ if (!vg_add_snapshot(org, lv, NULL, org->le_count, chunk_size)) {
log_error("Couldn't create snapshot.");
return 0;
}
@@ -2281,7 +2252,7 @@ static int _lvconvert_snapshot(struct cmd_context *cmd,
static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd,
struct logical_volume *lv,
- struct lvconvert_params *lp)
+ struct logical_volume **lv_to_poll)
{
int merge_on_activate = 0;
struct logical_volume *origin = origin_from_cow(lv);
@@ -2289,29 +2260,6 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd,
struct lvinfo info;
dm_percent_t snap_percent;
- /* Check if merge is possible */
- if (!lv_is_cow(lv)) {
- log_error("\"%s\" is not a mergeable logical volume.",
- lv->name);
- return 0;
- }
-
- if (lv_is_merging_cow(lv)) {
- log_error("Snapshot %s is already merging.", lv->name);
- return 0;
- }
-
- if (lv_is_merging_origin(origin)) {
- log_error("Snapshot %s is already merging into the origin.",
- find_snapshot(origin)->cow->name);
- return 0;
- }
-
- if (lv_is_virtual_origin(origin)) {
- log_error("Snapshot %s has virtual origin.", lv->name);
- return 0;
- }
-
if (lv_is_external_origin(origin_from_cow(lv))) {
log_error("Cannot merge snapshot \"%s\" into "
"the read-only external origin \"%s\".",
@@ -2375,13 +2323,17 @@ static int _lvconvert_merge_old_snapshot(struct cmd_context *cmd,
if (!lv_update_and_reload(origin))
return_0;
- if (lv_has_target_type(origin->vg->vgmem, origin, NULL,
+ if (!lv_has_target_type(origin->vg->vgmem, origin, NULL,
TARGET_NAME_SNAPSHOT_MERGE)) {
- lp->need_polling = 1;
- lp->lv_to_poll = origin;
- } else
/* Race during table reload prevented merging */
merge_on_activate = 1;
+
+ } else if (!lv_info(cmd, origin, 0, &info, 0, 0) || !info.exists) {
+ log_print_unless_silent("Conversion starts after activation.");
+ merge_on_activate = 1;
+ } else {
+ *lv_to_poll = origin;
+ }
}
if (merge_on_activate)
@@ -3447,7 +3399,7 @@ static int _lvconvert_cache(struct cmd_context *cmd,
static int _convert_cow_snapshot_splitsnapshot(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
- return _lvconvert_splitsnapshot(cmd, lv, lp);
+ return _lvconvert_splitsnapshot(cmd, lv);
}
/*
@@ -3457,7 +3409,7 @@ static int _convert_cow_snapshot_splitsnapshot(struct cmd_context *cmd, struct l
static int _convert_cow_snapshot_merge(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
- return _lvconvert_merge_old_snapshot(cmd, lv, lp);
+ /* return _lvconvert_merge_old_snapshot(cmd, lv, lp); */
}
/*
@@ -3797,7 +3749,7 @@ static int _convert_raid_merge(struct cmd_context *cmd, struct logical_volume *l
static int _convert_raid_snapshot(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
- return _lvconvert_snapshot(cmd, lv, lp);
+ return _lvconvert_snapshot(cmd, lv, lp->origin_name);
}
/*
@@ -3936,7 +3888,7 @@ static int _convert_striped_merge(struct cmd_context *cmd, struct logical_volume
static int _convert_striped_snapshot(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
- return _lvconvert_snapshot(cmd, lv, lp);
+ return _lvconvert_snapshot(cmd, lv, lp->origin_name);
}
/*
@@ -4681,6 +4633,11 @@ struct lvconvert_result {
struct dm_list poll_idls;
};
+
+/*
+ * repair-related lvconvert utilities
+ */
+
static int _lvconvert_repair_pvs_mirror(struct cmd_context *cmd, struct logical_volume *lv,
struct processing_handle *handle,
struct dm_list *use_pvh)
@@ -4878,11 +4835,12 @@ int lvconvert_repair_pvs_or_thinpool_cmd(struct cmd_context *cmd, int argc, char
init_ignore_suspended_devices(saved_ignore_suspended_devices);
if (lr.need_polling) {
- dm_list_iterate_items(idl, &lr.poll_idls)
+ dm_list_iterate_items(idl, &lr.poll_idls) {
poll_ret = _lvconvert_poll_by_id(cmd, idl->id,
arg_is_set(cmd, background_ARG), 0, 0);
- if (poll_ret > ret)
- ret = poll_ret;
+ if (poll_ret > ret)
+ ret = poll_ret;
+ }
}
destroy_processing_handle(cmd, handle);
@@ -4956,3 +4914,152 @@ int lvconvert_replace_pv_cmd(struct cmd_context *cmd, int argc, char **argv)
return ret;
}
+
+/*
+ * snapshot-related lvconvert utilities
+ */
+
+
+/*
+ * Merge a COW snapshot LV into its origin.
+ */
+
+static int _lvconvert_merge_snapshot_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct lvconvert_result *lr = (struct lvconvert_result *) handle->custom_handle;
+ struct logical_volume *lv_to_poll = NULL;
+ struct convert_poll_id_list *idl;
+
+ if (!_lvconvert_merge_old_snapshot(cmd, lv, &lv_to_poll))
+ return_ECMD_FAILED;
+
+ if (lv_to_poll) {
+ if (!(idl = _convert_poll_id_list_create(cmd, lv_to_poll)))
+ return_ECMD_FAILED;
+ dm_list_add(&lr->poll_idls, &idl->list);
+ lr->need_polling = 1;
+ }
+
+ return ECMD_PROCESSED;
+}
+
+int lvconvert_merge_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ struct processing_handle *handle;
+ struct lvconvert_result lr = { 0 };
+ struct convert_poll_id_list *idl;
+ int ret, poll_ret;
+
+ dm_list_init(&lr.poll_idls);
+
+ if (!(handle = init_processing_handle(cmd, NULL))) {
+ log_error("Failed to initialize processing handle.");
+ return ECMD_FAILED;
+ }
+
+ handle->custom_handle = &lr;
+
+ ret = process_each_lv(cmd, cmd->position_argc, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ handle, NULL, &_lvconvert_merge_snapshot_single);
+
+ if (lr.need_polling) {
+ dm_list_iterate_items(idl, &lr.poll_idls) {
+ poll_ret = _lvconvert_poll_by_id(cmd, idl->id,
+ arg_is_set(cmd, background_ARG), 1, 0);
+ if (poll_ret > ret)
+ ret = poll_ret;
+ }
+ }
+
+ destroy_processing_handle(cmd, handle);
+
+ return ret;
+}
+
+/*
+ * Separate a COW snapshot from its origin.
+ *
+ * lvconvert --splitsnapshot LV_snapshot
+ * lvconvert_split_cow_snapshot
+ */
+
+static int _lvconvert_split_snapshot_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ if (!_lvconvert_splitsnapshot(cmd, lv))
+ return_ECMD_FAILED;
+
+ return ECMD_PROCESSED;
+}
+
+int lvconvert_split_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ return process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, NULL, &_lvconvert_split_snapshot_single);
+}
+
+/*
+ * Combine two LVs that were once an origin/cow pair of LVs, were then
+ * separated with --splitsnapshot, and now with this command are combined again
+ * into the origin/cow pair.
+ *
+ * This is an obscure command that has little to no real uses.
+ *
+ * The command has unusual handling of position args. The first position arg
+ * will become the origin LV, and is not processed by process_each_lv. The
+ * second position arg will become the cow LV and is processed by
+ * process_each_lv.
+ *
+ * The single function can grab the origin LV from position_argv[0].
+ *
+ * begin with an ordinary LV foo:
+ * lvcreate -n foo -L 1 vg
+ *
+ * create a cow snapshot of foo named foosnap:
+ * lvcreate -s -L 1 -n foosnap vg/foo
+ *
+ * now, foo is an "origin LV" and foosnap is a "cow LV"
+ * (foosnap matches LV_snapshot aka lv_is_cow)
+ *
+ * split the two LVs apart:
+ * lvconvert --splitsnapshot vg/foosnap
+ *
+ * now, foo is *not* an origin LV and foosnap is *not* a cow LV
+ * (foosnap does not match LV_snapshot)
+ *
+ * now, combine the two LVs again:
+ * lvconvert --snapshot vg/foo vg/foosnap
+ *
+ * after this, foosnap will match LV_snapshot again.
+ *
+ * FIXME: when splitsnapshot is run, the previous cow LV should be
+ * flagged in the metadata somehow, and then that flag should be
+ * required here. As it is now, the first and second args
+ * (origin and cow) can be swapped and nothing catches it.
+ */
+
+static int _lvconvert_combine_split_snapshot_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ const char *origin_name = cmd->position_argv[0];
+
+ /* If origin_name includes VG name, the VG name is removed. */
+ if (!validate_lvname_param(cmd, &lv->vg->name, &origin_name))
+ return_ECMD_FAILED;
+
+ if (!_lvconvert_snapshot(cmd, lv, origin_name))
+ return_ECMD_FAILED;
+
+ return ECMD_PROCESSED;
+}
+
+int lvconvert_combine_split_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ return process_each_lv(cmd, 1, cmd->position_argv + 1, NULL, NULL, READ_FOR_UPDATE,
+ NULL, NULL, &_lvconvert_combine_split_snapshot_single);
+}
+
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 866b2ae..e3904d6 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -123,9 +123,14 @@ struct command_function command_functions[COMMAND_ID_COUNT] = {
{ lvchange_poll_CMD, lvchange_monitor_poll_cmd },
{ lvchange_persistent_CMD, lvchange_persistent_cmd },
- /* lvconvert utilities related to snapshots and repair. */
+ /* lvconvert utilities related to repair. */
{ lvconvert_repair_pvs_or_thinpool_CMD, lvconvert_repair_pvs_or_thinpool_cmd },
{ lvconvert_replace_pv_CMD, lvconvert_replace_pv_cmd },
+
+ /* lvconvert utilities related to snapshots. */
+ { lvconvert_split_cow_snapshot_CMD, lvconvert_split_snapshot_cmd },
+ { lvconvert_merge_snapshot_CMD, lvconvert_merge_snapshot_cmd },
+ { lvconvert_combine_split_snapshot_CMD, lvconvert_combine_split_snapshot_cmd },
};
#if 0
/* all raid-related type conversions */
@@ -147,11 +152,9 @@ struct command_function command_functions[COMMAND_ID_COUNT] = {
{ lvconvert_split_and_delete_cachepool_CMD, lvconvert_split_and_delete_cachepool_fn },
{ lvconvert_swap_pool_metadata_CMD, lvconvert_swap_pool_metadata_fn },
- /* utilities related to snapshots and repair. */
+ /* other misc. */
{ lvconvert_merge_CMD, lvconvert_merge_fn },
- { lvconvert_combine_split_snapshot_CMD, lvconvert_combine_split_snapshot_fn },
- { lvconvert_split_cow_snapshot_CMD, lvconvert_split_cow_snapshot_fn },
{ lvconvert_poll_start_CMD, lvconvert_poll_start_fn },
#endif
diff --git a/tools/tools.h b/tools/tools.h
index 9be1233..8ac98e8 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -254,4 +254,8 @@ int lvchange_persistent_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_repair_pvs_or_thinpool_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvconvert_replace_pv_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_merge_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_split_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_combine_split_snapshot_cmd(struct cmd_context *cmd, int argc, char **argv);
+
#endif
1
0
13 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=254bffb95d633066…
Commit: 254bffb95d6330662632eda472991b2fc0008d94
Parent: 35b9d4d6e9406396c90a75574f04a7018f3d6258
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Nov 17 16:04:59 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvconvert: remove unused calls for repair and replace
repair and replace are no longer called from the
monolithic lvconvert code, so remove the unused code.
---
tools/lvconvert.c | 237 ++--------------------------------------------------
1 files changed, 10 insertions(+), 227 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 79b1525..1c5c6ff 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -67,12 +67,6 @@ typedef enum {
/* Reconstruct a snapshot from its origin and COW */
CONV_SNAPSHOT = 8,
- /* Replace devices in a raid LV with alternatives */
- CONV_REPLACE = 9,
-
- /* Repair a mirror, raid or thin LV */
- CONV_REPAIR = 10,
-
/* Convert normal LV into one in a thin pool */
CONV_THIN = 11,
@@ -90,8 +84,6 @@ struct lvconvert_params {
int cache; /* 6 */
int uncache; /* 7 */
int snapshot; /* 8 */
- int replace; /* 9 */
- int repair; /* 10 */
int thin; /* 11 */
/* other */ /* 12 */
@@ -147,10 +139,6 @@ struct lvconvert_params {
char **pvs;
struct dm_list *pvh;
- int replace_pv_count;
- char **replace_pvs;
- struct dm_list *replace_pvh;
-
struct logical_volume *lv_to_poll;
struct dm_list idls;
@@ -298,7 +286,6 @@ static int _lvconvert_name_params(struct lvconvert_params *lp,
* It is the duty of lvcreate/lvrename to avoid reserved names.
*/
if (!lp->merge_mirror &&
- !lp->repair &&
!lp->keep_mimages &&
!strstr(lp->lv_name, "_tdata") &&
!strstr(lp->lv_name, "_tmeta") &&
@@ -498,9 +485,6 @@ static int _read_pool_params(struct cmd_context *cmd, int *pargc, char ***pargv,
static int _read_params(struct cmd_context *cmd, int argc, char **argv,
struct lvconvert_params *lp)
{
- int i;
- const char *tmp_str;
- struct arg_value_group_list *group;
int region_size;
int pagesize = lvm_getpagesize();
@@ -530,16 +514,6 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
return_0;
lp->merge = 1;
_set_conv_type(lp, CONV_MERGE);
- } else if (arg_is_set(cmd, repair_ARG)) {
- if (arg_outside_list_is_set(cmd, "cannot be used with --repair",
- repair_ARG,
- alloc_ARG, usepolicies_ARG,
- background_ARG, interval_ARG,
- force_ARG, noudevsync_ARG, test_ARG,
- -1))
- return_0;
- lp->repair = 1;
- _set_conv_type(lp, CONV_REPAIR);
} else if (arg_is_set(cmd, split_ARG)) {
if (arg_outside_list_is_set(cmd, "cannot be used with --split",
split_ARG,
@@ -573,9 +547,6 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
return_0;
lp->uncache = 1;
_set_conv_type(lp, CONV_UNCACHE);
- } else if (arg_is_set(cmd, replace_ARG)) {
- lp->replace = 1;
- _set_conv_type(lp, CONV_REPLACE);
}
if (arg_is_set(cmd, cache_ARG)) {
@@ -663,13 +634,13 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
/* If no other case was identified, then use of --stripes means --type striped */
if (!arg_is_set(cmd, type_ARG) && !*lp->type_str && !lp->merge && !lp->splitsnapshot &&
!lp->splitcache && !lp->split && !lp->snapshot && !lp->uncache && !lp->cache && !lp->thin &&
- !lp->replace && !lp->repair && !lp->mirrorlog && !lp->corelog &&
+ !lp->mirrorlog && !lp->corelog &&
(arg_is_set(cmd, stripes_long_ARG) || arg_is_set(cmd, stripesize_ARG)))
lp->type_str = SEG_TYPE_NAME_STRIPED;
if ((_snapshot_type_requested(cmd, lp->type_str) || lp->merge) &&
(lp->mirrorlog || _mirror_or_raid_type_requested(cmd, lp->type_str) ||
- lp->repair || arg_is_set(cmd, thinpool_ARG) || _raid0_type_requested(lp->type_str) ||
+ arg_is_set(cmd, thinpool_ARG) || _raid0_type_requested(lp->type_str) ||
_striped_type_requested(lp->type_str))) {
log_error("--snapshot/--type snapshot or --merge argument "
"cannot be mixed with --mirrors/--type mirror/--type raid*/--stripes/--type striped/--type linear, "
@@ -679,7 +650,7 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
if ((arg_is_set(cmd, stripes_long_ARG) || arg_is_set(cmd, stripesize_ARG)) &&
!(_mirror_or_raid_type_requested(cmd, lp->type_str) || _striped_type_requested(lp->type_str) ||
- _raid0_type_requested(lp->type_str) || lp->repair || arg_is_set(cmd, thinpool_ARG))) {
+ _raid0_type_requested(lp->type_str) || arg_is_set(cmd, thinpool_ARG))) {
log_error("--stripes or --stripesize argument is only valid "
"with --mirrors/--type mirror/--type raid*/--type striped/--type linear, --repair and --thinpool");
return 0;
@@ -696,7 +667,7 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
/* We should have caught all these cases already. */
if (lp->merge + lp->splitsnapshot + lp->splitcache + lp->split + lp->uncache +
- lp->cache + lp->thin + lp->keep_mimages + lp->snapshot + lp->replace + lp->repair > 1) {
+ lp->cache + lp->thin + lp->keep_mimages + lp->snapshot > 1) {
log_error(INTERNAL_ERROR "Unexpected combination of incompatible options selected.");
return 0;
}
@@ -713,8 +684,6 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
* lp->thin
* lp->keep_mimages
* lp->snapshot
- * lp->replace
- * lp->repair
* --type mirror|raid lp->mirrorlog lp->corelog
* --type raid0|striped
*/
@@ -727,7 +696,6 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
case CONV_CACHE:
case CONV_UNCACHE:
case CONV_THIN:
- case CONV_REPAIR:
break;
case CONV_SNAPSHOT: /* Snapshot creation from pre-existing cow */
if (!argc) {
@@ -765,28 +733,6 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
lp->type_str = SEG_TYPE_NAME_SNAPSHOT;
break;
- case CONV_REPLACE: /* 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;
- }
- break;
-
case CONV_OTHER:
if (_mirror_or_raid_type_requested(cmd, lp->type_str) ||
lp->mirrorlog || lp->corelog) { /* Mirrors (and some RAID functions) */
@@ -1315,7 +1261,7 @@ static int _lvconvert_mirrors_parse_params(struct cmd_context *cmd,
*/
if (!lp->mirrors_supplied && !lp->mirrorlog &&
!lp->corelog && !arg_is_set(cmd, regionsize_ARG) &&
- !lp->keep_mimages && !lp->repair) {
+ !lp->keep_mimages) {
*new_mimage_count = *old_mimage_count;
*new_log_count = *old_log_count;
@@ -1820,12 +1766,9 @@ static int _lvconvert_mirrors(struct cmd_context *cmd,
/* Nothing to do? (Probably finishing collapse.) */
if ((old_mimage_count == new_mimage_count) &&
- (old_log_count == new_log_count) && !lp->repair)
+ (old_log_count == new_log_count))
return 1;
- if (lp->repair)
- return _lvconvert_mirrors_repair(cmd, lv, lp, lp->pvh);
-
if (!_lvconvert_mirrors_aux(cmd, lv, lp, NULL,
new_mimage_count, new_log_count, lp->pvh))
return_0;
@@ -1858,33 +1801,6 @@ static int _is_valid_raid_conversion(const struct segment_type *from_segtype,
return 1;
}
-static void _lvconvert_raid_repair_ask(struct cmd_context *cmd,
- struct lvconvert_params *lp,
- int *replace_dev)
-{
- const char *dev_policy;
-
- *replace_dev = 1;
-
- if (arg_is_set(cmd, usepolicies_ARG)) {
- dev_policy = find_config_tree_str(cmd, activation_raid_fault_policy_CFG, NULL);
-
- if (!strcmp(dev_policy, "allocate") ||
- !strcmp(dev_policy, "replace"))
- return;
-
- /* else if (!strcmp(dev_policy, "anything_else")) -- no replace */
- *replace_dev = 0;
- return;
- }
-
- if (!lp->yes &&
- yes_no_prompt("Attempt to replace failed RAID images "
- "(requires full device resync)? [y/n]: ") == 'n') {
- *replace_dev = 0;
- }
-}
-
/* Check for dm-raid target supporting raid4 conversion properly. */
static int _raid4_conversion_supported(struct logical_volume *lv, struct lvconvert_params *lp)
{
@@ -1906,8 +1822,7 @@ static int _raid4_conversion_supported(struct logical_volume *lv, struct lvconve
static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *lp)
{
- int replace = 0, image_count = 0;
- struct dm_list *failed_pvs;
+ int image_count = 0;
struct cmd_context *cmd = lv->vg->cmd;
struct lv_segment *seg = first_seg(lv);
@@ -2013,7 +1928,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
return 1;
}
goto try_new_takeover_or_reshape;
- } else if (!lp->repair && !lp->replace && !arg_is_set(cmd, regionsize_ARG) && (!*lp->type_str || seg->segtype == lp->segtype)) {
+ } else if (!arg_is_set(cmd, regionsize_ARG) && (!*lp->type_str || seg->segtype == lp->segtype)) {
log_error("Conversion operation not yet supported.");
return 0;
}
@@ -2054,52 +1969,6 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
return 1;
}
- if (lp->replace)
- return lv_raid_replace(lv, lp->force, lp->replace_pvh, lp->pvh);
-
- if (lp->repair) {
- if (!lv_is_active_exclusive_locally(lv_lock_holder(lv))) {
- log_error("%s must be active %sto perform this operation.",
- display_lvname(lv),
- vg_is_clustered(lv->vg) ?
- "exclusive locally " : "");
- return 0;
- }
-
- if (seg_is_striped(seg)) {
- log_error("Cannot repair LV %s of type raid0.",
- display_lvname(lv));
- return 0;
- }
-
- if (!lv_check_transient(lv)) /* TODO check this in lib for all commands? */
- stack; /* TODO: break here upon fail or always try to fix it? */
-
- _lvconvert_raid_repair_ask(cmd, lp, &replace);
-
- if (replace) {
- if (!(failed_pvs = _failed_pv_list(lv->vg)))
- return_0;
-
- if (!lv_raid_replace(lv, lp->force, failed_pvs, lp->pvh)) {
- log_error("Failed to replace faulty devices in %s.",
- display_lvname(lv));
- return 0;
- }
-
- log_print_unless_silent("Faulty devices in %s successfully replaced.",
- display_lvname(lv));
- return 1;
- }
-
- /* "warn" if policy not set to replace */
- if (arg_is_set(cmd, usepolicies_ARG))
- log_warn("Use 'lvconvert --repair %s' to replace "
- "failed device.", display_lvname(lv));
- return 1;
- }
-
-
try_new_takeover_or_reshape:
if (!_raid4_conversion_supported(lv, lp))
@@ -3641,16 +3510,6 @@ static int _convert_thin_pool_uncache(struct cmd_context *cmd, struct logical_vo
}
/*
- * Repair a thin pool LV.
- * lvconvert --repair LV
- */
-static int _convert_thin_pool_repair(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- return _lvconvert_thin_pool_repair(cmd, lv, lp->pvh, lp->poolmetadataspare);
-}
-
-/*
* Convert the data portion of a thin pool LV to a cache LV.
* lvconvert --type cache LV
*
@@ -3869,29 +3728,6 @@ static int _convert_mirror_log(struct cmd_context *cmd, struct logical_volume *l
}
/*
- * Replace failed PVs in a mirror LV.
- * lvconvert --repair LV
- *
- * Auxiliary operation:
- * Removes missing, empty PVs from the VG, like vgreduce.
- */
-static int _convert_mirror_repair(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- struct dm_list *failed_pvs;
- int ret;
-
- ret = _lvconvert_mirrors_repair(cmd, lv, lp, lp->pvh);
-
- if (ret && arg_is_set(cmd, usepolicies_ARG)) {
- if ((failed_pvs = _failed_pv_list(lv->vg)))
- _remove_missing_empty_pv(lv->vg, failed_pvs);
- }
-
- return ret;
-}
-
-/*
* Convert mirror LV to linear LV.
* lvconvert --type linear LV
*
@@ -3951,41 +3787,6 @@ static int _convert_raid_merge(struct cmd_context *cmd, struct logical_volume *l
}
/*
- * Replace failed PVs in a raid* LV.
- * lvconvert --repair LV
- *
- * Auxiliary operation:
- * Removes missing, empty PVs from the VG, like vgreduce.
- */
-static int _convert_raid_repair(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- struct dm_list *failed_pvs;
- int ret;
-
- /* FIXME: split the repair section out of _lvconvert_raid and call it here. */
- ret = _lvconvert_raid(lv, lp);
-
- if (ret && arg_is_set(cmd, usepolicies_ARG)) {
- if ((failed_pvs = _failed_pv_list(lv->vg)))
- _remove_missing_empty_pv(lv->vg, failed_pvs);
- }
-
- return ret;
-}
-
-/*
- * Replace a specific PV in a raid* LV with another PV.
- * lvconvert --replace PV LV
- */
-static int _convert_raid_replace(struct cmd_context *cmd, struct logical_volume *lv,
- struct lvconvert_params *lp)
-{
- /* FIXME: remove the replace section from _lvconvert_raid */
- return _lvconvert_raid(lv, lp);
-}
-
-/*
* Combine a raid* LV with a snapshot LV that was previously
* split from the raid* LV using --splitsnapshot.
* lvconvert --type snapshot LV SnapshotLV
@@ -4297,9 +4098,6 @@ static int _convert_thin_pool(struct cmd_context *cmd, struct logical_volume *lv
if (lp->cache)
return _convert_thin_pool_cache(cmd, lv, lp);
- if (lp->repair)
- return _convert_thin_pool_repair(cmd, lv, lp);
-
/* FIXME: swapping the thin pool metadata LV needs a specific option like --swapmetadata */
if (arg_is_set(cmd, poolmetadata_ARG))
return _convert_thin_pool_swapmetadata(cmd, lv, lp);
@@ -4382,9 +4180,6 @@ static int _convert_mirror(struct cmd_context *cmd, struct logical_volume *lv,
if (arg_is_set(cmd, mirrorlog_ARG) || arg_is_set(cmd, corelog_ARG))
return _convert_mirror_log(cmd, lv, lp);
- if (lp->repair)
- return _convert_mirror_repair(cmd, lv, lp);
-
if (_linear_type_requested(lp->type_str))
return _convert_mirror_linear(cmd, lv, lp);
@@ -4454,12 +4249,6 @@ static int _convert_raid(struct cmd_context *cmd, struct logical_volume *lv,
if (arg_is_set(cmd, mirrors_ARG))
return _convert_raid_number(cmd, lv, lp);
- if (lp->repair)
- return _convert_raid_repair(cmd, lv, lp);
-
- if (arg_is_set(cmd, replace_ARG))
- return _convert_raid_replace(cmd, lv, lp);
-
if (arg_is_set(cmd, splitmirrors_ARG))
return _convert_raid_splitmirrors(cmd, lv, lp);
@@ -4648,7 +4437,7 @@ static int _lvconvert(struct cmd_context *cmd, struct logical_volume *lv,
/* Process striping parameters */
/* FIXME This is incomplete */
if (_mirror_or_raid_type_requested(cmd, lp->type_str) || _raid0_type_requested(lp->type_str) ||
- _striped_type_requested(lp->type_str) || lp->repair || lp->mirrorlog || lp->corelog) {
+ _striped_type_requested(lp->type_str) || lp->mirrorlog || lp->corelog) {
/* FIXME Handle +/- adjustments too? */
if (!get_stripe_params(cmd, lp->segtype, &lp->stripes, &lp->stripe_size, &lp->stripes_supplied, &lp->stripe_size_supplied))
goto_out;
@@ -4788,12 +4577,6 @@ static int _lvconvert_single(struct cmd_context *cmd, struct logical_volume *lv,
} else
lp->pvh = &vg->pvs;
- if (lp->replace_pv_count &&
- !(lp->replace_pvh = create_pv_list(cmd->mem, vg,
- lp->replace_pv_count,
- lp->replace_pvs, 0)))
- return_ECMD_FAILED;
-
lp->lv_to_poll = lv;
return _lvconvert_and_add_to_poll_list(cmd, lp, lv);
@@ -4838,7 +4621,7 @@ int lvconvert(struct cmd_context * cmd, int argc, char **argv)
} else {
int saved_ignore_suspended_devices = ignore_suspended_devices();
- if (lp.repair || lp.uncache) {
+ if (lp.uncache) {
init_ignore_suspended_devices(1);
cmd->handles_missing_pvs = 1;
}
1
0
13 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=35b9d4d6e9406396…
Commit: 35b9d4d6e9406396c90a75574f04a7018f3d6258
Parent: 52c60b7e7bba400b2f8fb40f123ca90224c16d27
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Nov 17 15:38:52 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvconvert: repair and replace: use command definitions
This lifts the lvconvert --repair and --replace commands
out of the monolithic lvconvert implementation. The
previous calls into repair/replace can no longer be
reached and will be removed in a separate commit.
---
tools/command-lines.in | 2 +-
tools/lvconvert.c | 337 +++++++++++++++++++++++++++++++++++++++++++++--
tools/lvmcmdline.c | 6 +-
tools/tools.h | 3 +
4 files changed, 330 insertions(+), 18 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index c2995c2..597ebc5 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -547,7 +547,7 @@ DESC: Combine LV with a previously split snapshot LV.
# and the LV type is known.
lvconvert --repair LV_raid_mirror_thinpool
-OO: --usepolicies, OO_LVCONVERT
+OO: --usepolicies, --interval Number, OO_LVCONVERT
OP: PV ...
ID: lvconvert_repair_pvs_or_thinpool
DESC: Replace failed PVs in a raid or mirror LV.
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 132d66d..79b1525 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1421,7 +1421,8 @@ static int _lvconvert_mirrors_aux(struct cmd_context *cmd,
struct lvconvert_params *lp,
struct dm_list *operable_pvs,
uint32_t new_mimage_count,
- uint32_t new_log_count)
+ uint32_t new_log_count,
+ struct dm_list *pvh)
{
uint32_t region_size;
struct lv_segment *seg = first_seg(lv);
@@ -1441,7 +1442,7 @@ static int _lvconvert_mirrors_aux(struct cmd_context *cmd,
vg_is_clustered(lv->vg));
if (!operable_pvs)
- operable_pvs = lp->pvh;
+ operable_pvs = pvh;
/*
* Up-convert from linear to mirror
@@ -1450,7 +1451,7 @@ static int _lvconvert_mirrors_aux(struct cmd_context *cmd,
/* FIXME Share code with lvcreate */
/*
- * FIXME should we give not only lp->pvh, but also all PVs
+ * FIXME should we give not only pvh, but also all PVs
* currently taken by the mirror? Would make more sense from
* user perspective.
*/
@@ -1459,7 +1460,7 @@ static int _lvconvert_mirrors_aux(struct cmd_context *cmd,
lp->alloc, MIRROR_BY_LV))
return_0;
- if (lp->wait_completion)
+ if (!arg_is_set(cmd, background_ARG))
lp->need_polling = 1;
goto out;
@@ -1636,7 +1637,8 @@ int mirror_remove_missing(struct cmd_context *cmd,
*/
static int _lvconvert_mirrors_repair(struct cmd_context *cmd,
struct logical_volume *lv,
- struct lvconvert_params *lp)
+ struct lvconvert_params *lp,
+ struct dm_list *pvh)
{
int failed_logs;
int failed_mimages;
@@ -1647,7 +1649,6 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd,
uint32_t original_mimages = lv_mirror_count(lv);
uint32_t original_logs = _get_log_count(lv);
- cmd->handles_missing_pvs = 1;
cmd->partial_activation = 1;
lp->need_polling = 0;
@@ -1703,7 +1704,7 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd,
while (replace_mimages || replace_logs) {
log_warn("Trying to up-convert to %d images, %d logs.", lp->mirrors, log_count);
if (_lvconvert_mirrors_aux(cmd, lv, lp, NULL,
- lp->mirrors, log_count))
+ lp->mirrors, log_count, pvh))
break;
if (lp->mirrors > 2)
--lp->mirrors;
@@ -1823,10 +1824,10 @@ static int _lvconvert_mirrors(struct cmd_context *cmd,
return 1;
if (lp->repair)
- return _lvconvert_mirrors_repair(cmd, lv, lp);
+ return _lvconvert_mirrors_repair(cmd, lv, lp, lp->pvh);
if (!_lvconvert_mirrors_aux(cmd, lv, lp, NULL,
- new_mimage_count, new_log_count))
+ new_mimage_count, new_log_count, lp->pvh))
return_0;
backup(lv->vg);
@@ -2614,7 +2615,7 @@ out:
static int _lvconvert_thin_pool_repair(struct cmd_context *cmd,
struct logical_volume *pool_lv,
- struct lvconvert_params *lp)
+ struct dm_list *pvh, int poolmetadataspare)
{
const char *dmdir = dm_dir();
const char *thin_dump =
@@ -2643,7 +2644,7 @@ static int _lvconvert_thin_pool_repair(struct cmd_context *cmd,
pmslv = pool_lv->vg->pool_metadata_spare_lv;
/* Check we have pool metadata spare LV */
- if (!handle_pool_metadata_spare(pool_lv->vg, 0, lp->pvh, 1))
+ if (!handle_pool_metadata_spare(pool_lv->vg, 0, pvh, 1))
return_0;
if (pmslv != pool_lv->vg->pool_metadata_spare_lv) {
@@ -2768,8 +2769,7 @@ deactivate_pmslv:
}
/* Try to allocate new pool metadata spare LV */
- if (!handle_pool_metadata_spare(pool_lv->vg, 0, lp->pvh,
- lp->poolmetadataspare))
+ if (!handle_pool_metadata_spare(pool_lv->vg, 0, pvh, poolmetadataspare))
stack;
if (dm_snprintf(meta_path, sizeof(meta_path), "%s_meta%%d", pool_lv->name) < 0) {
@@ -3647,7 +3647,7 @@ static int _convert_thin_pool_uncache(struct cmd_context *cmd, struct logical_vo
static int _convert_thin_pool_repair(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
- return _lvconvert_thin_pool_repair(cmd, lv, lp);
+ return _lvconvert_thin_pool_repair(cmd, lv, lp->pvh, lp->poolmetadataspare);
}
/*
@@ -3881,7 +3881,7 @@ static int _convert_mirror_repair(struct cmd_context *cmd, struct logical_volume
struct dm_list *failed_pvs;
int ret;
- ret = _lvconvert_mirrors_repair(cmd, lv, lp);
+ ret = _lvconvert_mirrors_repair(cmd, lv, lp, lp->pvh);
if (ret && arg_is_set(cmd, usepolicies_ARG)) {
if ((failed_pvs = _failed_pv_list(lv->vg)))
@@ -4866,3 +4866,310 @@ out:
return ret;
}
+
+/*
+ * Below is code that has transitioned to using command defs.
+ * ----------------------------------------------------------
+ *
+ * This code does not use read_params (or any other param reading
+ * functions associated with it), or the lp struct. Those have
+ * been primary vehicles for entangling all the lvconvert operations,
+ * so avoiding them is important for untangling. They were also
+ * heavily used for trying to figure out what the lvconvert operation
+ * was meant to be doing, and that is no longer needed since the
+ * command def provides it.
+ *
+ * All input data is already available from cmd->arg_values and
+ * cmd->position_argv (the --option args in the former, the position
+ * args in the later.) There is no need to copy these values into
+ * another redundant struct of input values which just obfuscates.
+ *
+ * The new lvconvert_result struct, passed via custom_handle, is
+ * used for *returning* data from processing, not for passing data
+ * into processing.
+ */
+
+
+/*
+ * Data/results accumulated during processing.
+ */
+struct lvconvert_result {
+ int need_polling;
+ struct dm_list poll_idls;
+};
+
+static int _lvconvert_repair_pvs_mirror(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle,
+ struct dm_list *use_pvh)
+{
+ struct lvconvert_result *lr = (struct lvconvert_result *) handle->custom_handle;
+ struct lvconvert_params lp = { 0 };
+ struct convert_poll_id_list *idl;
+ struct lvinfo info;
+ int ret;
+
+ /*
+ * FIXME: temporary use of lp because _lvconvert_mirrors_repair()
+ * and _aux() still use lp fields everywhere.
+ * Migrate them away from using lp (for the most part just use
+ * local variables, and check arg_values directly).
+ */
+
+ /*
+ * Fill in any lp fields here that this fn expects to be set before
+ * it's called. It's hard to tell what the old code expects in lp
+ * for repair; it doesn't take the stripes option, but it seems to
+ * expect lp.stripes to be set to 1.
+ */
+ lp.alloc = (alloc_policy_t) arg_uint_value(cmd, alloc_ARG, ALLOC_INHERIT);
+ lp.stripes = 1;
+
+ ret = _lvconvert_mirrors_repair(cmd, lv, &lp, use_pvh);
+
+ if (lp.need_polling) {
+ if (!lv_info(cmd, lv, 0, &info, 0, 0) || !info.exists)
+ log_print_unless_silent("Conversion starts after activation.");
+ else {
+ if (!(idl = _convert_poll_id_list_create(cmd, lv)))
+ return 0;
+ dm_list_add(&lr->poll_idls, &idl->list);
+ }
+ lr->need_polling = 1;
+ }
+
+ return ret;
+}
+
+static void _lvconvert_repair_pvs_raid_ask(struct cmd_context *cmd, int *do_it)
+{
+ const char *dev_policy;
+
+ *do_it = 1;
+
+ if (arg_is_set(cmd, usepolicies_ARG)) {
+ dev_policy = find_config_tree_str(cmd, activation_raid_fault_policy_CFG, NULL);
+
+ if (!strcmp(dev_policy, "allocate") ||
+ !strcmp(dev_policy, "replace"))
+ return;
+
+ /* else if (!strcmp(dev_policy, "anything_else")) -- no replace */
+ *do_it = 0;
+ return;
+ }
+
+ if (!arg_count(cmd, yes_ARG) &&
+ yes_no_prompt("Attempt to replace failed RAID images "
+ "(requires full device resync)? [y/n]: ") == 'n') {
+ *do_it = 0;
+ }
+}
+
+static int _lvconvert_repair_pvs_raid(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle,
+ struct dm_list *use_pvh)
+{
+ struct dm_list *failed_pvs;
+ int do_it;
+
+ if (!lv_is_active_exclusive_locally(lv_lock_holder(lv))) {
+ log_error("%s must be active %sto perform this operation.",
+ display_lvname(lv),
+ vg_is_clustered(lv->vg) ?
+ "exclusive locally " : "");
+ return 0;
+ }
+
+ _lvconvert_repair_pvs_raid_ask(cmd, &do_it);
+
+ if (do_it) {
+ if (!(failed_pvs = _failed_pv_list(lv->vg)))
+ return_0;
+
+ if (!lv_raid_replace(lv, arg_count(cmd, force_ARG), failed_pvs, use_pvh)) {
+ log_error("Failed to replace faulty devices in %s.",
+ display_lvname(lv));
+ return 0;
+ }
+
+ log_print_unless_silent("Faulty devices in %s successfully replaced.",
+ display_lvname(lv));
+ return 1;
+ }
+
+ /* "warn" if policy not set to replace */
+ if (arg_is_set(cmd, usepolicies_ARG))
+ log_warn("Use 'lvconvert --repair %s' to replace "
+ "failed device.", display_lvname(lv));
+ return 1;
+}
+
+static int _lvconvert_repair_pvs(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct dm_list *failed_pvs;
+ struct dm_list *use_pvh;
+ int ret;
+
+ if (cmd->position_argc > 1) {
+ /* First pos arg is required LV, remaining are optional PVs. */
+ if (!(use_pvh = create_pv_list(cmd->mem, lv->vg, cmd->position_argc - 1, cmd->position_argv + 1, 0)))
+ return_ECMD_FAILED;
+ } else
+ use_pvh = &lv->vg->pvs;
+
+ if (lv_is_raid(lv))
+ ret = _lvconvert_repair_pvs_raid(cmd, lv, handle, use_pvh);
+ else if (lv_is_mirror(lv))
+ ret = _lvconvert_repair_pvs_mirror(cmd, lv, handle, use_pvh);
+ else
+ ret = 0;
+
+ if (ret && arg_is_set(cmd, usepolicies_ARG)) {
+ if ((failed_pvs = _failed_pv_list(lv->vg)))
+ _remove_missing_empty_pv(lv->vg, failed_pvs);
+ }
+
+ return ret ? ECMD_PROCESSED : ECMD_FAILED;
+}
+
+static int _lvconvert_repair_thinpool(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ int poolmetadataspare = arg_int_value(cmd, poolmetadataspare_ARG, DEFAULT_POOL_METADATA_SPARE);
+ struct dm_list *use_pvh;
+ int ret;
+
+ if (cmd->position_argc > 1) {
+ /* First pos arg is required LV, remaining are optional PVs. */
+ if (!(use_pvh = create_pv_list(cmd->mem, lv->vg, cmd->position_argc - 1, cmd->position_argv + 1, 0)))
+ return_ECMD_FAILED;
+ } else
+ use_pvh = &lv->vg->pvs;
+
+ ret = _lvconvert_thin_pool_repair(cmd, lv, use_pvh, poolmetadataspare);
+
+ return ret ? ECMD_PROCESSED : ECMD_FAILED;
+}
+
+static int _lvconvert_repair_pvs_or_thinpool_single(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ if (lv_is_thin_pool(lv))
+ return _lvconvert_repair_thinpool(cmd, lv, handle);
+ else if (lv_is_raid(lv) || lv_is_mirror(lv))
+ return _lvconvert_repair_pvs(cmd, lv, handle);
+ else
+ return_ECMD_FAILED;
+}
+
+/*
+ * FIXME: add option --repair-pvs to call _lvconvert_repair_pvs() directly,
+ * and option --repair-thinpool to call _lvconvert_repair_thinpool().
+ */
+int lvconvert_repair_pvs_or_thinpool_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ struct processing_handle *handle;
+ struct lvconvert_result lr = { 0 };
+ struct convert_poll_id_list *idl;
+ int saved_ignore_suspended_devices;
+ int ret, poll_ret;
+
+ dm_list_init(&lr.poll_idls);
+
+ if (!(handle = init_processing_handle(cmd, NULL))) {
+ log_error("Failed to initialize processing handle.");
+ return ECMD_FAILED;
+ }
+
+ handle->custom_handle = &lr;
+
+ saved_ignore_suspended_devices = ignore_suspended_devices();
+ init_ignore_suspended_devices(1);
+
+ cmd->handles_missing_pvs = 1;
+
+ ret = process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ handle, NULL, &_lvconvert_repair_pvs_or_thinpool_single);
+
+ init_ignore_suspended_devices(saved_ignore_suspended_devices);
+
+ if (lr.need_polling) {
+ dm_list_iterate_items(idl, &lr.poll_idls)
+ poll_ret = _lvconvert_poll_by_id(cmd, idl->id,
+ arg_is_set(cmd, background_ARG), 0, 0);
+ if (poll_ret > ret)
+ ret = poll_ret;
+ }
+
+ destroy_processing_handle(cmd, handle);
+
+ return ret;
+}
+
+static int _lvconvert_replace_pv_single(struct cmd_context *cmd, struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct arg_value_group_list *group;
+ const char *tmp_str;
+ struct dm_list *use_pvh;
+ struct dm_list *replace_pvh;
+ char **replace_pvs;
+ int replace_pv_count;
+ int i;
+
+ if (cmd->position_argc > 1) {
+ /* First pos arg is required LV, remaining are optional PVs. */
+ if (!(use_pvh = create_pv_list(cmd->mem, lv->vg, cmd->position_argc - 1, cmd->position_argv + 1, 0)))
+ return_ECMD_FAILED;
+ } else
+ use_pvh = &lv->vg->pvs;
+
+ if (!(replace_pv_count = arg_count(cmd, replace_ARG)))
+ return_ECMD_FAILED;
+
+ if (!(replace_pvs = dm_pool_alloc(cmd->mem, sizeof(char *) * replace_pv_count)))
+ return_ECMD_FAILED;
+
+ 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_ECMD_FAILED;
+ }
+ if (!(replace_pvs[i++] = dm_pool_strdup(cmd->mem, tmp_str)))
+ return_ECMD_FAILED;
+ }
+
+ if (!(replace_pvh = create_pv_list(cmd->mem, lv->vg, replace_pv_count, replace_pvs, 0)))
+ return_ECMD_FAILED;
+
+ if (!lv_raid_replace(lv, arg_count(cmd, force_ARG), replace_pvh, use_pvh))
+ return_ECMD_FAILED;
+
+ return ECMD_PROCESSED;
+}
+
+int lvconvert_replace_pv_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ struct processing_handle *handle;
+ struct lvconvert_result lr = { 0 };
+ int ret;
+
+ if (!(handle = init_processing_handle(cmd, NULL))) {
+ log_error("Failed to initialize processing handle.");
+ return ECMD_FAILED;
+ }
+
+ handle->custom_handle = &lr;
+
+ ret = process_each_lv(cmd, 1, cmd->position_argv, NULL, NULL, READ_FOR_UPDATE,
+ handle, NULL, &_lvconvert_replace_pv_single);
+
+ destroy_processing_handle(cmd, handle);
+
+ return ret;
+}
+
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index d1613e1..866b2ae 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -122,6 +122,10 @@ struct command_function command_functions[COMMAND_ID_COUNT] = {
{ lvchange_monitor_CMD, lvchange_monitor_poll_cmd },
{ lvchange_poll_CMD, lvchange_monitor_poll_cmd },
{ lvchange_persistent_CMD, lvchange_persistent_cmd },
+
+ /* lvconvert utilities related to snapshots and repair. */
+ { lvconvert_repair_pvs_or_thinpool_CMD, lvconvert_repair_pvs_or_thinpool_cmd },
+ { lvconvert_replace_pv_CMD, lvconvert_replace_pv_cmd },
};
#if 0
/* all raid-related type conversions */
@@ -147,8 +151,6 @@ struct command_function command_functions[COMMAND_ID_COUNT] = {
{ lvconvert_merge_CMD, lvconvert_merge_fn },
{ lvconvert_combine_split_snapshot_CMD, lvconvert_combine_split_snapshot_fn },
- { lvconvert_repair_pvs_or_thinpool_CMD, lvconvert_repair_pvs_or_thinpool_fn },
- { lvconvert_replace_pv_CMD, lvconvert_replace_pv_fn },
{ lvconvert_split_cow_snapshot_CMD, lvconvert_split_cow_snapshot_fn },
{ lvconvert_poll_start_CMD, lvconvert_poll_start_fn },
diff --git a/tools/tools.h b/tools/tools.h
index c42119c..9be1233 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -251,4 +251,7 @@ int lvchange_rebuild_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvchange_monitor_poll_cmd(struct cmd_context *cmd, int argc, char **argv);
int lvchange_persistent_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_repair_pvs_or_thinpool_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvconvert_replace_pv_cmd(struct cmd_context *cmd, int argc, char **argv);
+
#endif
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=52c60b7e7bba400b…
Commit: 52c60b7e7bba400b2f8fb40f123ca90224c16d27
Parent: 9c6c55c314199a9ba26fe1b864306b2ca8a8dbcd
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Wed Nov 16 16:05:47 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvchange: make use of command definitions
Reorganize the lvchange code to take advantage of
the command definition, and remove the validation
that is done by the command definintion rules.
---
tools/command-lines.in | 16 +-
tools/lvchange.c | 848 +++++++++++++++++++++++-------------------------
tools/lvmcmdline.c | 9 +
tools/tools.h | 9 +
4 files changed, 430 insertions(+), 452 deletions(-)
diff --git a/tools/command-lines.in b/tools/command-lines.in
index b54f851..c2995c2 100644
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -239,8 +239,12 @@ OO_LVCHANGE_META: --addtag Tag, --deltag Tag,
--minrecoveryrate SizeKB, --maxrecoveryrate SizeKB,
--writebehind Number, --writemostly WriteMostlyPV, --persistent n
+# It's unfortunate that activate needs to be optionally allowed here;
+# it should only be used explicitly, but it's been previously allowed
+# in combination with unrelated metadata changes.
+
lvchange OO_LVCHANGE_META VG|LV|Tag|Select ...
-OO: OO_LVCHANGE
+OO: --activate Active, OO_LVCHANGE
ID: lvchange_properties
DESC: Change a general LV property.
RULE: all not lv_is_pvmove lv_is_mirror_log lv_is_mirror_image
@@ -256,8 +260,11 @@ RULE: --permission not lv_is_external_origin lv_is_raid_metadata lv_is_raid_imag
RULE: --alloc --contiguous --metadataprofile --permission --persistent --profile --readahead not lv_is_thick_origin
RULE: --alloc --discards --zero --cachemode --cachepolicy --cachesettings not lv_is_partial
+# It's unfortunate that acativate needs to be optionally allowed here,
+# like above, it was previouly allowed in combination.
+
lvchange --resync VG|LV_raid_mirror|Tag|Select ...
-OO: OO_LVCHANGE
+OO: --activate Active, OO_LVCHANGE
ID: lvchange_resync
DESC: Resyncronize a mirror or raid LV.
RULE: all not lv_is_pvmove lv_is_locked
@@ -275,15 +282,14 @@ ID: lvchange_rebuild
DESC: Reconstruct data on specific PVs of a raid LV.
RULE: all not LV_raid0
-# try removing the META change options from here?
lvchange --activate Active VG|LV|Tag|Select ...
OO: --activationmode ActivationMode, --partial, --ignoreactivationskip,
---ignorelockingfailure, --sysinit, OO_LVCHANGE_META, OO_LVCHANGE
+--ignorelockingfailure, --sysinit, OO_LVCHANGE
ID: lvchange_activate
DESC: Activate or deactivate an LV.
lvchange --refresh VG|LV|Tag|Select ...
-OO: --partial, OO_LVCHANGE
+OO: --partial, --poll Bool, OO_LVCHANGE
ID: lvchange_refresh
DESC: Reactivate an LV using the latest metadata.
diff --git a/tools/lvchange.c b/tools/lvchange.c
index d75a8ec..b75d058 100644
--- a/tools/lvchange.c
+++ b/tools/lvchange.c
@@ -25,12 +25,6 @@ static int _lvchange_permission(struct cmd_context *cmd,
lv_access = arg_uint_value(cmd, permission_ARG, 0);
- if (lv_is_external_origin(lv)) {
- log_error("Cannot change permissions of external origin %s.",
- display_lvname(lv));
- return 0;
- }
-
if (!(lv_access & LVM_WRITE) && !(lv->status & LVM_WRITE)) {
/* Refresh if it's read-only in metadata but read-write in kernel */
if (lv_info(cmd, lv, 0, &info, 0, 0) && info.exists && !info.read_only) {
@@ -63,20 +57,6 @@ static int _lvchange_permission(struct cmd_context *cmd,
return 0;
}
- /* Not allowed to change permissions on RAID sub-LVs directly */
- if (lv_is_raid_metadata(lv) || lv_is_raid_image(lv)) {
- log_error("Cannot change permissions of RAID %s %s.",
- lv_is_raid_image(lv) ? "image" : "metadata area",
- display_lvname(lv));
- return 0;
- }
-
- if (!(lv_access & LVM_WRITE) && lv_is_thin_pool(lv)) {
- log_error("Change permissions of thin pool %s not yet supported.",
- display_lvname(lv));
- return 0;
- }
-
if (lv_access & LVM_WRITE) {
lv->status |= LVM_WRITE;
log_verbose("Setting logical volume %s read/write.",
@@ -100,12 +80,6 @@ static int _lvchange_pool_update(struct cmd_context *cmd,
unsigned val;
thin_discards_t discards;
- if (!lv_is_thin_pool(lv)) {
- log_error("Logical volume %s is not a thin pool.",
- display_lvname(lv));
- return 0;
- }
-
if (arg_is_set(cmd, discards_ARG)) {
discards = (thin_discards_t) arg_uint_value(cmd, discards_ARG, THIN_DISCARDS_IGNORE);
if (discards != first_seg(lv)->discards) {
@@ -153,10 +127,6 @@ static int _lvchange_monitoring(struct cmd_context *cmd,
return 0;
}
- /* do not monitor pvmove lv's */
- if (lv_is_pvmove(lv))
- return 1;
-
if ((dmeventd_monitor_mode() != DMEVENTD_MONITOR_IGNORE) &&
!monitor_dev_for_events(cmd, lv, 0, dmeventd_monitor_mode()))
return_0;
@@ -280,20 +250,6 @@ static int attach_metadata_devices(struct lv_segment *seg, struct dm_list *list)
return 1;
}
-/*
- * lvchange_refresh
- * @cmd
- * @lv
- *
- * Suspend and resume a logical volume.
- */
-static int _lvchange_refresh(struct cmd_context *cmd, struct logical_volume *lv)
-{
- log_verbose("Refreshing logical volume %s (if active).", display_lvname(lv));
-
- return lv_refresh(cmd, lv);
-}
-
static int _reactivate_lv(struct logical_volume *lv,
int active, int exclusive)
{
@@ -326,23 +282,6 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv)
dm_list_init(&device_list);
- if (seg_is_any_raid0(seg) ||
- (!seg_is_mirror(seg) && !seg_is_raid(seg))) {
- log_error("Unable to resync %s. It is not RAID4/5/6/10 or mirrored.",
- display_lvname(lv));
- return 0;
- }
-
- if (lv_is_pvmove(lv)) {
- log_error("Unable to resync pvmove volume %s.", display_lvname(lv));
- return 0;
- }
-
- if (lv_is_locked(lv)) {
- log_error("Unable to resync locked volume %s.", display_lvname(lv));
- return 0;
- }
-
if (lv_is_active_locally(lv)) {
if (!lv_check_not_in_use(lv, 1)) {
log_error("Can't resync open logical volume %s.",
@@ -691,15 +630,6 @@ static int _lvchange_cache(struct cmd_context *cmd, struct logical_volume *lv)
if (lv_is_cache(lv))
pool_seg = first_seg(pool_seg->pool_lv);
- else if (!lv_is_cache_pool(lv)) {
- log_error("LV %s is not a cache LV.", display_lvname(lv));
- (void) arg_from_list_is_set(cmd, "is supported only with cache or cache pool LVs",
- cachemode_ARG,
- cachepolicy_ARG,
- cachesettings_ARG,
- -1);
- goto out;
- }
if (!get_cache_params(cmd, &mode, &name, &settings))
goto_out;
@@ -759,12 +689,6 @@ static int _lvchange_rebuild(struct logical_volume *lv)
struct arg_value_group_list *group;
struct volume_group *vg = lv->vg;
struct cmd_context *cmd = vg->cmd;
- struct lv_segment *raid_seg = first_seg(lv);
-
- if (!seg_is_raid(raid_seg) || seg_is_any_raid0(raid_seg)) {
- log_error("--rebuild can only be used with 'raid4/5/6/10' segment types.");
- return 0;
- }
if (!(pv_count = arg_count(cmd, rebuild_ARG))) {
log_error("No --rebuild found!");
@@ -815,12 +739,6 @@ static int _lvchange_writemostly(struct logical_volume *lv)
struct cmd_context *cmd = lv->vg->cmd;
struct lv_segment *raid_seg = first_seg(lv);
- if (!seg_is_raid1(raid_seg)) {
- log_error("--write%s can only be used with 'raid1' segment type.",
- arg_is_set(cmd, writemostly_ARG) ? "mostly" : "behind");
- return 0;
- }
-
if (arg_is_set(cmd, writebehind_ARG))
raid_seg->writebehind = arg_uint_value(cmd, writebehind_ARG, 0);
@@ -909,12 +827,6 @@ static int _lvchange_recovery_rate(struct logical_volume *lv)
struct cmd_context *cmd = lv->vg->cmd;
struct lv_segment *raid_seg = first_seg(lv);
- if (!seg_is_raid(raid_seg)) {
- log_error("Unable to change the recovery rate of non-RAID "
- "logical volume %s.", display_lvname(lv));
- return 0;
- }
-
if (arg_is_set(cmd, minrecoveryrate_ARG))
raid_seg->min_recovery_rate =
arg_uint_value(cmd, minrecoveryrate_ARG, 0) / 2;
@@ -982,114 +894,194 @@ static int _lvchange_activation_skip(struct logical_volume *lv)
return 1;
}
+/*
+ * For each lvchange command definintion:
+ *
+ * lvchange_foo_cmd(cmd, argc, argv);
+ * . set cmd fields that apply to "foo"
+ * . set any other things that affect behavior of process_each
+ * . process_each_lv(_lvchange_foo_single);
+ *
+ * _lvchange_foo_single(lv);
+ * . _lvchange_foo(lv);
+ * . (or all the code could live in the _single fn)
+ */
-static int _lvchange_single(struct cmd_context *cmd, struct logical_volume *lv,
- struct processing_handle *handle __attribute__((unused)))
+static int _lvchange_properties_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
{
int doit = 0, docmds = 0;
- struct logical_volume *origin;
- char snaps_msg[128];
-
- if (sigint_caught())
- return_ECMD_FAILED;
+ int i, opt_enum;
- if (!(lv->vg->status & LVM_WRITE) &&
- arg_from_list_is_set(cmd, NULL,
- alloc_ARG,
- contiguous_ARG,
- discards_ARG,
- metadataprofile_ARG,
- permission_ARG,
- persistent_ARG,
- profile_ARG,
- readahead_ARG,
- zero_ARG,
- -1)) {
- log_error("Only -a permitted with read-only volume group %s.",
- lv->vg->name);
+ /*
+ * If a persistent lv lock already exists from activation
+ * (with the needed mode or higher), this will be a no-op.
+ * Otherwise, the lv lock will be taken as non-persistent
+ * and released when this command exits.
+ */
+ if (!lockd_lv(cmd, lv, "ex", 0)) {
+ stack;
return ECMD_FAILED;
}
- if (lv_is_origin(lv) && !lv_is_thin_volume(lv) &&
- arg_from_list_is_set(cmd, NULL,
- alloc_ARG,
- contiguous_ARG,
- metadataprofile_ARG,
- permission_ARG,
- persistent_ARG,
- profile_ARG,
- readahead_ARG,
- -1)) {
- log_error("Can't change logical volume %s under snapshot.",
- display_lvname(lv));
- return ECMD_FAILED;
- }
+ for (i = 0; i < cmd->command->ro_count; i++) {
+ opt_enum = cmd->command->required_opt_args[i].opt;
- if (lv_is_pvmove(lv)) {
- log_error("Unable to change pvmove LV %s.", display_lvname(lv));
- if (arg_is_set(cmd, activate_ARG))
- log_error("Use 'pvmove --abort' to abandon a pvmove");
- return ECMD_FAILED;
+ if (!arg_is_set(cmd, opt_enum))
+ continue;
+
+ if (!archive(lv->vg))
+ return_ECMD_FAILED;
+
+ docmds++;
+
+ switch (opt_enum) {
+ case permission_ARG:
+ doit += _lvchange_permission(cmd, lv);
+ break;
+
+ case alloc_ARG:
+ case contiguous_ARG:
+ doit += _lvchange_alloc(cmd, lv);
+ break;
+
+ case errorwhenfull_ARG:
+ doit += _lvchange_errorwhenfull(cmd, lv);
+ break;
+
+ case readahead_ARG:
+ doit += _lvchange_readahead(cmd, lv);
+ break;
+
+ case persistent_ARG:
+ doit += _lvchange_persistent(cmd, lv);
+ break;
+
+ case discards_ARG:
+ case zero_ARG:
+ doit += _lvchange_pool_update(cmd, lv);
+ break;
+
+ case addtag_ARG:
+ case deltag_ARG:
+ doit += _lvchange_tag(cmd, lv, opt_enum);
+ break;
+
+ case writemostly_ARG:
+ case writebehind_ARG:
+ doit += _lvchange_writemostly(lv);
+ break;
+
+ case minrecoveryrate_ARG:
+ case maxrecoveryrate_ARG:
+ doit += _lvchange_recovery_rate(lv);
+ break;
+
+ case profile_ARG:
+ case metadataprofile_ARG:
+ case detachprofile_ARG:
+ doit += _lvchange_profile(lv);
+ break;
+
+ case setactivationskip_ARG:
+ doit += _lvchange_activation_skip(lv);
+ break;
+
+ case cachemode_ARG:
+ case cachepolicy_ARG:
+ case cachesettings_ARG:
+ doit += _lvchange_cache(cmd, lv);
+ break;
+
+ default:
+ log_error(INTERNAL_ERROR "Failed to check for option %s",
+ arg_long_option_name(i));
+ }
}
- if (lv_is_mirror_log(lv)) {
- log_error("Unable to change mirror log LV %s directly.",
- display_lvname(lv));
- return ECMD_FAILED;
+ if (doit)
+ log_print_unless_silent("Logical volume %s changed.", display_lvname(lv));
+
+ if (doit != docmds)
+ return_ECMD_FAILED;
+
+ return ECMD_PROCESSED;
+}
+
+static int _lvchange_properties_check(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg)
+{
+ if (!lv_is_visible(lv)) {
+ if (lv_is_named_arg)
+ log_error("Operation not permitted (%s %d) on hidden LV %s.",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ display_lvname(lv));
+ return 0;
}
- if (lv_is_mirror_image(lv)) {
- log_error("Unable to change mirror image LV %s directly.",
+ if (vg_is_clustered(lv->vg) && lv_is_cache_origin(lv) && lv_is_raid(lv)) {
+ log_error("Unable to change internal LV %s directly in a cluster.",
display_lvname(lv));
- return ECMD_FAILED;
+ return 0;
}
- /* If LV is sparse, activate origin instead */
- if (arg_is_set(cmd, activate_ARG) && lv_is_cow(lv) &&
- lv_is_virtual_origin(origin = origin_from_cow(lv)))
- lv = origin;
+ return 1;
+}
- /* Use cache origin LV for 'raid' actions */
- if (lv_is_cache(lv) &&
- arg_from_list_is_set(cmd, NULL,
- /* FIXME: we want to support more ops here */
- //resync_ARG,
- syncaction_ARG,
- -1)) {
- lv = seg_lv(first_seg(lv), 0);
- log_debug("Using cache origin volume %s for lvchange instead.",
- display_lvname(lv));
- }
+int lvchange_properties_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ int ret;
- if ((lv_is_thin_pool_data(lv) || lv_is_thin_pool_metadata(lv) ||
- lv_is_cache_pool_data(lv) || lv_is_cache_pool_metadata(lv)) &&
- !arg_is_set(cmd, activate_ARG) &&
- !arg_is_set(cmd, permission_ARG) &&
- !arg_is_set(cmd, setactivationskip_ARG))
- /* Rest can be changed for stacked thin pool meta/data volumes */
- ;
- else if (lv_is_cache_origin(lv) && lv_is_raid(lv)) {
- if (vg_is_clustered(lv->vg)) {
- log_error("Unable to change internal LV %s directly in a cluster.",
- display_lvname(lv));
- return ECMD_FAILED;
- }
- /*
- * FIXME: For now, we don't want to allow all kinds of
- * operations on this cache origin sub-LV. We are going
- * to restrict it to non-clustered, RAID. This way, we
- * can change the syncaction as needed (e.g. initiate
- * scrubbing).
- *
- * Later pass all 'cache' actions on cache origin.
- */
- } else if (!lv_is_visible(lv) && !lv_is_virtual_origin(lv)) {
- log_error("Unable to change internal LV %s directly.",
- display_lvname(lv));
- return ECMD_FAILED;
+ /*
+ * A command def rule allows only some options when LV is partial,
+ * so handles_missing_pvs will only affect those.
+ */
+ cmd->handles_missing_pvs = 1;
+ ret = process_each_lv(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, &_lvchange_properties_check, &_lvchange_properties_single);
+
+ if (ret != ECMD_PROCESSED)
+ return ret;
+
+ /*
+ * Unfortunately, lvchange has previously allowed changing an LV
+ * property and changing LV activation in a single command. This was
+ * not a good idea because the behavior/results are hard to predict and
+ * not possible to sensibly describe. It's also unnecessary. So, this
+ * is here for the sake of compatibility.
+ *
+ * This is extremely ugly; activation should always be done separately.
+ * This is not the full-featured lvchange capability, just the basic
+ * (the advanced activate options are not provided.)
+ *
+ * FIXME: wrap this in a config setting that we can disable by default
+ * to phase this out?
+ */
+ if (arg_is_set(cmd, activate_ARG)) {
+ log_warn("WARNING: Combining activation change with other commands is not advised.");
+ ret = lvchange_activate_cmd(cmd, argc, argv);
}
- if (lv_is_cow(lv) && arg_is_set(cmd, activate_ARG)) {
+ return ret;
+}
+
+static int _lvchange_activate_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ struct logical_volume *origin;
+ char snaps_msg[128];
+
+ /* FIXME: untangle the proper logic for cow / sparse / virtual origin */
+
+ /* If LV is sparse, activate origin instead */
+ if (lv_is_cow(lv) && lv_is_virtual_origin(origin = origin_from_cow(lv)))
+ lv = origin;
+
+ if (lv_is_cow(lv)) {
origin = origin_from_cow(lv);
if (origin->origin_count < 2)
snaps_msg[0] = '\0';
@@ -1110,329 +1102,291 @@ static int _lvchange_single(struct cmd_context *cmd, struct logical_volume *lv,
}
}
- if (arg_is_set(cmd, errorwhenfull_ARG) && !lv_is_thin_pool(lv)) {
- log_error("Option --errorwhenfull is only supported with thin pools.");
- return ECMD_FAILED;
+ /*
+ * If --sysinit -aay is used and at the same time lvmetad is used,
+ * we want to rely on autoactivation to take place. Also, we
+ * need to take special care here as lvmetad service does
+ * not neet to be running at this moment yet - it could be
+ * just too early during system initialization time.
+ */
+ if (arg_is_set(cmd, sysinit_ARG) && (arg_uint_value(cmd, activate_ARG, 0) == CHANGE_AAY)) {
+ if (lvmetad_used()) {
+ log_warn("WARNING: lvmetad is active, skipping direct activation during sysinit.");
+ return ECMD_PROCESSED;
+ }
}
- if (arg_is_set(cmd, persistent_ARG) && lv_is_pool(lv)) {
- log_error("Persistent major and minor numbers are not supported with pools.");
- return ECMD_FAILED;
- }
+ if (!_lvchange_activate(cmd, lv))
+ return_ECMD_FAILED;
- if (!arg_is_set(cmd, activate_ARG) && !arg_is_set(cmd, refresh_ARG)) {
- /*
- * If a persistent lv lock already exists from activation
- * (with the needed mode or higher), this will be a no-op.
- * Otherwise, the lv lock will be taken as non-persistent
- * and released when this command exits.
- *
- * FIXME: use "sh" if the options imply that the lvchange
- * operation does not modify the LV.
- */
- if (!lockd_lv(cmd, lv, "ex", 0)) {
- stack;
- return ECMD_FAILED;
- }
+ return ECMD_PROCESSED;
+}
+
+static int _lvchange_activate_check(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg)
+{
+ if (!lv_is_visible(lv)) {
+ if (lv_is_named_arg)
+ log_error("Operation not permitted (%s %d) on hidden LV %s.",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ display_lvname(lv));
+ return 0;
}
+ return 1;
+}
+
+int lvchange_activate_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ cmd->handles_missing_pvs = 1;
+ cmd->lockd_vg_default_sh = 1;
+
/*
- * FIXME: DEFAULT_BACKGROUND_POLLING should be "unspecified".
- * If --poll is explicitly provided use it; otherwise polling
- * should only be started if the LV is not already active. So:
- * 1) change the activation code to say if the LV was actually activated
- * 2) make polling of an LV tightly coupled with LV activation
- *
- * Do not initiate any polling if --sysinit option is used.
+ * Include foreign VGs that contain active LVs.
+ * That shouldn't happen in general, but if it does by some
+ * mistake, then we want to allow those LVs to be deactivated.
*/
- init_background_polling(arg_is_set(cmd, sysinit_ARG) ? 0 :
- arg_int_value(cmd, poll_ARG,
- DEFAULT_BACKGROUND_POLLING));
+ cmd->include_active_foreign_vgs = 1;
- /* access permission change */
- if (arg_is_set(cmd, permission_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_permission(cmd, lv);
- docmds++;
- }
+ /* Allow deactivating if locks fail. */
+ if (is_change_activating((activation_change_t)arg_uint_value(cmd, activate_ARG, CHANGE_AY)))
+ cmd->lockd_vg_enforce_sh = 1;
- /* allocation policy change */
- if (arg_is_set(cmd, contiguous_ARG) || arg_is_set(cmd, alloc_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_alloc(cmd, lv);
- docmds++;
- }
+ return process_each_lv(cmd, argc, argv, NULL, NULL, 0,
+ NULL, &_lvchange_activate_check, &_lvchange_activate_single);
+}
- /* error when full change */
- if (arg_is_set(cmd, errorwhenfull_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_errorwhenfull(cmd, lv);
- docmds++;
- }
+static int _lvchange_refresh_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ log_verbose("Refreshing logical volume %s (if active).", display_lvname(lv));
- /* read ahead sector change */
- if (arg_is_set(cmd, readahead_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_readahead(cmd, lv);
- docmds++;
- }
+ if (!lv_refresh(cmd, lv))
+ return_ECMD_FAILED;
- /* persistent device number change */
- if (arg_is_set(cmd, persistent_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_persistent(cmd, lv);
- docmds++;
- }
+ /*
+ * FIXME: In some cases, the lv_refresh() starts polling without
+ * checking poll arg. Pull that out of lv_refresh.
+ */
+ if (arg_is_set(cmd, poll_ARG) &&
+ !_lvchange_background_polling(cmd, lv))
+ return_ECMD_FAILED;
- if (arg_is_set(cmd, discards_ARG) ||
- arg_is_set(cmd, zero_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_pool_update(cmd, lv);
- docmds++;
- }
+ return ECMD_PROCESSED;
+}
- /* add tag */
- if (arg_is_set(cmd, addtag_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_tag(cmd, lv, addtag_ARG);
- docmds++;
+static int _lvchange_refresh_check(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg)
+{
+ if (!lv_is_visible(lv)) {
+ if (lv_is_named_arg)
+ log_error("Operation not permitted (%s %d) on hidden LV %s.",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ display_lvname(lv));
+ return 0;
}
- /* del tag */
- if (arg_is_set(cmd, deltag_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_tag(cmd, lv, deltag_ARG);
- docmds++;
- }
+ return 1;
+}
- /* rebuild selected PVs */
- if (arg_is_set(cmd, rebuild_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_rebuild(lv);
- docmds++;
- }
+int lvchange_refresh_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ cmd->handles_missing_pvs = 1;
+ cmd->lockd_vg_default_sh = 1;
- /* change writemostly/writebehind */
- if (arg_is_set(cmd, writemostly_ARG) || arg_is_set(cmd, writebehind_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_writemostly(lv);
- docmds++;
- }
+ return process_each_lv(cmd, argc, argv, NULL, NULL, 0,
+ NULL, &_lvchange_refresh_check, &_lvchange_refresh_single);
+}
- /* change [min|max]_recovery_rate */
- if (arg_is_set(cmd, minrecoveryrate_ARG) ||
- arg_is_set(cmd, maxrecoveryrate_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_recovery_rate(lv);
- docmds++;
- }
+static int _lvchange_resync_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ if (!_lvchange_resync(cmd, lv))
+ return_ECMD_FAILED;
- /* change configuration profile */
- if (arg_is_set(cmd, profile_ARG) || arg_is_set(cmd, metadataprofile_ARG) ||
- arg_is_set(cmd, detachprofile_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_profile(lv);
- docmds++;
- }
+ return ECMD_PROCESSED;
+}
- if (arg_is_set(cmd, setactivationskip_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_activation_skip(lv);
- docmds++;
+static int _lvchange_resync_check(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg)
+{
+ if (!lv_is_visible(lv)) {
+ if (lv_is_named_arg)
+ return 1;
+ return 0;
}
- if (arg_is_set(cmd, cachemode_ARG) ||
- arg_is_set(cmd, cachepolicy_ARG) || arg_is_set(cmd, cachesettings_ARG)) {
- if (!archive(lv->vg))
- return_ECMD_FAILED;
- doit += _lvchange_cache(cmd, lv);
- docmds++;
+ return 1;
+}
+
+int lvchange_resync_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ int ret;
+
+ ret = process_each_lv(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, &_lvchange_resync_check, &_lvchange_resync_single);
+
+ if (ret != ECMD_PROCESSED)
+ return ret;
+
+ /*
+ * Unfortunately, lvchange has previously allowed resync and changing
+ * activation to be combined in one command. activate should be
+ * done separately, but this is here to avoid breaking commands that
+ * used this.
+ *
+ * FIXME: wrap this in a config setting that we can disable by default
+ * to phase this out?
+ */
+ if (arg_is_set(cmd, activate_ARG)) {
+ log_warn("WARNING: Combining activation change with other commands is not advised.");
+ ret = lvchange_activate_cmd(cmd, argc, argv);
}
- if (doit)
- log_print_unless_silent("Logical volume %s changed.", display_lvname(lv));
+ return ret;
+}
- if (arg_is_set(cmd, resync_ARG) &&
- !_lvchange_resync(cmd, lv))
+static int _lvchange_syncaction_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ if (!lv_raid_message(lv, arg_str_value(cmd, syncaction_ARG, NULL)))
return_ECMD_FAILED;
- if (arg_is_set(cmd, syncaction_ARG)) {
- struct lv_segment *seg = first_seg(lv);
+ return ECMD_PROCESSED;
+}
- if (seg_is_any_raid0(seg)) {
- log_error("Unable to sync raid0 LV %s.", display_lvname(lv));
- return_ECMD_FAILED;
- }
-
- if (!lv_raid_message(lv, arg_str_value(cmd, syncaction_ARG, NULL)))
- return_ECMD_FAILED;
+static int _lvchange_syncaction_check(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg)
+{
+ if (!lv_is_visible(lv)) {
+ if (lv_is_named_arg)
+ return 1;
+ return 0;
}
- /* activation change */
- if (arg_is_set(cmd, activate_ARG)) {
- if (!_lvchange_activate(cmd, lv))
- return_ECMD_FAILED;
- } else if (arg_is_set(cmd, refresh_ARG)) {
- if (!_lvchange_refresh(cmd, lv))
- return_ECMD_FAILED;
- } else {
- if (arg_is_set(cmd, monitor_ARG) &&
- !_lvchange_monitoring(cmd, lv))
- return_ECMD_FAILED;
+ return 1;
+}
- if (arg_is_set(cmd, poll_ARG) &&
- !_lvchange_background_polling(cmd, lv))
- return_ECMD_FAILED;
- }
+int lvchange_syncaction_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ return process_each_lv(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, &_lvchange_syncaction_check, &_lvchange_syncaction_single);
+}
- if (doit != docmds)
+static int _lvchange_rebuild_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ if (!_lvchange_rebuild(lv))
return_ECMD_FAILED;
return ECMD_PROCESSED;
}
-int lvchange(struct cmd_context *cmd, int argc, char **argv)
+static int _lvchange_rebuild_check(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg)
{
- /*
- * Options that update metadata should be listed in one of
- * the two lists below (i.e. options other than -a, --refresh,
- * --monitor or --poll).
- */
- int update_partial_safe = /* options safe to update if partial */
- arg_from_list_is_set(cmd, NULL,
- addtag_ARG,
- contiguous_ARG,
- deltag_ARG,
- detachprofile_ARG,
- metadataprofile_ARG,
- permission_ARG,
- persistent_ARG,
- profile_ARG,
- readahead_ARG,
- setactivationskip_ARG,
- -1);
- int update_partial_unsafe =
- arg_from_list_is_set(cmd, NULL,
- alloc_ARG,
- cachemode_ARG,
- cachepolicy_ARG,
- cachesettings_ARG,
- discards_ARG,
- errorwhenfull_ARG,
- maxrecoveryrate_ARG,
- minrecoveryrate_ARG,
- rebuild_ARG,
- resync_ARG,
- syncaction_ARG,
- writebehind_ARG,
- writemostly_ARG,
- zero_ARG,
- -1);
- int update = update_partial_safe || update_partial_unsafe;
-
- if (!update &&
- !arg_is_set(cmd, activate_ARG) && !arg_is_set(cmd, refresh_ARG) &&
- !arg_is_set(cmd, monitor_ARG) && !arg_is_set(cmd, poll_ARG)) {
- log_error("Need 1 or more of -a, -C, -M, -p, -r, -Z, "
- "--resync, --refresh, --alloc, --addtag, --deltag, "
- "--monitor, --poll or --discards");
- return EINVALID_CMD_LINE;
+ if (!lv_is_visible(lv)) {
+ if (lv_is_named_arg)
+ return 1;
+ return 0;
}
- if ((arg_is_set(cmd, profile_ARG) || arg_is_set(cmd, metadataprofile_ARG)) &&
- arg_is_set(cmd, detachprofile_ARG)) {
- log_error("Only one of --metadataprofile and --detachprofile permitted.");
- return EINVALID_CMD_LINE;
- }
+ return 1;
+}
- if (arg_is_set(cmd, activate_ARG) && arg_is_set(cmd, refresh_ARG)) {
- log_error("Only one of -a and --refresh permitted.");
- return EINVALID_CMD_LINE;
- }
+int lvchange_rebuild_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ return process_each_lv(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, &_lvchange_rebuild_check, &_lvchange_rebuild_single);
+}
- if ((arg_is_set(cmd, ignorelockingfailure_ARG) ||
- arg_is_set(cmd, sysinit_ARG)) && update) {
- log_error("Only -a permitted with --ignorelockingfailure and --sysinit");
- return EINVALID_CMD_LINE;
- }
+static int _lvchange_monitor_poll_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ if (arg_is_set(cmd, monitor_ARG) &&
+ !_lvchange_monitoring(cmd, lv))
+ return_ECMD_FAILED;
- if (!update || !update_partial_unsafe)
- cmd->handles_missing_pvs = 1;
+ if (arg_is_set(cmd, poll_ARG) &&
+ !_lvchange_background_polling(cmd, lv))
+ return_ECMD_FAILED;
- if (!argc && !arg_is_set(cmd, select_ARG)) {
- log_error("Please give logical volume path(s) or use --select for selection.");
- return EINVALID_CMD_LINE;
- }
+ return ECMD_PROCESSED;
+}
- if ((arg_is_set(cmd, minor_ARG) || arg_is_set(cmd, major_ARG)) &&
- !arg_is_set(cmd, persistent_ARG)) {
- log_error("--major and --minor require -My.");
- return EINVALID_CMD_LINE;
+static int _lvchange_monitor_poll_check(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg)
+{
+ if (!lv_is_visible(lv)) {
+ if (lv_is_named_arg)
+ return 1;
+ return 0;
}
- if (arg_is_set(cmd, minor_ARG) && argc != 1) {
- log_error("Only give one logical volume when specifying minor.");
- return EINVALID_CMD_LINE;
- }
+ return 1;
+}
- if (arg_is_set(cmd, contiguous_ARG) && arg_is_set(cmd, alloc_ARG)) {
- log_error("Only one of --alloc and --contiguous permitted.");
- return EINVALID_CMD_LINE;
- }
+int lvchange_monitor_poll_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ cmd->handles_missing_pvs = 1;
+ return process_each_lv(cmd, argc, argv, NULL, NULL, 0,
+ NULL, &_lvchange_monitor_poll_check, &_lvchange_monitor_poll_single);
+}
- if (arg_is_set(cmd, poll_ARG) && arg_is_set(cmd, sysinit_ARG)) {
- log_error("Only one of --poll and --sysinit permitted.");
- return EINVALID_CMD_LINE;
- }
+static int _lvchange_persistent_single(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle)
+{
+ if (!_lvchange_persistent(cmd, lv))
+ return_ECMD_FAILED;
- /*
- * If --sysinit -aay is used and at the same time lvmetad is used,
- * we want to rely on autoactivation to take place. Also, we
- * need to take special care here as lvmetad service does
- * not neet to be running at this moment yet - it could be
- * just too early during system initialization time.
- */
- if (arg_is_set(cmd, sysinit_ARG) && (arg_uint_value(cmd, activate_ARG, 0) == CHANGE_AAY)) {
- if (lvmetad_used()) {
- log_warn("WARNING: lvmetad is active, skipping direct activation during sysinit.");
- return ECMD_PROCESSED;
- }
+ return ECMD_PROCESSED;
+}
+
+static int _lvchange_persistent_check(struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg)
+{
+ if (!lv_is_visible(lv)) {
+ if (lv_is_named_arg)
+ log_error("Operation not permitted (%s %d) on hidden LV %s.",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ display_lvname(lv));
+ return 0;
}
- /*
- * Include foreign VGs that contain active LVs.
- * That shouldn't happen in general, but if it does by some
- * mistake, then we want to allow those LVs to be deactivated.
- */
- if (arg_is_set(cmd, activate_ARG))
- cmd->include_active_foreign_vgs = 1;
+ return 1;
+}
- /*
- * The default vg lock mode for lvchange is ex, but these options
- * are cases where lvchange does not modify the vg, so they can use
- * the sh lock mode.
- */
- if (arg_is_set(cmd, activate_ARG) || arg_is_set(cmd, refresh_ARG)) {
- cmd->lockd_vg_default_sh = 1;
- /* Allow deactivating if locks fail. */
- if (is_change_activating((activation_change_t)arg_uint_value(cmd, activate_ARG, CHANGE_AY)))
- cmd->lockd_vg_enforce_sh = 1;
- }
+int lvchange_persistent_cmd(struct cmd_context *cmd, int argc, char **argv)
+{
+ cmd->handles_missing_pvs = 1;
+ return process_each_lv(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE,
+ NULL, &_lvchange_persistent_check, &_lvchange_persistent_single);
+}
- return process_each_lv(cmd, argc, argv, NULL, NULL,
- update ? READ_FOR_UPDATE : 0, NULL,
- NULL, &_lvchange_single);
+int lvchange(struct cmd_context *cmd, int argc, char **argv)
+{
+ log_error(INTERNAL_ERROR "Missing function for command definition %s.",
+ cmd->command->command_line_id);
+ return ECMD_FAILED;
}
+
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 231ef68..d1613e1 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -113,6 +113,15 @@ static struct cmdline_context _cmdline;
*/
struct command_function command_functions[COMMAND_ID_COUNT] = {
{ lvmconfig_general_CMD, lvmconfig },
+ { lvchange_properties_CMD, lvchange_properties_cmd },
+ { lvchange_resync_CMD, lvchange_resync_cmd },
+ { lvchange_syncaction_CMD, lvchange_syncaction_cmd },
+ { lvchange_rebuild_CMD, lvchange_rebuild_cmd },
+ { lvchange_activate_CMD, lvchange_activate_cmd },
+ { lvchange_refresh_CMD, lvchange_refresh_cmd },
+ { lvchange_monitor_CMD, lvchange_monitor_poll_cmd },
+ { lvchange_poll_CMD, lvchange_monitor_poll_cmd },
+ { lvchange_persistent_CMD, lvchange_persistent_cmd },
};
#if 0
/* all raid-related type conversions */
diff --git a/tools/tools.h b/tools/tools.h
index dbf8a17..c42119c 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -242,4 +242,13 @@ int vgchange_background_polling(struct cmd_context *cmd, struct volume_group *vg
struct lv_props *get_lv_prop(int lvp_enum);
struct lv_types *get_lv_type(int lvt_enum);
+int lvchange_properties_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvchange_activate_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvchange_refresh_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvchange_resync_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvchange_syncaction_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvchange_rebuild_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvchange_monitor_poll_cmd(struct cmd_context *cmd, int argc, char **argv);
+int lvchange_persistent_cmd(struct cmd_context *cmd, int argc, char **argv);
+
#endif
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9c6c55c314199a9b…
Commit: 9c6c55c314199a9ba26fe1b864306b2ca8a8dbcd
Parent: 1e2420bca85da9a37570871cd70192e9ae831786
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Tue Nov 29 12:00:15 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
process_each_lv: add check_single_lv function
The new check_single_lv() function is called prior to the
existing process_single_lv(). If the check function returns 0,
the LV will not be processed.
The check_single_lv function is meant to be a standard method
to validate the combination of specific command + specific LV,
and decide if the combination is allowed. The check_single
function can be used by anything that calls process_each_lv.
As commands are migrated to take advantage of command
definitions, each command definition gets its own entry
point which calls process_each for itself, passing a
pair of check_single/process_single functions which can
be specific to the narrowly defined command def.
---
tools/lvchange.c | 2 +-
tools/lvconvert.c | 4 ++--
tools/lvdisplay.c | 2 +-
tools/lvremove.c | 2 +-
tools/lvscan.c | 2 +-
tools/reporter.c | 8 ++++----
tools/toollib.c | 13 +++++++++++--
tools/toollib.h | 14 ++++++++++++++
tools/vgdisplay.c | 2 +-
tools/vgmknodes.c | 2 +-
tools/vgremove.c | 2 +-
11 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/tools/lvchange.c b/tools/lvchange.c
index 9fec436..d75a8ec 100644
--- a/tools/lvchange.c
+++ b/tools/lvchange.c
@@ -1434,5 +1434,5 @@ int lvchange(struct cmd_context *cmd, int argc, char **argv)
return process_each_lv(cmd, argc, argv, NULL, NULL,
update ? READ_FOR_UPDATE : 0, NULL,
- &_lvchange_single);
+ NULL, &_lvchange_single);
}
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 382f170..132d66d 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -4834,7 +4834,7 @@ int lvconvert(struct cmd_context * cmd, int argc, char **argv)
if (lp.merge) {
ret = process_each_lv(cmd, argc, argv, NULL, NULL,
- READ_FOR_UPDATE, handle, &_lvconvert_merge_single);
+ READ_FOR_UPDATE, handle, NULL, &_lvconvert_merge_single);
} else {
int saved_ignore_suspended_devices = ignore_suspended_devices();
@@ -4844,7 +4844,7 @@ int lvconvert(struct cmd_context * cmd, int argc, char **argv)
}
ret = process_each_lv(cmd, 0, NULL, lp.vg_name, lp.lv_name,
- READ_FOR_UPDATE, handle, &_lvconvert_single);
+ READ_FOR_UPDATE, handle, NULL, &_lvconvert_single);
init_ignore_suspended_devices(saved_ignore_suspended_devices);
}
diff --git a/tools/lvdisplay.c b/tools/lvdisplay.c
index c60b463..b8c4b46 100644
--- a/tools/lvdisplay.c
+++ b/tools/lvdisplay.c
@@ -58,5 +58,5 @@ int lvdisplay(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE;
}
- return process_each_lv(cmd, argc, argv, NULL, NULL, 0, NULL, &_lvdisplay_single);
+ return process_each_lv(cmd, argc, argv, NULL, NULL, 0, NULL, NULL, &_lvdisplay_single);
}
diff --git a/tools/lvremove.c b/tools/lvremove.c
index d807d04..4653817 100644
--- a/tools/lvremove.c
+++ b/tools/lvremove.c
@@ -27,5 +27,5 @@ int lvremove(struct cmd_context *cmd, int argc, char **argv)
cmd->include_historical_lvs = 1;
return process_each_lv(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE, NULL,
- &lvremove_single);
+ NULL, &lvremove_single);
}
diff --git a/tools/lvscan.c b/tools/lvscan.c
index 4e188d0..ab3238b 100644
--- a/tools/lvscan.c
+++ b/tools/lvscan.c
@@ -119,5 +119,5 @@ int lvscan(struct cmd_context *cmd, int argc, char **argv)
*/
}
- return process_each_lv(cmd, argc, argv, NULL, NULL, 0, NULL, &lvscan_single);
+ return process_each_lv(cmd, argc, argv, NULL, NULL, 0, NULL, NULL, &lvscan_single);
}
diff --git a/tools/reporter.c b/tools/reporter.c
index 00606ed..980f39c 100644
--- a/tools/reporter.c
+++ b/tools/reporter.c
@@ -545,14 +545,14 @@ static int _report_all_in_vg(struct cmd_context *cmd, struct processing_handle *
r = _vgs_single(cmd, vg->name, vg, handle);
break;
case LVS:
- r = process_each_lv_in_vg(cmd, vg, NULL, NULL, 0, handle,
+ r = process_each_lv_in_vg(cmd, vg, NULL, NULL, 0, handle, NULL,
do_lv_info && !do_lv_seg_status ? &_lvs_with_info_single :
!do_lv_info && do_lv_seg_status ? &_lvs_with_status_single :
do_lv_info && do_lv_seg_status ? &_lvs_with_info_and_status_single :
&_lvs_single);
break;
case SEGS:
- r = process_each_lv_in_vg(cmd, vg, NULL, NULL, 0, handle,
+ r = process_each_lv_in_vg(cmd, vg, NULL, NULL, 0, handle, NULL,
do_lv_info && !do_lv_seg_status ? &_lvsegs_with_info_single :
!do_lv_info && do_lv_seg_status ? &_lvsegs_with_status_single :
do_lv_info && do_lv_seg_status ? &_lvsegs_with_info_and_status_single :
@@ -1127,7 +1127,7 @@ static int _do_report(struct cmd_context *cmd, struct processing_handle *handle,
if (args->full_report_vg)
r = _report_all_in_vg(cmd, handle, args->full_report_vg, LVS, lv_info_needed, lv_segment_status_needed);
else
- r = process_each_lv(cmd, args->argc, args->argv, NULL, NULL, 0, handle,
+ r = process_each_lv(cmd, args->argc, args->argv, NULL, NULL, 0, handle, NULL,
lv_info_needed && !lv_segment_status_needed ? &_lvs_with_info_single :
!lv_info_needed && lv_segment_status_needed ? &_lvs_with_status_single :
lv_info_needed && lv_segment_status_needed ? &_lvs_with_info_and_status_single :
@@ -1161,7 +1161,7 @@ static int _do_report(struct cmd_context *cmd, struct processing_handle *handle,
if (args->full_report_vg)
r = _report_all_in_vg(cmd, handle, args->full_report_vg, SEGS, lv_info_needed, lv_segment_status_needed);
else
- r = process_each_lv(cmd, args->argc, args->argv, NULL, NULL, 0, handle,
+ r = process_each_lv(cmd, args->argc, args->argv, NULL, NULL, 0, handle, NULL,
lv_info_needed && !lv_segment_status_needed ? &_lvsegs_with_info_single :
!lv_info_needed && lv_segment_status_needed ? &_lvsegs_with_status_single :
lv_info_needed && lv_segment_status_needed ? &_lvsegs_with_info_and_status_single :
diff --git a/tools/toollib.c b/tools/toollib.c
index 06d4066..13e9b6f 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -2924,6 +2924,7 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
struct dm_list *arg_lvnames, const struct dm_list *tags_in,
int stop_on_error,
struct processing_handle *handle,
+ check_single_lv_fn_t check_single_lv,
process_single_lv_fn_t process_single_lv)
{
log_report_t saved_log_report_state = log_get_report_state();
@@ -3127,6 +3128,12 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
continue;
}
+ if (check_single_lv && !check_single_lv(cmd, lvl->lv, handle, lv_is_named_arg)) {
+ if (lv_is_named_arg)
+ ret_max = ECMD_FAILED;
+ continue;
+ }
+
log_very_verbose("Processing LV %s in VG %s.", lvl->lv->name, vg->name);
ret = process_single_lv(cmd, lvl->lv, handle);
@@ -3363,6 +3370,7 @@ static int _process_lv_vgnameid_list(struct cmd_context *cmd, uint32_t read_flag
struct dm_list *arg_lvnames,
struct dm_list *arg_tags,
struct processing_handle *handle,
+ check_single_lv_fn_t check_single_lv,
process_single_lv_fn_t process_single_lv)
{
log_report_t saved_log_report_state = log_get_report_state();
@@ -3455,7 +3463,7 @@ static int _process_lv_vgnameid_list(struct cmd_context *cmd, uint32_t read_flag
goto endvg;
ret = process_each_lv_in_vg(cmd, vg, &lvnames, tags_arg, 0,
- handle, process_single_lv);
+ handle, check_single_lv, process_single_lv);
if (ret != ECMD_PROCESSED)
stack;
report_log_ret_code(ret);
@@ -3486,6 +3494,7 @@ int process_each_lv(struct cmd_context *cmd,
const char *one_vgname, const char *one_lvname,
uint32_t read_flags,
struct processing_handle *handle,
+ check_single_lv_fn_t check_single_lv,
process_single_lv_fn_t process_single_lv)
{
log_report_t saved_log_report_state = log_get_report_state();
@@ -3601,7 +3610,7 @@ int process_each_lv(struct cmd_context *cmd,
_choose_vgs_to_process(cmd, &arg_vgnames, &vgnameids_on_system, &vgnameids_to_process);
ret = _process_lv_vgnameid_list(cmd, read_flags, &vgnameids_to_process, &arg_vgnames, &arg_lvnames,
- &arg_tags, handle, process_single_lv);
+ &arg_tags, handle, check_single_lv, process_single_lv);
if (ret > ret_max)
ret_max = ret;
diff --git a/tools/toollib.h b/tools/toollib.h
index d44b825..67e45a2 100644
--- a/tools/toollib.h
+++ b/tools/toollib.h
@@ -98,6 +98,18 @@ typedef int (*process_single_pvseg_fn_t) (struct cmd_context * cmd,
struct pv_segment * pvseg,
struct processing_handle *handle);
+/*
+ * Called prior to process_single_lv() to decide if the LV should be
+ * processed. If this returns 0, the LV is not processed.
+ *
+ * This can evaluate the combination of command definition and
+ * the LV object to decide if the combination is allowed.
+ */
+typedef int (*check_single_lv_fn_t) (struct cmd_context *cmd,
+ struct logical_volume *lv,
+ struct processing_handle *handle,
+ int lv_is_named_arg);
+
int process_each_vg(struct cmd_context *cmd,
int argc, char **argv,
const char *one_vgname,
@@ -125,6 +137,7 @@ int process_each_segment_in_pv(struct cmd_context *cmd,
int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
const char *one_vgname, const char *one_lvname,
uint32_t flags, struct processing_handle *handle,
+ check_single_lv_fn_t check_single_lv,
process_single_lv_fn_t process_single_lv);
@@ -141,6 +154,7 @@ int process_each_pv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
struct dm_list *arg_lvnames, const struct dm_list *tagsl,
int stop_on_error, struct processing_handle *handle,
+ check_single_lv_fn_t check_single_lv,
process_single_lv_fn_t process_single_lv);
struct processing_handle *init_processing_handle(struct cmd_context *cmd, struct processing_handle *parent_handle);
diff --git a/tools/vgdisplay.c b/tools/vgdisplay.c
index 7bb2e6a..7fc64b0 100644
--- a/tools/vgdisplay.c
+++ b/tools/vgdisplay.c
@@ -38,7 +38,7 @@ static int vgdisplay_single(struct cmd_context *cmd, const char *vg_name,
vgdisplay_extents(vg);
process_each_lv_in_vg(cmd, vg, NULL, NULL, 0, NULL,
- (process_single_lv_fn_t)lvdisplay_full);
+ NULL, (process_single_lv_fn_t)lvdisplay_full);
log_print("--- Physical volumes ---");
process_each_pv_in_vg(cmd, vg, NULL,
diff --git a/tools/vgmknodes.c b/tools/vgmknodes.c
index f974ff3..9942af7 100644
--- a/tools/vgmknodes.c
+++ b/tools/vgmknodes.c
@@ -33,5 +33,5 @@ int vgmknodes(struct cmd_context *cmd, int argc, char **argv)
if (!lv_mknodes(cmd, NULL))
return_ECMD_FAILED;
- return process_each_lv(cmd, argc, argv, NULL, NULL, LCK_VG_READ, NULL, &_vgmknodes_single);
+ return process_each_lv(cmd, argc, argv, NULL, NULL, LCK_VG_READ, NULL, NULL, &_vgmknodes_single);
}
diff --git a/tools/vgremove.c b/tools/vgremove.c
index f0da2f8..d105fc6 100644
--- a/tools/vgremove.c
+++ b/tools/vgremove.c
@@ -62,7 +62,7 @@ static int vgremove_single(struct cmd_context *cmd, const char *vg_name,
}
if ((ret = process_each_lv_in_vg(cmd, vg, NULL, NULL, 1, &void_handle,
- (process_single_lv_fn_t)lvremove_single)) != ECMD_PROCESSED) {
+ NULL, (process_single_lv_fn_t)lvremove_single)) != ECMD_PROCESSED) {
stack;
return ret;
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1e2420bca85da9a3…
Commit: 1e2420bca85da9a37570871cd70192e9ae831786
Parent: 19267fa6aa0709e3d0c962ad0904920f06102a5b
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Fri Aug 12 15:52:18 2016 -0500
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
commands: new method for defining commands
. Define a prototype for every lvm command.
. Match every user command with one definition.
. Generate help text and man pages from them.
The new file command-lines.in defines a prototype for every
unique lvm command. A unique lvm command is a unique
combination of: command name + required option args +
required positional args. Each of these prototypes also
includes the optional option args and optional positional
args that the command will accept, a description, and a
unique string ID for the definition. Any valid command
will match one of the prototypes.
Here's an example of the lvresize command definitions from
command-lines.in, there are three unique lvresize commands:
lvresize --size SizeMB LV
OO: --alloc Alloc, --autobackup Bool, --force,
--nofsck, --nosync, --noudevsync, --reportformat String, --resizefs,
--stripes Number, --stripesize SizeKB, --poolmetadatasize SizeMB
OP: PV ...
ID: lvresize_by_size
DESC: Resize an LV by a specified size.
lvresize LV PV ...
OO: --alloc Alloc, --autobackup Bool, --force,
--nofsck, --nosync, --noudevsync,
--reportformat String, --resizefs, --stripes Number, --stripesize SizeKB
ID: lvresize_by_pv
DESC: Resize an LV by specified PV extents.
FLAGS: SECONDARY_SYNTAX
lvresize --poolmetadatasize SizeMB LV_thinpool
OO: --alloc Alloc, --autobackup Bool, --force,
--nofsck, --nosync, --noudevsync,
--reportformat String, --stripes Number, --stripesize SizeKB
OP: PV ...
ID: lvresize_pool_metadata_by_size
DESC: Resize a pool metadata SubLV by a specified size.
The three commands have separate definitions because they have
different required parameters. Required parameters are specified
on the first line of the definition. Optional options are
listed after OO, and optional positional args are listed after OP.
This data is used to generate corresponding command definition
structures for lvm in command-lines.h. usage/help output is also
auto generated, so it is always in sync with the definitions.
Every user-entered command is compared against the set of
command structures, and matched with one. An error is
reported if an entered command does not have the required
parameters for any definition. The closest match is printed
as a suggestion, and running lvresize --help will display
the usage for each possible lvresize command.
The prototype syntax used for help/man output includes
required --option and positional args on the first line,
and optional --option and positional args enclosed in [ ]
on subsequent lines.
command_name <required_opt_args> <required_pos_args>
[ <optional_opt_args> ]
[ <optional_pos_args> ]
Command definitions that are not to be advertised/suggested
have the flag SECONDARY_SYNTAX. These commands will not be
printed in the normal help output.
Man page prototypes are also generated from the same original
command definitions, and are always in sync with the code
and help text.
Very early in command execution, a matching command definition
is found. lvm then knows the operation being done, and that
the provided args conform to the definition. This will allow
lots of ad hoc checking/validation to be removed throughout
the code.
Each command definition can also be routed to a specific
function to implement it. The function is associated with
an enum value for the command definition (generated from
the ID string.) These per-command-definition implementation
functions have not yet been created, so all commands
currently fall back to the existing per-command-name
implementation functions.
Using per-command-definition functions will allow lots of
code to be removed which tries to figure out what the
command is meant to do. This is currently based on ad hoc
and complicated option analysis. When using the new
functions, what the command is doing is already known
from the associated command definition.
---
lib/commands/toolcontext.h | 10 +-
lib/metadata/lv_manip.c | 3 +-
lib/metadata/metadata-exported.h | 9 +-
lib/metadata/thin_manip.c | 13 +
test/shell/lvconvert-thin-raid.sh | 4 +-
test/shell/lvconvert-thin.sh | 4 +-
test/shell/lvcreate-cache.sh | 2 +-
test/shell/vgextend-restoremissing.sh | 1 -
tools/Makefile.in | 11 +-
tools/args.h | 407 +++---
tools/command-lines.in | 1579 +++++++++++++++++
tools/command.h | 207 +++
tools/commands.h | 1428 +---------------
tools/create-commands.c | 2990 +++++++++++++++++++++++++++++++++
tools/lv_props.h | 56 +
tools/lv_types.h | 34 +
tools/lvm.c | 32 +-
tools/lvm2cmdline.h | 9 +-
tools/lvmcmdlib.c | 4 +-
tools/lvmcmdline.c | 1446 ++++++++++++++--
tools/toollib.c | 641 +++++++-
tools/toollib.h | 6 +
tools/tools.h | 86 +-
tools/vals.h | 136 ++
tools/vgchange.c | 3 +
tools/vgconvert.c | 14 +-
tools/vgextend.c | 6 -
27 files changed, 7305 insertions(+), 1836 deletions(-)
diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
index bb962dc..2dc1c28 100644
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -88,12 +88,20 @@ struct cmd_context {
* Command line and arguments.
*/
const char *cmd_line;
+ const char *name; /* needed before cmd->command is set */
struct command *command;
char **argv;
- struct arg_values *arg_values;
+ struct arg_values *opt_arg_values;
struct dm_list arg_value_groups;
/*
+ * Position args remaining after command name
+ * and --options are removed from original argc/argv.
+ */
+ int position_argc;
+ char **position_argv;
+
+ /*
* Format handlers.
*/
const struct format_type *fmt; /* current format to use by default */
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 01ab96b..bc599de 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -319,7 +319,6 @@ static int _lv_layout_and_role_thin(struct dm_pool *mem,
{
int top_level = 0;
unsigned snap_count;
- struct lv_segment *seg;
/* non-top-level LVs */
if (lv_is_thin_pool_metadata(lv)) {
@@ -353,7 +352,7 @@ static int _lv_layout_and_role_thin(struct dm_pool *mem,
!str_list_add_no_dup_check(mem, role, _lv_type_names[LV_TYPE_MULTITHINORIGIN]))
goto_bad;
}
- if ((seg = first_seg(lv)) && (seg->origin || seg->external_lv))
+ if (lv_is_thin_snapshot(lv))
if (!str_list_add(mem, role, _lv_type_names[LV_TYPE_SNAPSHOT]) ||
!str_list_add_no_dup_check(mem, role, _lv_type_names[LV_TYPE_THINSNAPSHOT]))
goto_bad;
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 5fe169c..420893c 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -1067,9 +1067,16 @@ struct lv_segment *get_only_segment_using_this_lv(const struct logical_volume *l
* Useful functions for managing snapshots.
*/
int lv_is_origin(const struct logical_volume *lv);
+#define lv_is_thick_origin lv_is_origin
+
int lv_is_thin_origin(const struct logical_volume *lv, unsigned *snap_count);
-int lv_is_cache_origin(const struct logical_volume *lv);
+int lv_is_thin_snapshot(const struct logical_volume *lv);
+
int lv_is_cow(const struct logical_volume *lv);
+#define lv_is_thick_snapshot lv_is_cow
+
+int lv_is_cache_origin(const struct logical_volume *lv);
+
int lv_is_merging_cow(const struct logical_volume *cow);
uint32_t cow_max_extents(const struct logical_volume *origin, uint32_t chunk_size);
int cow_has_min_chunks(const struct volume_group *vg, uint32_t cow_extents, uint32_t chunk_size);
diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c
index 42ec552..3e2a185 100644
--- a/lib/metadata/thin_manip.c
+++ b/lib/metadata/thin_manip.c
@@ -752,6 +752,19 @@ int lv_is_thin_origin(const struct logical_volume *lv, unsigned int *snap_count)
return r;
}
+int lv_is_thin_snapshot(const struct logical_volume *lv)
+{
+ struct lv_segment *seg;
+
+ if (!lv_is_thin_volume(lv))
+ return 0;
+
+ if ((seg = first_seg(lv)) && (seg->origin || seg->external_lv))
+ return 1;
+
+ return 0;
+}
+
/*
* Explict check of new thin pool for usability
*
diff --git a/test/shell/lvconvert-thin-raid.sh b/test/shell/lvconvert-thin-raid.sh
index 7fa8733..33e5b6d 100644
--- a/test/shell/lvconvert-thin-raid.sh
+++ b/test/shell/lvconvert-thin-raid.sh
@@ -30,8 +30,8 @@ aux wait_for_sync $vg $lv2
lvchange -an $vg/$lv1
# conversion fails for internal volumes
-invalid lvconvert --thinpool $vg/${lv1}_rimage_0
-invalid lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/${lv2}_rimage_0
+not lvconvert --thinpool $vg/${lv1}_rimage_0
+not lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/${lv2}_rimage_0
lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
diff --git a/test/shell/lvconvert-thin.sh b/test/shell/lvconvert-thin.sh
index 4bd1acd..3878fcb 100644
--- a/test/shell/lvconvert-thin.sh
+++ b/test/shell/lvconvert-thin.sh
@@ -58,13 +58,13 @@ lvchange -an $vg/$lv1
# conversion fails for mirror segment type
fail lvconvert --thinpool $vg/$lv1
# cannot use same LV
-invalid lvconvert --yes --thinpool $vg/$lv2 --poolmetadata $vg/$lv2
+not lvconvert --yes --thinpool $vg/$lv2 --poolmetadata $vg/$lv2
prepare_lvs
# conversion fails for internal volumes
# can't use --readahead with --poolmetadata
-invalid lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 --readahead 512
+not lvconvert --thinpool $vg/$lv1 --poolmetadata $vg/$lv2 --readahead 512
lvconvert --yes --thinpool $vg/$lv1 --poolmetadata $vg/$lv2
prepare_lvs
diff --git a/test/shell/lvcreate-cache.sh b/test/shell/lvcreate-cache.sh
index c38549f..9222bea 100644
--- a/test/shell/lvcreate-cache.sh
+++ b/test/shell/lvcreate-cache.sh
@@ -56,7 +56,7 @@ fail lvcreate -l 1 --cachepool pool8 $vg
# no size specified
invalid lvcreate --cachepool pool $vg 2>&1 | tee err
-grep "specify either size or extents" err
+# grep "specify either size or extents" err
# Check nothing has been created yet
check vg_field $vg lv_count 0
diff --git a/test/shell/vgextend-restoremissing.sh b/test/shell/vgextend-restoremissing.sh
index 7346519..2a82115 100644
--- a/test/shell/vgextend-restoremissing.sh
+++ b/test/shell/vgextend-restoremissing.sh
@@ -23,7 +23,6 @@ lvcreate -l 1 -n lv1 $vg "$dev1"
invalid vgextend
# --metadatacopies => use --pvmetadatacopies
invalid vgextend --metadatacopies 3 $vg "$dev1" 2>&1 | tee out
-grep -- "use --pvmetadatacopies" out
# VG name should exist
fail vgextend --restoremissing $vg-invalid "$dev1"
diff --git a/tools/Makefile.in b/tools/Makefile.in
index d93c31b..887bc69 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -76,6 +76,7 @@ SOURCES2 =\
TARGETS =\
.commands \
+ command-lines.h \
liblvm2cmd.a \
lvm
@@ -99,7 +100,8 @@ LIB_VERSION = $(LIB_VERSION_LVM)
CLEAN_TARGETS = liblvm2cmd.$(LIB_SUFFIX) $(TARGETS_DM) \
liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) lvm-static.o \
liblvm2cmd-static.a dmsetup.static lvm.static \
- $(LDDEPS) .exported_symbols_generated
+ $(LDDEPS) .exported_symbols_generated \
+ ccmd command-lines.h command-lines-count.h
ifeq ("@CMDLIB@", "yes")
TARGETS += liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
@@ -171,6 +173,13 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
$(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
egrep -v '^ *(|#.*|config|devtypes|dumpconfig|formats|fullreport|help|lastlog|lvpoll|pvdata|segtypes|systemid|tags|version) *$$' > .commands
+ccmd: create-commands.c
+ $(CC) create-commands.c -o ccmd
+
+command-lines.h: ccmd
+ ./ccmd --output struct command-lines.in > command-lines.h
+ ./ccmd --output count command-lines.in > command-lines-count.h
+
ifneq ("$(CFLOW_CMD)", "")
CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
-include $(top_builddir)/libdm/libdevmapper.cflow
diff --git a/tools/args.h b/tools/args.h
index a6fc77c..8f5f0ec 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -17,215 +17,216 @@
* Put all long args that don't have a corresponding short option first.
*/
/* *INDENT-OFF* */
-arg(abort_ARG, '\0', "abort", NULL, 0, 0)
-arg(activationmode_ARG, '\0', "activationmode", string_arg, 0, 0)
-arg(addtag_ARG, '\0', "addtag", tag_arg, ARG_GROUPABLE, 0)
-arg(aligned_ARG, '\0', "aligned", NULL, 0, 0)
-arg(alloc_ARG, '\0', "alloc", alloc_arg, 0, 0)
-arg(atomic_ARG, '\0', "atomic", NULL, 0, 0)
-arg(atversion_ARG, '\0', "atversion", string_arg, 0, 0)
-arg(binary_ARG, '\0', "binary", NULL, 0, 0)
-arg(bootloaderareasize_ARG, '\0', "bootloaderareasize", size_mb_arg, 0, 0)
-arg(cache_long_ARG, '\0', "cache", NULL, 0, 0)
-arg(cachemode_ARG, '\0', "cachemode", cachemode_arg, 0, 0)
-arg(cachepool_ARG, '\0', "cachepool", string_arg, 0, 0)
-arg(commandprofile_ARG, '\0', "commandprofile", string_arg, 0, 0)
-arg(config_ARG, '\0', "config", string_arg, 0, 0)
-arg(configreport_ARG, '\0', "configreport", string_arg, ARG_GROUPABLE, 1)
-arg(configtype_ARG, '\0', "type", string_arg, 0, 0)
-arg(corelog_ARG, '\0', "corelog", NULL, 0, 0)
-arg(dataalignment_ARG, '\0', "dataalignment", size_kb_arg, 0, 0)
-arg(dataalignmentoffset_ARG, '\0', "dataalignmentoffset", size_kb_arg, 0, 0)
-arg(deltag_ARG, '\0', "deltag", tag_arg, ARG_GROUPABLE, 0)
-arg(detachprofile_ARG, '\0', "detachprofile", NULL, 0, 0)
-arg(discards_ARG, '\0', "discards", discards_arg, 0, 0)
-arg(driverloaded_ARG, '\0', "driverloaded", yes_no_arg, 0, 0)
-arg(errorwhenfull_ARG, '\0', "errorwhenfull", yes_no_arg, 0, 0)
-arg(force_long_ARG, '\0', "force", NULL, ARG_COUNTABLE, 0)
-arg(foreign_ARG, '\0', "foreign", NULL, 0, 0)
-arg(handlemissingpvs_ARG, '\0', "handlemissingpvs", NULL, 0, 0)
-arg(ignoreadvanced_ARG, '\0', "ignoreadvanced", NULL, 0, 0)
-arg(ignorelocal_ARG, '\0', "ignorelocal", NULL, 0, 0)
-arg(ignorelockingfailure_ARG, '\0', "ignorelockingfailure", NULL, 0, 0)
-arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", NULL, 0, 0)
-arg(ignoreskippedcluster_ARG, '\0', "ignoreskippedcluster", NULL, 0, 0)
-arg(ignoreunsupported_ARG, '\0', "ignoreunsupported", NULL, 0, 0)
-arg(labelsector_ARG, '\0', "labelsector", int_arg, 0, 0)
-arg(lockopt_ARG, '\0', "lockopt", string_arg, 0, 0)
-arg(lockstart_ARG, '\0', "lockstart", NULL, 0, 0)
-arg(lockstop_ARG, '\0', "lockstop", NULL, 0, 0)
-arg(locktype_ARG, '\0', "locktype", locktype_arg, 0, 0)
-arg(logonly_ARG, '\0', "logonly", NULL, 0, 0)
-arg(maxrecoveryrate_ARG, '\0', "maxrecoveryrate", size_kb_arg, 0, 0)
-arg(merge_ARG, '\0', "merge", NULL, 0, 0)
-arg(mergedconfig_ARG, '\0', "mergedconfig", NULL, 0, 0)
-arg(metadatacopies_ARG, '\0', "metadatacopies", metadatacopies_arg, 0, 0)
-arg(metadataignore_ARG, '\0', "metadataignore", yes_no_arg, 0, 0)
-arg(metadataprofile_ARG, '\0', "metadataprofile", string_arg, 0, 0)
-arg(metadatasize_ARG, '\0', "metadatasize", size_mb_arg, 0, 0)
-arg(minor_ARG, '\0', "minor", int_arg, ARG_GROUPABLE, 0)
-arg(minrecoveryrate_ARG, '\0', "minrecoveryrate", size_kb_arg, 0, 0)
-arg(mirrorlog_ARG, '\0', "mirrorlog", mirrorlog_arg, 0, 0)
-arg(mirrorsonly_ARG, '\0', "mirrorsonly", NULL, 0, 0)
-arg(mknodes_ARG, '\0', "mknodes", NULL, 0, 0)
-arg(monitor_ARG, '\0', "monitor", yes_no_arg, 0, 0)
-arg(nameprefixes_ARG, '\0', "nameprefixes", NULL, 0, 0)
-arg(noheadings_ARG, '\0', "noheadings", NULL, 0, 0)
-arg(nohistory_ARG, '\0', "nohistory", NULL, 0, 0)
-arg(nolocking_ARG, '\0', "nolocking", NULL, 0, 0)
-arg(norestorefile_ARG, '\0', "norestorefile", NULL, 0, 0)
-arg(nosuffix_ARG, '\0', "nosuffix", NULL, 0, 0)
-arg(nosync_ARG, '\0', "nosync", NULL, 0, 0)
-arg(notifydbus_ARG, '\0', "notifydbus", NULL, 0, 0)
-arg(noudevsync_ARG, '\0', "noudevsync", NULL, 0, 0)
-arg(originname_ARG, '\0', "originname", string_arg, 0, 0)
-arg(physicalvolumesize_ARG, '\0', "setphysicalvolumesize", size_mb_arg, 0, 0)
-arg(poll_ARG, '\0', "poll", yes_no_arg, 0, 0)
-arg(polloperation_ARG, '\0', "polloperation", string_arg, 0, 0)
-arg(pooldatasize_ARG, '\0', "pooldatasize", size_mb_arg, 0, 0)
-arg(poolmetadata_ARG, '\0', "poolmetadata", string_arg, 0, 0)
-arg(poolmetadatasize_ARG, '\0', "poolmetadatasize", size_mb_arg, 0, 0)
-arg(poolmetadataspare_ARG, '\0', "poolmetadataspare", yes_no_arg, 0, 0)
-arg(profile_ARG, '\0', "profile", string_arg, 0, 0)
-arg(pvmetadatacopies_ARG, '\0', "pvmetadatacopies", int_arg, 0, 0)
-arg(raidrebuild_ARG, '\0', "raidrebuild", string_arg, ARG_GROUPABLE, 0)
-arg(raidmaxrecoveryrate_ARG, '\0', "raidmaxrecoveryrate", size_kb_arg, 0, 0)
-arg(raidminrecoveryrate_ARG, '\0', "raidminrecoveryrate", size_kb_arg, 0, 0)
-arg(raidsyncaction_ARG, '\0', "raidsyncaction", string_arg, 0, 0)
-arg(raidwritebehind_ARG, '\0', "raidwritebehind", int_arg, 0, 0)
-arg(raidwritemostly_ARG, '\0', "raidwritemostly", string_arg, ARG_GROUPABLE, 0)
-arg(readonly_ARG, '\0', "readonly", NULL, 0, 0)
-arg(refresh_ARG, '\0', "refresh", NULL, 0, 0)
-arg(removemissing_ARG, '\0', "removemissing", NULL, 0, 0)
-arg(rebuild_ARG, '\0', "rebuild", string_arg, ARG_GROUPABLE, 0)
-arg(repair_ARG, '\0', "repair", NULL, 0, 0)
-arg(replace_ARG, '\0', "replace", string_arg, ARG_GROUPABLE, 0)
-arg(reportformat_ARG, '\0', "reportformat", string_arg, 0, 0)
-arg(restorefile_ARG, '\0', "restorefile", string_arg, 0, 0)
-arg(restoremissing_ARG, '\0', "restoremissing", NULL, 0, 0)
-arg(resync_ARG, '\0', "resync", NULL, 0, 0)
-arg(rows_ARG, '\0', "rows", NULL, 0, 0)
-arg(segments_ARG, '\0', "segments", NULL, 0, 0)
-arg(separator_ARG, '\0', "separator", string_arg, 0, 0)
-arg(shared_ARG, '\0', "shared", NULL, 0, 0)
-arg(sinceversion_ARG, '\0', "sinceversion", string_arg, 0, 0)
-arg(split_ARG, '\0', "split", NULL, 0, 0)
-arg(splitcache_ARG, '\0', "splitcache", NULL, 0, 0)
-arg(splitmirrors_ARG, '\0', "splitmirrors", int_arg, 0, 0)
-arg(splitsnapshot_ARG, '\0', "splitsnapshot", NULL, 0, 0)
-arg(showdeprecated_ARG, '\0', "showdeprecated", NULL, 0, 0)
-arg(showunsupported_ARG, '\0', "showunsupported", NULL, 0, 0)
-arg(stripes_long_ARG, '\0', "stripes", int_arg, 0, 0)
-arg(syncaction_ARG, '\0', "syncaction", string_arg, 0, 0) /* FIXME Use custom validation fn */
-arg(sysinit_ARG, '\0', "sysinit", NULL, 0, 0)
-arg(systemid_ARG, '\0', "systemid", string_arg, 0, 0)
-arg(thinpool_ARG, '\0', "thinpool", string_arg, 0, 0)
-arg(trackchanges_ARG, '\0', "trackchanges", NULL, 0, 0)
-arg(trustcache_ARG, '\0', "trustcache", NULL, 0, 0)
-arg(type_ARG, '\0', "type", segtype_arg, 0, 0)
-arg(unbuffered_ARG, '\0', "unbuffered", NULL, 0, 0)
-arg(uncache_ARG, '\0', "uncache", NULL, 0, 0)
-arg(cachepolicy_ARG, '\0', "cachepolicy", string_arg, 0, 0)
-arg(cachesettings_ARG, '\0', "cachesettings", string_arg, ARG_GROUPABLE, 0)
-arg(unconfigured_ARG, '\0', "unconfigured", NULL, 0, 0)
-arg(units_ARG, '\0', "units", string_arg, 0, 0)
-arg(unquoted_ARG, '\0', "unquoted", NULL, 0, 0)
-arg(usepolicies_ARG, '\0', "usepolicies", NULL, 0, 0)
-arg(validate_ARG, '\0', "validate", NULL, 0, 0)
-arg(version_ARG, '\0', "version", NULL, 0, 0)
-arg(vgmetadatacopies_ARG, '\0', "vgmetadatacopies", metadatacopies_arg, 0, 0)
-arg(virtualoriginsize_ARG, '\0', "virtualoriginsize", size_mb_arg, 0, 0)
-arg(withsummary_ARG, '\0', "withsummary", NULL, 0, 0)
-arg(withcomments_ARG, '\0', "withcomments", NULL, 0, 0)
-arg(withspaces_ARG, '\0', "withspaces", NULL, 0, 0)
-arg(withversions_ARG, '\0', "withversions", NULL, 0, 0)
-arg(writebehind_ARG, '\0', "writebehind", int_arg, 0, 0)
-arg(writemostly_ARG, '\0', "writemostly", string_arg, ARG_GROUPABLE, 0)
+arg(ARG_UNUSED, '-', "", 0, 0, 0) /* place holder for unused 0 value */
+
+arg(abort_ARG, '\0', "abort", 0, 0, 0)
+arg(activationmode_ARG, '\0', "activationmode", activationmode_VAL, 0, 0)
+arg(addtag_ARG, '\0', "addtag", tag_VAL, ARG_GROUPABLE, 0)
+arg(aligned_ARG, '\0', "aligned", 0, 0, 0)
+arg(alloc_ARG, '\0', "alloc", alloc_VAL, 0, 0)
+arg(atomic_ARG, '\0', "atomic", 0, 0, 0)
+arg(atversion_ARG, '\0', "atversion", string_VAL, 0, 0)
+arg(binary_ARG, '\0', "binary", 0, 0, 0)
+arg(bootloaderareasize_ARG, '\0', "bootloaderareasize", sizemb_VAL, 0, 0)
+arg(cache_long_ARG, '\0', "cache", 0, 0, 0)
+arg(cachemode_ARG, '\0', "cachemode", cachemode_VAL, 0, 0)
+arg(cachepool_ARG, '\0', "cachepool", lv_VAL, 0, 0)
+arg(commandprofile_ARG, '\0', "commandprofile", string_VAL, 0, 0)
+arg(config_ARG, '\0', "config", string_VAL, 0, 0)
+arg(configreport_ARG, '\0', "configreport", configreport_VAL, ARG_GROUPABLE, 1)
+arg(configtype_ARG, '\0', "typeconfig", configtype_VAL, 0, 0)
+arg(corelog_ARG, '\0', "corelog", 0, 0, 0)
+arg(dataalignment_ARG, '\0', "dataalignment", sizekb_VAL, 0, 0)
+arg(dataalignmentoffset_ARG, '\0', "dataalignmentoffset", sizekb_VAL, 0, 0)
+arg(deltag_ARG, '\0', "deltag", tag_VAL, ARG_GROUPABLE, 0)
+arg(detachprofile_ARG, '\0', "detachprofile", 0, 0, 0)
+arg(discards_ARG, '\0', "discards", discards_VAL, 0, 0)
+arg(driverloaded_ARG, '\0', "driverloaded", bool_VAL, 0, 0)
+arg(errorwhenfull_ARG, '\0', "errorwhenfull", bool_VAL, 0, 0)
+arg(force_long_ARG, '\0', "force", 0, ARG_COUNTABLE, 0)
+arg(foreign_ARG, '\0', "foreign", 0, 0, 0)
+arg(handlemissingpvs_ARG, '\0', "handlemissingpvs", 0, 0, 0)
+arg(ignoreadvanced_ARG, '\0', "ignoreadvanced", 0, 0, 0)
+arg(ignorelocal_ARG, '\0', "ignorelocal", 0, 0, 0)
+arg(ignorelockingfailure_ARG, '\0', "ignorelockingfailure", 0, 0, 0)
+arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", 0, 0, 0)
+arg(ignoreskippedcluster_ARG, '\0', "ignoreskippedcluster", 0, 0, 0)
+arg(ignoreunsupported_ARG, '\0', "ignoreunsupported", 0, 0, 0)
+arg(labelsector_ARG, '\0', "labelsector", number_VAL, 0, 0)
+arg(lockopt_ARG, '\0', "lockopt", string_VAL, 0, 0)
+arg(lockstart_ARG, '\0', "lockstart", 0, 0, 0)
+arg(lockstop_ARG, '\0', "lockstop", 0, 0, 0)
+arg(locktype_ARG, '\0', "locktype", locktype_VAL, 0, 0)
+arg(logonly_ARG, '\0', "logonly", 0, 0, 0)
+arg(maxrecoveryrate_ARG, '\0', "maxrecoveryrate", sizekb_VAL, 0, 0)
+arg(merge_ARG, '\0', "merge", 0, 0, 0)
+arg(mergedconfig_ARG, '\0', "mergedconfig", 0, 0, 0)
+arg(metadatacopies_ARG, '\0', "metadatacopies", metadatacopies_VAL, 0, 0)
+arg(metadataignore_ARG, '\0', "metadataignore", bool_VAL, 0, 0)
+arg(metadataprofile_ARG, '\0', "metadataprofile", string_VAL, 0, 0)
+arg(metadatasize_ARG, '\0', "metadatasize", sizemb_VAL, 0, 0)
+arg(minor_ARG, '\0', "minor", number_VAL, ARG_GROUPABLE, 0)
+arg(minrecoveryrate_ARG, '\0', "minrecoveryrate", sizekb_VAL, 0, 0)
+arg(mirrorlog_ARG, '\0', "mirrorlog", mirrorlog_VAL, 0, 0)
+arg(mirrorsonly_ARG, '\0', "mirrorsonly", 0, 0, 0)
+arg(mknodes_ARG, '\0', "mknodes", 0, 0, 0)
+arg(monitor_ARG, '\0', "monitor", bool_VAL, 0, 0)
+arg(nameprefixes_ARG, '\0', "nameprefixes", 0, 0, 0)
+arg(noheadings_ARG, '\0', "noheadings", 0, 0, 0)
+arg(nohistory_ARG, '\0', "nohistory", 0, 0, 0)
+arg(nolocking_ARG, '\0', "nolocking", 0, 0, 0)
+arg(norestorefile_ARG, '\0', "norestorefile", 0, 0, 0)
+arg(nosuffix_ARG, '\0', "nosuffix", 0, 0, 0)
+arg(nosync_ARG, '\0', "nosync", 0, 0, 0)
+arg(notifydbus_ARG, '\0', "notifydbus", 0, 0, 0)
+arg(noudevsync_ARG, '\0', "noudevsync", 0, 0, 0)
+arg(originname_ARG, '\0', "originname", lv_VAL, 0, 0)
+arg(physicalvolumesize_ARG, '\0', "setphysicalvolumesize", sizemb_VAL, 0, 0)
+arg(poll_ARG, '\0', "poll", bool_VAL, 0, 0)
+arg(polloperation_ARG, '\0', "polloperation", polloperation_VAL, 0, 0)
+arg(pooldatasize_ARG, '\0', "pooldatasize", sizemb_VAL, 0, 0)
+arg(poolmetadata_ARG, '\0', "poolmetadata", lv_VAL, 0, 0)
+arg(poolmetadatasize_ARG, '\0', "poolmetadatasize", sizemb_VAL, 0, 0)
+arg(poolmetadataspare_ARG, '\0', "poolmetadataspare", bool_VAL, 0, 0)
+arg(profile_ARG, '\0', "profile", string_VAL, 0, 0)
+arg(pvmetadatacopies_ARG, '\0', "pvmetadatacopies", pvmetadatacopies_VAL, 0, 0)
+arg(raidrebuild_ARG, '\0', "raidrebuild", pv_VAL, ARG_GROUPABLE, 0)
+arg(raidmaxrecoveryrate_ARG, '\0', "raidmaxrecoveryrate", sizekb_VAL, 0, 0)
+arg(raidminrecoveryrate_ARG, '\0', "raidminrecoveryrate", sizekb_VAL, 0, 0)
+arg(raidsyncaction_ARG, '\0', "raidsyncaction", syncaction_VAL, 0, 0)
+arg(raidwritebehind_ARG, '\0', "raidwritebehind", number_VAL, 0, 0)
+arg(raidwritemostly_ARG, '\0', "raidwritemostly", writemostly_VAL, ARG_GROUPABLE, 0)
+arg(readonly_ARG, '\0', "readonly", 0, 0, 0)
+arg(refresh_ARG, '\0', "refresh", 0, 0, 0)
+arg(removemissing_ARG, '\0', "removemissing", 0, 0, 0)
+arg(rebuild_ARG, '\0', "rebuild", pv_VAL, ARG_GROUPABLE, 0)
+arg(repair_ARG, '\0', "repair", 0, 0, 0)
+arg(replace_ARG, '\0', "replace", pv_VAL, ARG_GROUPABLE, 0)
+arg(reportformat_ARG, '\0', "reportformat", reportformat_VAL, 0, 0)
+arg(restorefile_ARG, '\0', "restorefile", string_VAL, 0, 0)
+arg(restoremissing_ARG, '\0', "restoremissing", 0, 0, 0)
+arg(resync_ARG, '\0', "resync", 0, 0, 0)
+arg(rows_ARG, '\0', "rows", 0, 0, 0)
+arg(segments_ARG, '\0', "segments", 0, 0, 0)
+arg(separator_ARG, '\0', "separator", string_VAL, 0, 0)
+arg(shared_ARG, '\0', "shared", 0, 0, 0)
+arg(sinceversion_ARG, '\0', "sinceversion", string_VAL, 0, 0)
+arg(split_ARG, '\0', "split", 0, 0, 0)
+arg(splitcache_ARG, '\0', "splitcache", 0, 0, 0)
+arg(splitmirrors_ARG, '\0', "splitmirrors", number_VAL, 0, 0)
+arg(splitsnapshot_ARG, '\0', "splitsnapshot", 0, 0, 0)
+arg(showdeprecated_ARG, '\0', "showdeprecated", 0, 0, 0)
+arg(showunsupported_ARG, '\0', "showunsupported", 0, 0, 0)
+arg(stripes_long_ARG, '\0', "stripes", number_VAL, 0, 0)
+arg(syncaction_ARG, '\0', "syncaction", syncaction_VAL, 0, 0)
+arg(sysinit_ARG, '\0', "sysinit", 0, 0, 0)
+arg(systemid_ARG, '\0', "systemid", string_VAL, 0, 0)
+arg(thinpool_ARG, '\0', "thinpool", lv_VAL, 0, 0)
+arg(trackchanges_ARG, '\0', "trackchanges", 0, 0, 0)
+arg(trustcache_ARG, '\0', "trustcache", 0, 0, 0)
+arg(type_ARG, '\0', "type", segtype_VAL, 0, 0)
+arg(unbuffered_ARG, '\0', "unbuffered", 0, 0, 0)
+arg(uncache_ARG, '\0', "uncache", 0, 0, 0)
+arg(cachepolicy_ARG, '\0', "cachepolicy", string_VAL, 0, 0)
+arg(cachesettings_ARG, '\0', "cachesettings", string_VAL, ARG_GROUPABLE, 0)
+arg(unconfigured_ARG, '\0', "unconfigured", 0, 0, 0)
+arg(units_ARG, '\0', "units", units_VAL, 0, 0)
+arg(unquoted_ARG, '\0', "unquoted", 0, 0, 0)
+arg(usepolicies_ARG, '\0', "usepolicies", 0, 0, 0)
+arg(validate_ARG, '\0', "validate", 0, 0, 0)
+arg(version_ARG, '\0', "version", 0, 0, 0)
+arg(vgmetadatacopies_ARG, '\0', "vgmetadatacopies", vgmetadatacopies_VAL, 0, 0)
+arg(virtualoriginsize_ARG, '\0', "virtualoriginsize", sizemb_VAL, 0, 0)
+arg(withsummary_ARG, '\0', "withsummary", 0, 0, 0)
+arg(withcomments_ARG, '\0', "withcomments", 0, 0, 0)
+arg(withspaces_ARG, '\0', "withspaces", 0, 0, 0)
+arg(withversions_ARG, '\0', "withversions", 0, 0, 0)
+arg(writebehind_ARG, '\0', "writebehind", number_VAL, 0, 0)
+arg(writemostly_ARG, '\0', "writemostly", writemostly_VAL, ARG_GROUPABLE, 0)
/* Allow some variations */
-arg(allocation_ARG, '\0', "allocation", yes_no_arg, 0, 0)
-arg(available_ARG, '\0', "available", activation_arg, 0, 0)
-arg(resizable_ARG, '\0', "resizable", yes_no_arg, 0, 0)
+arg(allocation_ARG, '\0', "allocation", bool_VAL, 0, 0)
+arg(available_ARG, '\0', "available", activation_VAL, 0, 0)
+arg(resizable_ARG, '\0', "resizable", bool_VAL, 0, 0)
/*
* ... and now the short args.
*/
-arg(activate_ARG, 'a', "activate", activation_arg, 0, 0)
-arg(all_ARG, 'a', "all", NULL, 0, 0)
-arg(autobackup_ARG, 'A', "autobackup", yes_no_arg, 0, 0)
-arg(activevolumegroups_ARG, 'A', "activevolumegroups", NULL, 0, 0)
-arg(background_ARG, 'b', "background", NULL, 0, 0)
-arg(backgroundfork_ARG, 'b', "background", NULL, 0, 0)
-arg(basevgname_ARG, 'n', "basevgname", string_arg, 0, 0)
-arg(blockdevice_ARG, 'b', "blockdevice", NULL, 0, 0)
-arg(chunksize_ARG, 'c', "chunksize", size_kb_arg, 0, 0)
-arg(clustered_ARG, 'c', "clustered", yes_no_arg, 0, 0)
-arg(colon_ARG, 'c', "colon", NULL, 0, 0)
-arg(columns_ARG, 'C', "columns", NULL, 0, 0)
-arg(contiguous_ARG, 'C', "contiguous", yes_no_arg, 0, 0)
-arg(debug_ARG, 'd', "debug", NULL, ARG_COUNTABLE, 0)
-arg(exported_ARG, 'e', "exported", NULL, 0, 0)
-arg(physicalextent_ARG, 'E', "physicalextent", NULL, 0, 0)
-arg(file_ARG, 'f', "file", string_arg, 0, 0)
-arg(force_ARG, 'f', "force", NULL, ARG_COUNTABLE, 0)
-arg(full_ARG, 'f', "full", NULL, 0, 0)
-arg(help_ARG, 'h', "help", NULL, 0, 0)
-arg(cache_ARG, 'H', "cache", NULL, 0, 0)
-arg(history_ARG, 'H', "history", NULL, 0, 0)
-arg(help2_ARG, '?', "", NULL, 0, 0)
-arg(import_ARG, 'i', "import", NULL, 0, 0)
-arg(interval_ARG, 'i', "interval", int_arg, 0, 0)
-arg(iop_version_ARG, 'i', "iop_version", NULL, 0, 0)
-arg(stripes_ARG, 'i', "stripes", int_arg, 0, 0)
-arg(stripesize_ARG, 'I', "stripesize", size_kb_arg, 0, 0)
-arg(logicalvolume_ARG, 'l', "logicalvolume", uint32_arg, 0, 0)
-arg(maxlogicalvolumes_ARG, 'l', "maxlogicalvolumes", uint32_arg, 0, 0)
-arg(extents_ARG, 'l', "extents", int_arg_with_sign_and_percent, 0, 0)
-arg(list_ARG, 'l', "list", NULL, 0, 0)
-arg(lvmpartition_ARG, 'l', "lvmpartition", NULL, 0, 0)
-arg(logicalextent_ARG, 'L', "logicalextent", int_arg_with_sign, 0, 0)
-arg(size_ARG, 'L', "size", size_mb_arg, 0, 0)
-arg(persistent_ARG, 'M', "persistent", yes_no_arg, 0, 0)
-arg(major_ARG, 'j', "major", int_arg, ARG_GROUPABLE, 0)
-arg(setactivationskip_ARG, 'k', "setactivationskip", yes_no_arg, 0, 0)
-arg(ignoreactivationskip_ARG, 'K', "ignoreactivationskip", NULL, 0, 0)
-arg(maps_ARG, 'm', "maps", NULL, 0, 0)
-arg(mirrors_ARG, 'm', "mirrors", int_arg_with_sign, 0, 0)
-arg(metadatatype_ARG, 'M', "metadatatype", metadatatype_arg, 0, 0)
-arg(name_ARG, 'n', "name", string_arg, 0, 0)
-arg(nofsck_ARG, 'n', "nofsck", NULL, 0, 0)
-arg(novolumegroup_ARG, 'n', "novolumegroup", NULL, 0, 0)
-arg(oldpath_ARG, 'n', "oldpath", NULL, 0, 0)
-arg(options_ARG, 'o', "options", string_arg, ARG_GROUPABLE, 0)
-arg(sort_ARG, 'O', "sort", string_arg, ARG_GROUPABLE, 0)
-arg(maxphysicalvolumes_ARG, 'p', "maxphysicalvolumes", uint32_arg, 0, 0)
-arg(permission_ARG, 'p', "permission", permission_arg, 0, 0)
-arg(partial_ARG, 'P', "partial", NULL, 0, 0)
-arg(physicalvolume_ARG, 'P', "physicalvolume", NULL, 0, 0)
-arg(quiet_ARG, 'q', "quiet", NULL, ARG_COUNTABLE, 0)
-arg(readahead_ARG, 'r', "readahead", readahead_arg, 0, 0)
-arg(resizefs_ARG, 'r', "resizefs", NULL, 0, 0)
-arg(reset_ARG, 'R', "reset", NULL, 0, 0)
-arg(regionsize_ARG, 'R', "regionsize", size_mb_arg, 0, 0)
-arg(physicalextentsize_ARG, 's', "physicalextentsize", size_mb_arg, 0, 0)
-arg(snapshot_ARG, 's', "snapshot", NULL, 0, 0)
-arg(short_ARG, 's', "short", NULL, 0, 0)
-arg(stdin_ARG, 's', "stdin", NULL, 0, 0)
-arg(select_ARG, 'S', "select", string_arg, ARG_GROUPABLE, 0)
-arg(test_ARG, 't', "test", NULL, 0, 0)
-arg(thin_ARG, 'T', "thin", NULL, 0, 0)
-arg(uuid_ARG, 'u', "uuid", NULL, 0, 0)
-arg(uuidstr_ARG, 'u', "uuid", string_arg, 0, 0)
-arg(uuidlist_ARG, 'U', "uuidlist", NULL, 0, 0)
-arg(verbose_ARG, 'v', "verbose", NULL, ARG_COUNTABLE, 0)
-arg(volumegroup_ARG, 'V', "volumegroup", NULL, 0, 0)
-arg(virtualsize_ARG, 'V', "virtualsize", size_mb_arg, 0, 0)
-arg(wipesignatures_ARG, 'W', "wipesignatures", yes_no_arg, 0, 0)
-arg(allocatable_ARG, 'x', "allocatable", yes_no_arg, 0, 0)
-arg(resizeable_ARG, 'x', "resizeable", yes_no_arg, 0, 0)
-arg(yes_ARG, 'y', "yes", NULL, 0, 0)
-arg(zero_ARG, 'Z', "zero", yes_no_arg, 0, 0)
+arg(activate_ARG, 'a', "activate", activation_VAL, 0, 0)
+arg(all_ARG, 'a', "all", 0, 0, 0)
+arg(autobackup_ARG, 'A', "autobackup", bool_VAL, 0, 0)
+arg(activevolumegroups_ARG, 'A', "activevolumegroups", 0, 0, 0)
+arg(background_ARG, 'b', "background", 0, 0, 0)
+arg(backgroundfork_ARG, 'b', "background", 0, 0, 0)
+arg(basevgname_ARG, 'n', "basevgname", string_VAL, 0, 0)
+arg(blockdevice_ARG, 'b', "blockdevice", 0, 0, 0)
+arg(chunksize_ARG, 'c', "chunksize", sizekb_VAL, 0, 0)
+arg(clustered_ARG, 'c', "clustered", bool_VAL, 0, 0)
+arg(colon_ARG, 'c', "colon", 0, 0, 0)
+arg(columns_ARG, 'C', "columns", 0, 0, 0)
+arg(contiguous_ARG, 'C', "contiguous", bool_VAL, 0, 0)
+arg(debug_ARG, 'd', "debug", 0, ARG_COUNTABLE, 0)
+arg(exported_ARG, 'e', "exported", 0, 0, 0)
+arg(physicalextent_ARG, 'E', "physicalextent", 0, 0, 0)
+arg(file_ARG, 'f', "file", string_VAL, 0, 0)
+arg(force_ARG, 'f', "force", 0, ARG_COUNTABLE, 0)
+arg(full_ARG, 'f', "full", 0, 0, 0)
+arg(help_ARG, 'h', "help", 0, ARG_COUNTABLE, 0)
+arg(cache_ARG, 'H', "cache", 0, 0, 0)
+arg(history_ARG, 'H', "history", 0, 0, 0)
+arg(help2_ARG, '?', "", 0, 0, 0)
+arg(import_ARG, 'i', "import", 0, 0, 0)
+arg(interval_ARG, 'i', "interval", number_VAL, 0, 0)
+arg(iop_version_ARG, 'i', "iop_version", 0, 0, 0)
+arg(stripes_ARG, 'i', "stripes", number_VAL, 0, 0)
+arg(stripesize_ARG, 'I', "stripesize", sizekb_VAL, 0, 0)
+arg(logicalvolume_ARG, 'l', "logicalvolume", number_VAL, 0, 0)
+arg(maxlogicalvolumes_ARG, 'l', "maxlogicalvolumes", number_VAL, 0, 0)
+arg(extents_ARG, 'l', "extents", numsignedper_VAL, 0, 0)
+arg(list_ARG, 'l', "list", 0, 0, 0)
+arg(lvmpartition_ARG, 'l', "lvmpartition", 0, 0, 0)
+arg(size_ARG, 'L', "size", sizemb_VAL, 0, 0)
+arg(persistent_ARG, 'M', "persistent", bool_VAL, 0, 0)
+arg(major_ARG, 'j', "major", number_VAL, ARG_GROUPABLE, 0)
+arg(setactivationskip_ARG, 'k', "setactivationskip", bool_VAL, 0, 0)
+arg(ignoreactivationskip_ARG, 'K', "ignoreactivationskip", 0, 0, 0)
+arg(maps_ARG, 'm', "maps", 0, 0, 0)
+arg(mirrors_ARG, 'm', "mirrors", numsigned_VAL, 0, 0)
+arg(metadatatype_ARG, 'M', "metadatatype", metadatatype_VAL, 0, 0)
+arg(name_ARG, 'n', "name", string_VAL, 0, 0)
+arg(nofsck_ARG, 'n', "nofsck", 0, 0, 0)
+arg(novolumegroup_ARG, 'n', "novolumegroup", 0, 0, 0)
+arg(oldpath_ARG, 'n', "oldpath", 0, 0, 0)
+arg(options_ARG, 'o', "options", string_VAL, ARG_GROUPABLE, 0)
+arg(sort_ARG, 'O', "sort", string_VAL, ARG_GROUPABLE, 0)
+arg(maxphysicalvolumes_ARG, 'p', "maxphysicalvolumes", number_VAL, 0, 0)
+arg(permission_ARG, 'p', "permission", permission_VAL, 0, 0)
+arg(partial_ARG, 'P', "partial", 0, 0, 0)
+arg(physicalvolume_ARG, 'P', "physicalvolume", 0, 0, 0)
+arg(quiet_ARG, 'q', "quiet", 0, ARG_COUNTABLE, 0)
+arg(readahead_ARG, 'r', "readahead", readahead_VAL, 0, 0)
+arg(resizefs_ARG, 'r', "resizefs", 0, 0, 0)
+arg(reset_ARG, 'R', "reset", 0, 0, 0)
+arg(regionsize_ARG, 'R', "regionsize", sizemb_VAL, 0, 0)
+arg(physicalextentsize_ARG, 's', "physicalextentsize", sizemb_VAL, 0, 0)
+arg(snapshot_ARG, 's', "snapshot", 0, 0, 0)
+arg(short_ARG, 's', "short", 0, 0, 0)
+arg(stdin_ARG, 's', "stdin", 0, 0, 0)
+arg(select_ARG, 'S', "select", string_VAL, ARG_GROUPABLE, 0)
+arg(test_ARG, 't', "test", 0, 0, 0)
+arg(thin_ARG, 'T', "thin", 0, 0, 0)
+arg(uuid_ARG, 'u', "uuid", 0, 0, 0)
+arg(uuidstr_ARG, 'u', "uuid", string_VAL, 0, 0)
+arg(uuidlist_ARG, 'U', "uuidlist", 0, 0, 0)
+arg(verbose_ARG, 'v', "verbose", 0, ARG_COUNTABLE, 0)
+arg(volumegroup_ARG, 'V', "volumegroup", 0, 0, 0)
+arg(virtualsize_ARG, 'V', "virtualsize", sizemb_VAL, 0, 0)
+arg(wipesignatures_ARG, 'W', "wipesignatures", bool_VAL, 0, 0)
+arg(allocatable_ARG, 'x', "allocatable", bool_VAL, 0, 0)
+arg(resizeable_ARG, 'x', "resizeable", bool_VAL, 0, 0)
+arg(yes_ARG, 'y', "yes", 0, 0, 0)
+arg(zero_ARG, 'Z', "zero", bool_VAL, 0, 0)
/* this should always be last */
-arg(ARG_COUNT, '-', "", NULL, 0, 0)
+arg(ARG_COUNT, '-', "", 0, 0, 0)
/* *INDENT-ON* */
diff --git a/tools/command-lines.in b/tools/command-lines.in
new file mode 100644
index 0000000..b54f851
--- /dev/null
+++ b/tools/command-lines.in
@@ -0,0 +1,1579 @@
+#
+# When this file is changed, tools/command-lines.h
+# and tools/command-lines-count.h must be regenerated
+# with:
+#
+# tools/create-commands --output count tools/command-lines.in > tools/command-lines-count.h
+# tools/create-commands --output struct tools/command-lines.in > tools/command-lines.h
+#
+
+#
+# Syntax
+#
+# A new command has a unique combination of:
+# command name, required option args and required
+# positional args.
+#
+# To define a new command, begin a single line with a
+# command name, followed by required options/args,
+# (e.g. --foo, or --foo val), followed by required
+# positional args, (e.g. VG)
+#
+# After the single line of required elements are lines
+# of optional elements:
+# OO: <optional --option args>
+# OP: <optional positional args>
+#
+# command_name required_opt_arg ... required_pos_arg ...
+# OO: optional_opt_arg, ...
+# OP: optional_pos_arg ...
+#
+# required_opt_arg/optional_opt_arg must begin with the
+# long form option name, e.g. --foo. If the option name
+# takes a value, then the type of value is specified,
+# e.g. --foo String.
+#
+# Possible option names are listed in args.h
+#
+# Use --foo_long to specify that only the long form of
+# --foo is accepted by the command. (This is uncommon.)
+#
+# Possible option arg types are shown in tools/vals.h,
+# e.g. Bool, String, VG, SizeMB.
+#
+# --option args outside the list of types in vals.h are treated
+# as literal (non-variable) strings or numbers.
+#
+# positional args can be multiple types separated by |, e.g. VG|LV|Tag
+#
+# If a positional arg is repeatable, it is followed by ..., e.g. VG|LV|Tag ...
+#
+# LV can have a suffix indicating the LV type, e.g. LV_linear, LV_thinpool.
+# LV_raid represents any raidN. LV_type1_type2_type3 when the LV is
+# limited to multiple specific types.
+#
+# Note that two commands whose required paramters differ only by
+# the LV types they accept are ambiguous. That is, they cannot be
+# distinguished by just looking at the command, but require reading
+# the VG to find the LV type. So, command definitions that differ
+# only in accepted LV types are not allowed. It would be best to
+# distinguish them by using different option names.
+# There are FIXME's below for some of these cases.
+#
+# VG, LV can have the suffix _new, indicating the named VG or LV
+# does not yet exist.
+#
+# If Select is included in pos_arg, it means that the pos_arg
+# may be empty if the --select option is used.
+#
+# --size and --extents are interchangable, but only --size is used
+# in these definitions to keep them simpler. --extents is
+# automatically included and recognized as an alternative to --size.
+#
+# lvcreate generally requires a VG arg in position 1 and does not
+# require the --name option (when --name is omitted, a name is
+# generated). But, all commands of that form have a variant which
+# is not defined here, but which is automatically recognized as
+# being equivalent. That variant allows the required VG arg to
+# be omitted when --name VG/LV is specified, or when the
+# LVM_VG_NAME env var is set and --name LV is specified.
+# The lvcreate variants with --name and without a VG arg are
+# automatically recognized as an alternative to the defined
+# command forms requiring the VG and no --name.
+# Also, --thinpool VG/LV or --cachepool VG/LV can be used in
+# place of --name to provide the VG name instead of pos 1.
+#
+# Note that one the most difficult aspect of these definitions is
+# the variants of --thin / --type thin / --type thin-pool,
+# --cache / --type cache / --type cache-pool.
+# There are no consistent rules to follow and the behaviors are
+# unpredictable; each possible variation and combination needs
+# to be tested individually to see what it means.
+#
+# Some options have multiple names, but only one form of the name
+# is used in these definitions. Synonyms will be recognized when
+# matching a command to a command definition.
+#
+# used in definitions below (equivalent but not used in definitions)
+# mirrorlog core (not corelog)
+# resizeable (resizable or allocation)
+# allocatable (allocation)
+# activate (available)
+# rebuild (raidrebuild)
+# syncaction (raidsyncaction)
+# writemostly (raidwritemostly)
+# minrecoveryrate (raidminrecoveryrate)
+# maxrecoveryrate (raidmaxrecoveryrate)
+# writebehind (raidwritebehind)
+# virtualsize (virtualoriginsize)
+# vgmetadatacopies (metadatacopies)
+# pvmetadatacopies (metadatacopies)
+#
+# "---" is like a comment line, used to separate text for readability
+#
+# ID: A unique string identifying the command. Two commands that do
+# the same thing, but are alternate syntaxes can share the same ID,
+# in which case the implementation would have to sort out which
+# args to look at for the required parameters. Or, the two commands
+# could use differnet IDs, in which case the implementation would
+# know where to look for each parameter.
+#
+# DESC: A description of the command. The "DESC:" tags will be
+# included in the text as indicators of new lines when printing
+# the descriptions for help/man output.
+#
+# RULE: rules that a given command must follow, i.e. required (and)
+# or invalid (not) combinations of options, LV types or LV properties.
+#
+# RULE: A and|not B
+#
+# Conditions in A are applied to a given command+LV.
+# If the conditions in A are true, then the checks in B
+# are applied. If the checks in B are true|false according
+# to and|not, then the command fails|continues.
+#
+# When A is "all", the conditions in B are always applied.
+#
+# Conditions:
+# . if any --option listed is set, the checks may apply
+# . if any LV_type listed matches LV, the checks may apply
+# . if all lv_is_prop listed matches LV, the checks may apply
+# . if all of the above pass, then perform the checks
+#
+# Checks for "and":
+# . if any --option listed is not set, then fail
+# . if none of the LV_types matches the LV, then fail
+# . if any of the lv_is_prop do not match the LV, then fail
+#
+# Checks for "not":
+# . if any --option listed is set, then fail
+# . if any of the LV_types matches the LV, then fail
+# . if any of the lv_is_prop match the LV, then fail
+#
+# RULE: --option|LV_type|lv_is_prop|all ... and|not --option|LV_type|lv_is_prop ...
+#
+# RULE: --opt1 not --opt2
+# RULE: --opt1 and --opt2
+# RULE: --opt1 LV_type1 lv_is_prop1 and --opt2
+# RULE: --opt1 LV_type1 and lv_is_prop1
+# RULE: LV_type1 and lv_is_prop1
+#
+#
+
+#
+# For efficiency, sets of options can be defined and reused
+# in multiple command definitions.
+#
+# To define a common set of options:
+# OO_NAME: --foo, --bar String
+#
+# To use this set of options, include it on the OO: line, e.g.
+# OO: --example, OO_NAME
+#
+# which is expaneded to
+# OO: --example, --foo, --bar String
+#
+# Including OO_NAME after a command name on the required line
+# means that any one of the options is required and the rest
+# are optional. The usage syntax for this case is printed as:
+# command (--foo A, --bar B)
+#
+
+#
+# OO_ALL is included in every command automatically.
+#
+OO_ALL: --commandprofile String, --config String, --debug,
+--driverloaded Bool, --help, --profile String, --quiet,
+--verbose, --version, --yes, --test
+
+#
+# This list only applies to printing the usage text.
+# These common options are displayed once at the end of
+# a given command's usage. This is done to avoid excessive
+# repetition of common options, which may obscure the more
+# interesting and relevant parts of a common prototype.
+# This definition is *only* used when generating the command
+# usage strings, and is the basis for the division between
+# the "usage" and "usage_common" strings. This OO defn does
+# not relate to which optional opts are accepted by commands,
+# which is defined by the OO line.
+#
+OO_USAGE_COMMON: OO_ALL, --force, --noudevsync
+
+#
+# options for pvs, lvs, vgs, fullreport
+#
+OO_REPORT: --aligned, --all, --binary, --configreport ConfigReport, --foreign,
+--ignorelockingfailure, --ignoreskippedcluster, --logonly,
+--nameprefixes, --noheadings, --nolocking, --nosuffix,
+--options String, --partial, --readonly, --reportformat ReportFmt, --rows,
+--select String, --separator String, --shared, --sort String,
+--trustcache, --unbuffered, --units Units, --unquoted
+
+#
+# options for config, dumpconfig, lvmconfig
+#
+OO_CONFIG: --atversion String, --typeconfig ConfigType, --file String, --ignoreadvanced,
+--ignoreunsupported, --ignorelocal, --list, --mergedconfig, --metadataprofile String,
+--sinceversion String, --showdeprecated, --showunsupported, --validate, --withsummary,
+--withcomments, --withspaces, --unconfigured, --withversions
+
+---
+
+# None of these can function as a required option for lvchange.
+
+OO_LVCHANGE: --autobackup Bool, --force, --ignoremonitoring,
+--ignoreskippedcluster, --noudevsync, --reportformat ReportFmt,
+--select String
+
+# Any of these can function as a required option for lvchange.
+# profile is also part of OO_ALL, but is repeated in OO_LVCHANGE_META
+# because it can function as a required opt.
+
+OO_LVCHANGE_META: --addtag Tag, --deltag Tag,
+--alloc Alloc, --contiguous Bool,
+--detachprofile, --metadataprofile String, --profile String,
+--permission Permission, --readahead Readahead, --setactivationskip Bool,
+--errorwhenfull Bool, --discards Discards, --zero Bool,
+--cachemode CacheMode, --cachepolicy String, --cachesettings String,
+--minrecoveryrate SizeKB, --maxrecoveryrate SizeKB,
+--writebehind Number, --writemostly WriteMostlyPV, --persistent n
+
+lvchange OO_LVCHANGE_META VG|LV|Tag|Select ...
+OO: OO_LVCHANGE
+ID: lvchange_properties
+DESC: Change a general LV property.
+RULE: all not lv_is_pvmove lv_is_mirror_log lv_is_mirror_image
+RULE: all and lv_is_vg_writable
+RULE: --contiguous not --alloc
+RULE: --profile not --detachprofile
+RULE: --metadataprofile not --detachprofile
+RULE: --minrecoveryrate --maxrecoveryrate and LV_raid
+RULE: --writebehind --writemostly and LV_raid1
+RULE: --cachemode --cachepolicy --cachesettings and LV_cache LV_cachepool
+RULE: --errorwhenfull --discards --zero and LV_thinpool
+RULE: --permission not lv_is_external_origin lv_is_raid_metadata lv_is_raid_image LV_thinpool
+RULE: --alloc --contiguous --metadataprofile --permission --persistent --profile --readahead not lv_is_thick_origin
+RULE: --alloc --discards --zero --cachemode --cachepolicy --cachesettings not lv_is_partial
+
+lvchange --resync VG|LV_raid_mirror|Tag|Select ...
+OO: OO_LVCHANGE
+ID: lvchange_resync
+DESC: Resyncronize a mirror or raid LV.
+RULE: all not lv_is_pvmove lv_is_locked
+RULE: all not LV_raid0
+
+lvchange --syncaction SyncAction VG|LV_raid|Tag|Select ...
+OO: OO_LVCHANGE
+ID: lvchange_syncaction
+DESC: Resynchronize or check a raid LV.
+RULE: all not LV_raid0
+
+lvchange --rebuild PV VG|LV_raid|Tag|Select ...
+OO: OO_LVCHANGE
+ID: lvchange_rebuild
+DESC: Reconstruct data on specific PVs of a raid LV.
+RULE: all not LV_raid0
+
+# try removing the META change options from here?
+lvchange --activate Active VG|LV|Tag|Select ...
+OO: --activationmode ActivationMode, --partial, --ignoreactivationskip,
+--ignorelockingfailure, --sysinit, OO_LVCHANGE_META, OO_LVCHANGE
+ID: lvchange_activate
+DESC: Activate or deactivate an LV.
+
+lvchange --refresh VG|LV|Tag|Select ...
+OO: --partial, OO_LVCHANGE
+ID: lvchange_refresh
+DESC: Reactivate an LV using the latest metadata.
+
+lvchange --monitor Bool VG|LV|Tag|Select ...
+OO: --poll Bool, OO_LVCHANGE
+ID: lvchange_monitor
+DESC: Start or stop monitoring an LV from dmeventd.
+RULE: all not lv_is_pvmove
+
+lvchange --poll Bool VG|LV|Tag|Select ...
+OO: --monitor Bool, OO_LVCHANGE
+ID: lvchange_poll
+DESC: Start or stop processing an LV conversion.
+
+lvchange --persistent y --minor Number LV
+OO: --major Number, OO_LVCHANGE
+ID: lvchange_persistent
+DESC: Make the minor device number persistent for an LV.
+RULE: all not LV_thinpool LV_cachepool
+
+---
+
+OO_LVCONVERT_RAID: --mirrors SNumber, --stripes_long Number,
+--stripesize SizeKB, --regionsize SizeMB, --interval Number
+
+OO_LVCONVERT_POOL: --poolmetadata LV, --poolmetadatasize SizeMB,
+--poolmetadataspare Bool, --readahead Readahead, --chunksize SizeKB
+
+OO_LVCONVERT: --alloc Alloc, --background, --force, --noudevsync
+
+---
+
+# These cover all the core, raid-related type conversions.
+# They are all routed into the core raid conversion code.
+
+lvconvert --type linear LV
+OO: OO_LVCONVERT_RAID, OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_raid_types
+DESC: Convert LV to linear.
+RULE: all not lv_is_locked lv_is_pvmove
+
+lvconvert --type striped LV
+OO: OO_LVCONVERT_RAID, OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_raid_types
+DESC: Convert LV to striped.
+
+lvconvert --type mirror LV
+OO: OO_LVCONVERT_RAID, OO_LVCONVERT, --mirrorlog MirrorLog
+OP: PV ...
+ID: lvconvert_raid_types
+DESC: Convert LV to type mirror (also see type raid1).
+
+lvconvert --type raid LV
+OO: OO_LVCONVERT_RAID, OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_raid_types
+DESC: Convert LV to raid.
+
+lvconvert --mirrors SNumber LV
+OO: OO_LVCONVERT_RAID, OO_LVCONVERT, --mirrorlog MirrorLog
+OP: PV ...
+ID: lvconvert_raid_types
+DESC: Convert LV to raid1 or mirror, or change number of mirror images.
+
+---
+
+# lvconvert raid-related utilities
+# Create a new command set for these and migrate them out of lvconvert?
+
+lvconvert --splitmirrors Number --name LV_new LV_raid1_mirror_cache
+OO: OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_split_mirror_images
+DESC: Split images from a raid1 or mirror LV and use them to create a new LV.
+
+lvconvert --splitmirrors Number --trackchanges LV_raid1_cache
+OO: OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_split_mirror_images
+DESC: Split images from a raid1 LV and track changes to origin.
+
+lvconvert --mirrorlog MirrorLog LV_mirror
+OO: OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_change_mirrorlog
+DESC: Change the type of mirror log used by a mirror LV.
+
+---
+
+# lvconvert utilities for creating/maintaining thin and cache objects.
+# Create a new command set for these and migrate them out of lvconvert?
+
+lvconvert --type thin --thinpool LV LV_linear_striped_raid
+OO: --thin, --originname LV_new, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
+ID: lvconvert_to_thin_with_external
+DESC: Convert LV to type thin with an external origin.
+
+# alternate form of lvconvert --type thin
+lvconvert --thin --thinpool LV LV_linear_striped_raid
+OO: --type thin, --originname LV_new, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
+ID: lvconvert_to_thin_with_external
+DESC: Convert LV to type thin with an external origin
+DESC: (variant, infers --type thin).
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvconvert --type cache --cachepool LV LV_linear_striped_raid_thinpool
+OO: --cache, --cachemode CacheMode, --cachepolicy String,
+--cachesettings String, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
+ID: lvconvert_to_cache_vol
+DESC: Convert LV to type cache.
+
+# alternate form of lvconvert --type cache
+lvconvert --cache --cachepool LV LV_linear_striped_raid_thinpool
+OO: --type cache, --cachemode CacheMode, --cachepolicy String,
+--cachesettings String, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
+ID: lvconvert_to_cache_vol
+DESC: Convert LV to type cache (variant, infers --type cache).
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvconvert --type thin-pool LV_linear_striped_raid_cache
+OO: --stripes_long Number, --stripesize SizeKB,
+--discards Discards, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_to_thinpool
+DESC: Convert LV to type thin-pool.
+
+# alternate form of lvconvert --type thin-pool
+# deprecated because of non-standard syntax (missing positional arg)
+lvconvert --thinpool LV_linear_striped_raid_cache
+OO: --type thin-pool, --stripes_long Number, --stripesize SizeKB,
+--discards Discards, --zero Bool, OO_LVCONVERT_POOL, OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_to_thinpool
+DESC: Convert LV to type thin-pool (variant, use --type thin-pool).
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvconvert --type cache-pool LV_linear_striped_raid
+OO: OO_LVCONVERT_POOL, OO_LVCONVERT,
+--cachemode CacheMode, --cachepolicy String, --cachesettings String
+OP: PV ...
+ID: lvconvert_to_cachepool
+DESC: Convert LV to type cache-pool.
+
+# alternate form of lvconvert --type cache-pool
+# deprecated because of non-standard syntax (missing positional arg)
+lvconvert --cachepool LV_linear_striped_raid
+OO: --type cache-pool, OO_LVCONVERT_POOL, OO_LVCONVERT,
+--cachemode CacheMode, --cachepolicy String, --cachesettings String
+ID: lvconvert_to_cachepool
+DESC: Convert LV to type cache-pool (variant, use --type cache-pool).
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvconvert --splitcache LV_cachepool_cache_thinpool
+OO: OO_LVCONVERT
+ID: lvconvert_split_and_keep_cachepool
+DESC: Separate and keep the cache pool from a cache LV.
+
+---
+
+lvconvert --uncache LV_cache_thinpool
+OO: OO_LVCONVERT
+ID: lvconvert_split_and_delete_cachepool
+DESC: Separate and delete the cache pool from a cache LV.
+
+---
+
+# FIXME: add a new option defining this operation, e.g. --swapmetadata
+
+lvconvert --poolmetadata LV LV_thinpool_cachepool
+OO: OO_LVCONVERT
+ID: lvconvert_swap_pool_metadata
+DESC: Swap metadata LV in a thin pool or cache pool (temporary command).
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+# lvconvert utilities related to snapshots and repair.
+# Create a new command set for these and migrate them out of lvconvert?
+
+# FIXME: lvconvert --merge is an extremely ambiguous command.
+# It can do very different operations, but which one depends
+# on knowing the LV type. So, the command doesn't know what
+# it's actually doing until quite late, when processing a
+# single LV.
+#
+# Use different option names for different merge operations
+# so that we can have different command definitions,
+# different behaviors, different optional options, etc:
+#
+# lvconvert --merge-mirror LV_linear_striped_raid ...
+# DESC: Merge LV that was previously split from a mirror.
+#
+# lvconvert --merge-thin LV_thin
+# DESC: Merge thin LV into its origin LV.
+#
+# lvconvert --merge-snapshot LV_snapshot
+# DESC: Merge COW snapshot LV into its origin.
+#
+# Then we could add VG|Tag to --merge-mirror arg pos 1, because
+# "lvconvert --merge VG|Tag" is a terrible command. It will do
+# different operations on each LV it finds, depending on the
+# current LV type.
+
+lvconvert --merge LV_linear_striped_raid_thin_snapshot|VG|Tag ...
+OO: --background, --interval Number, OO_LVCONVERT
+ID: lvconvert_merge
+DESC: Merge LV that was previously split from a mirror.
+DESC: Merge thin LV into its origin LV.
+DESC: Merge COW snapshot LV into its origin.
+RULE: all not lv_is_merging_origin lv_is_virtual_origin lv_is_external_origin lv_is_merging_cow
+
+---
+
+# FIXME: by using two different positional args, this is the
+# single violation of the standard method of using process_each_lv().
+# Before calling process_each, it steals the first positional arg
+# and adjusts argv/argc so it's not seen by process_each.
+
+# alternate form of lvconvert --snapshot
+lvconvert --type snapshot LV_linear_striped_raid LV_snapshot
+OO: --snapshot, --chunksize SizeKB, --zero Bool, OO_LVCONVERT
+ID: lvconvert_combine_split_snapshot
+DESC: Combine LV with a previously split snapshot LV.
+FLAGS: SECONDARY_SYNTAX
+
+lvconvert --snapshot LV_linear_striped_raid LV_snapshot
+OO: --type snapshot, --chunksize SizeKB, --zero Bool, OO_LVCONVERT
+ID: lvconvert_combine_split_snapshot
+DESC: Combine LV with a previously split snapshot LV.
+
+---
+
+# FIXME: use specific option names to distinguish these two
+# very different commands, e.g.
+#
+# lvconvert --repair-pvs LV_raid_mirror
+# DESC: Replace failed PVs in a raid or mirror LV.
+#
+# lvconvert --repair-thinpool LV_thinpool
+# DESC: Repair a thin pool.
+#
+# lvm may want to do different things, or allow different options
+# depending on which operation is being run, but as it stands, it
+# cannot do anything operation-specific until after the VG is read
+# and the LV type is known.
+
+lvconvert --repair LV_raid_mirror_thinpool
+OO: --usepolicies, OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_repair_pvs_or_thinpool
+DESC: Replace failed PVs in a raid or mirror LV.
+DESC: Repair a thin pool.
+
+---
+
+lvconvert --replace PV LV_raid
+OO: OO_LVCONVERT
+OP: PV ...
+ID: lvconvert_replace_pv
+DESC: Replace specific PV(s) in a raid* LV with another PV.
+
+---
+
+lvconvert --splitsnapshot LV_snapshot
+OO: OO_LVCONVERT
+ID: lvconvert_split_cow_snapshot
+DESC: Separate a COW snapshot from its origin LV.
+
+---
+
+# FIXME: add a new option defining this operation, e.g. --poll-mirror
+# The purpose of this command is not entirely clear.
+
+lvconvert LV_mirror
+OO: OO_LVCONVERT
+ID: lvconvert_poll_start
+DESC: Poll mirror LV to collapse resync layers.
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+# --extents is not specified; it's an automatic alternative for --size
+
+OO_LVCREATE: --addtag Tag, --alloc Alloc, --autobackup Bool, --activate Active,
+--contiguous Bool, --ignoreactivationskip, --ignoremonitoring, --major Number,
+--metadataprofile String, --minor Number, --monitor Bool, --name String, --nosync,
+--noudevsync, --permission Permission, --persistent Bool, --readahead Readahead,
+--reportformat ReportFmt, --setactivationskip Bool, --wipesignatures Bool,
+--zero Bool
+
+OO_LVCREATE_CACHE: --cachemode CacheMode, --cachepolicy String, --cachesettings String
+
+OO_LVCREATE_POOL: --poolmetadatasize SizeMB, --poolmetadataspare Bool, --chunksize SizeKB
+
+OO_LVCREATE_THIN: --discards Discards, --errorwhenfull Bool
+
+OO_LVCREATE_RAID: --mirrors SNumber, --stripes Number, --stripesize SizeKB,
+--regionsize SizeMB, --minrecoveryrate SizeKB, --maxrecoveryrate SizeKB
+
+---
+
+lvcreate --type error --size SizeMB VG
+OO: OO_LVCREATE
+ID: lvcreate_error_vol
+DESC: Create an LV that returns errors when used.
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvcreate --type zero --size SizeMB VG
+OO: OO_LVCREATE
+ID: lvcreate_zero_vol
+DESC: Create an LV that returns zeros when read.
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvcreate --type linear --size SizeMB VG
+OO: OO_LVCREATE
+OP: PV ...
+IO: --mirrors 0, --stripes 1
+ID: lvcreate_linear
+DESC: Create a linear LV.
+FLAGS: SECONDARY_SYNTAX
+
+# This is the one place we mention the optional --name
+# because it's the most common case and may be confusing
+# to people to not see the name parameter.
+
+lvcreate --size SizeMB VG
+OO: --type linear, OO_LVCREATE
+OP: PV ...
+IO: --mirrors 0, --stripes 1
+ID: lvcreate_linear
+DESC: Create a linear LV (default --type linear).
+DESC: When --name is omitted, the name is generated.
+
+---
+
+lvcreate --type striped --size SizeMB VG
+OO: --stripes Number, --stripesize SizeKB, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_striped
+DESC: Create a striped LV.
+
+lvcreate --stripes Number --size SizeMB VG
+OO: --type striped, --stripesize SizeKB, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_striped
+DESC: Create a striped LV (infers --type striped).
+
+---
+
+lvcreate --type mirror --size SizeMB VG
+OO: --mirrors SNumber, --mirrorlog MirrorLog, --regionsize SizeMB, --stripes Number, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_mirror
+DESC: Create a mirror LV (also see --type raid1).
+
+# alternate form of lvcreate --type raid1|mirror
+lvcreate --mirrors SNumber --size SizeMB VG
+OO: --type raid1, --type mirror, --mirrorlog MirrorLog, --stripes Number, OO_LVCREATE_RAID, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_mirror_or_raid1
+DESC: Create a raid1 or mirror LV (variant, infers --type raid1|mirror).
+
+---
+
+lvcreate --type raid --size SizeMB VG
+OO: OO_LVCREATE_RAID, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_raid_any
+DESC: Create a raid LV (a specific raid level must be used, e.g. raid1.)
+
+---
+
+# FIXME: the LV created by these commands actually has type linear or striped,
+# not snapshot as specified by the command. If LVs never have type
+# snapshot, perhaps "snapshot" should not be considered an LV type, but
+# another new LV property?
+#
+# This is the one case where the --type variant is the unpreferred,
+# secondary syntax, because the LV type is not actually "snapshot".
+
+# alternate form of lvcreate --snapshot
+lvcreate --type snapshot --size SizeMB LV
+OO: --snapshot, --stripes Number, --stripesize SizeKB,
+--chunksize SizeKB, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_cow_snapshot
+DESC: Create a COW snapshot LV from an origin LV.
+FLAGS: SECONDARY_SYNTAX
+
+lvcreate --snapshot --size SizeMB LV
+OO: --type snapshot, --stripes Number, --stripesize SizeKB,
+--chunksize SizeKB, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_cow_snapshot
+DESC: Create a COW snapshot LV from an origin LV.
+
+---
+
+# alternate form of lvcreate --snapshot
+lvcreate --type snapshot --size SizeMB --virtualsize SizeMB VG
+OO: --snapshot, --chunksize SizeKB, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_cow_snapshot_with_virtual_origin
+DESC: Create a sparse COW snapshot LV of a virtual origin LV.
+FLAGS: SECONDARY_SYNTAX
+
+lvcreate --snapshot --size SizeMB --virtualsize SizeMB VG
+OO: --type snapshot, --chunksize SizeKB, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_cow_snapshot_with_virtual_origin
+DESC: Create a sparse COW snapshot LV of a virtual origin LV.
+
+---
+
+lvcreate --type thin-pool --size SizeMB VG
+OO: --thinpool LV_new, OO_LVCREATE_POOL, OO_LVCREATE_THIN, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+IO: --mirrors 0
+ID: lvcreate_thinpool
+DESC: Create a thin pool.
+
+# alternate form of lvcreate --type thin-pool
+lvcreate --thin --size SizeMB VG
+OO: --type thin-pool, OO_LVCREATE_POOL, OO_LVCREATE_THIN, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+IO: --mirrors 0
+ID: lvcreate_thinpool
+DESC: Create a thin pool (variant, infers --type thin-pool).
+FLAGS: SECONDARY_SYNTAX
+
+# alternate form of lvcreate --type thin-pool
+lvcreate --size SizeMB --thinpool LV_new VG
+OO: --thin, --type thin-pool, OO_LVCREATE_POOL, OO_LVCREATE_THIN, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+IO: --mirrors 0
+ID: lvcreate_thinpool
+DESC: Create a thin pool named by the --thinpool arg
+DESC: (variant, infers --type thin-pool).
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+# NB. there are no alternate forms of these commands that
+# use --cache in place of --type cache-pool, but --cache
+# still needs to be listed as an optional addition to
+# --type cache-pool.
+
+lvcreate --type cache-pool --size SizeMB VG
+OO: --cache, OO_LVCREATE_POOL, OO_LVCREATE_CACHE, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_cachepool
+DESC: Create a cache pool.
+
+# alternate form of lvcreate --type cache-pool
+lvcreate --type cache-pool --size SizeMB --cachepool LV_new VG
+OO: --cache, OO_LVCREATE_POOL, OO_LVCREATE_CACHE, OO_LVCREATE
+OP: PV ...
+ID: lvcreate_cachepool
+DESC: Create a cache pool named by the --cachepool arg
+DESC: (variant, uses --cachepool in place of --name).
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvcreate --type thin --virtualsize SizeMB --thinpool LV_thinpool VG
+OO: --thin, OO_LVCREATE_POOL, OO_LVCREATE_THIN, OO_LVCREATE
+IO: --mirrors 0
+ID: lvcreate_thin_vol
+DESC: Create a thin LV in a thin pool.
+
+# alternate form of lvcreate --type thin
+lvcreate --type thin --virtualsize SizeMB LV_thinpool
+OO: --thin, OO_LVCREATE_THIN, OO_LVCREATE
+IO: --mirrors 0
+ID: lvcreate_thin_vol
+DESC: Create a thin LV in a thin pool named in the first arg
+DESC: (variant, also see --thinpool for naming pool).
+FLAGS: SECONDARY_SYNTAX
+
+# NB. this is the variant which can substitute
+# --thin for --type thin, even though --thin is in OO.
+
+# alternate form of lvcreate --type thin
+lvcreate --virtualsize SizeMB --thinpool LV_thinpool VG
+OO: --type thin, --thin, OO_LVCREATE_THIN, OO_LVCREATE
+IO: --mirrors 0
+ID: lvcreate_thin_vol
+DESC: Create a thin LV in a thin pool (variant, infers --type thin).
+FLAGS: SECONDARY_SYNTAX
+
+# alternate form of lvcreate --type thin
+lvcreate --virtualsize SizeMB LV_thinpool
+OO: --type thin, --thin, OO_LVCREATE_THIN, OO_LVCREATE
+IO: --mirrors 0
+ID: lvcreate_thin_vol
+DESC: Create a thin LV in the thin pool named in the first arg
+DESC: (variant, infers --type thin, also see --thinpool for
+DESC: naming pool.)
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvcreate --type thin LV_thin
+OO: --thin, OO_LVCREATE_THIN, OO_LVCREATE
+IO: --mirrors 0
+ID: lvcreate_thin_snapshot
+DESC: Create a thin LV that is a snapshot of an existing thin LV.
+
+# alternate form of lvcreate --type thin
+lvcreate --thin LV_thin
+OO: --type thin, OO_LVCREATE_THIN, OO_LVCREATE
+IO: --mirrors 0
+ID: lvcreate_thin_snapshot
+DESC: Create a thin LV that is a snapshot of an existing thin LV
+DESC: (infers --type thin).
+FLAGS: SECONDARY_SYNTAX
+
+# alternate form of lvcreate --type thin
+lvcreate --snapshot LV_thin
+OO: --type thin, OO_LVCREATE_THIN, OO_LVCREATE
+IO: --mirrors 0
+ID: lvcreate_thin_snapshot
+DESC: Create a thin LV that is a snapshot of an existing thin LV
+DESC: (infers --type thin).
+
+lvcreate --type thin --thinpool LV_thinpool LV
+OO: --thin, OO_LVCREATE_POOL, OO_LVCREATE_THIN, OO_LVCREATE
+IO: --mirrors 0
+ID: lvcreate_thin_snapshot_of_external
+DESC: Create a thin LV that is a snapshot of an external origin LV.
+
+# alternate form of lvcreate --type thin --thinpool LV_thinpool LV
+lvcreate --snapshot --thinpool LV_thinpool LV
+OO: --type thin, OO_LVCREATE_THIN, OO_LVCREATE
+IO: --mirrors 0
+ID: lvcreate_thin_snapshot_of_external
+DESC: Create a thin LV that is a snapshot of an external origin LV
+DESC: (infers --type thin).
+
+---
+
+# stripes option is not intuitive when creating a thin LV,
+# but here it applies to creating the new thin pool that
+# is used for the thin LV
+
+# FIXME: there are commands here that differ only in that
+# one takes LV_new in arg pos 1, and the other takes a VG name
+# in arg pos 1. The commands that take LV_new use that
+# name as the new name of the pool, but the commands that
+# take a VG automatically generate the LV name. The problem
+# is that currently the command matching function cannot
+# distinguish between an LV name and a VG name being used
+# in arg pos 1, so a user-entered command would just match
+# the first it finds and not necessarily the correct
+# definition. Note that when LV_new is used in arg pos 1,
+# it needs to include a VG name, i.e. VG/LV_new
+
+lvcreate --type thin --virtualsize SizeMB --size SizeMB --thinpool LV_new
+OO: --thin, OO_LVCREATE_POOL, OO_LVCREATE_THIN, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+IO: --mirrors 0
+ID: lvcreate_thin_vol_and_thinpool
+DESC: Create a thin LV, first creating a thin pool for it,
+DESC: where the new thin pool is named by the --thinpool arg.
+
+# alternate form of lvcreate --type thin
+lvcreate --thin --virtualsize SizeMB --size SizeMB --thinpool LV_new
+OO: --type thin, OO_LVCREATE_POOL, OO_LVCREATE_THIN, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+IO: --mirrors 0
+ID: lvcreate_thin_vol_and_thinpool
+DESC: Create a thin LV, first creating a thin pool for it,
+DESC: where the new thin pool is named by the --thinpool arg
+DESC: (variant, infers --type thin).
+FLAGS: SECONDARY_SYNTAX
+
+# alternate form of lvcreate --type thin
+lvcreate --type thin --virtualsize SizeMB --size SizeMB LV_new|VG
+OO: --thin, OO_LVCREATE_POOL, OO_LVCREATE_THIN, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+IO: --mirrors 0
+ID: lvcreate_thin_vol_and_thinpool
+DESC: Create a thin LV, first creating a thin pool for it,
+DESC: where the new thin pool is named in the first arg,
+DESC: or the new thin pool name is generated when the first
+DESC: arg is a VG name.
+FLAGS: SECONDARY_SYNTAX
+
+# alternate form of lvcreate --type thin
+lvcreate --thin --virtualsize SizeMB --size SizeMB LV_new|VG
+OO: --type thin, OO_LVCREATE_POOL, OO_LVCREATE_THIN, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+IO: --mirrors 0
+ID: lvcreate_thin_vol_and_thinpool
+DESC: Create a thin LV, first creating a thin pool for it,
+DESC: where the new thin pool is named in the first arg,
+DESC: or the new thin pool name is generated when the first
+DESC: arg is a VG name (variant, infers --type thin).
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvcreate --size SizeMB --virtualsize SizeMB VG
+OO: --type thin, --type snapshot, --thin, --snapshot, OO_LVCREATE_POOL, OO_LVCREATE_THIN, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+IO: --mirrors 0
+ID: lvcreate_thin_vol_with_thinpool_or_sparse_snapshot
+DESC: Create a thin LV, first creating a thin pool for it
+DESC: (infers --type thin).
+DESC: Create a sparse snapshot of a virtual origin LV
+DESC: (infers --type snapshot).
+DESC: Chooses --type thin or --type snapshot according to
+DESC: config setting sparse_segtype_default.
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+# stripes option is not intuitive when creating a cache LV,
+# but here it applies to creating the new origin that
+# is used to create the cache LV
+
+lvcreate --type cache --size SizeMB --cachepool LV_cachepool VG
+OO: --cache, OO_LVCREATE_POOL, OO_LVCREATE_CACHE, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+ID: lvcreate_cache_vol_with_new_origin
+DESC: Create a cache LV, first creating a new origin LV,
+DESC: then combining it with the existing cache pool named
+DESC: by the --cachepool arg.
+
+# alternate form of lvcreate --type cache
+lvcreate --size SizeMB --cachepool LV_cachepool VG
+OO: --type cache, --cache, OO_LVCREATE_CACHE, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+ID: lvcreate_cache_vol_with_new_origin
+DESC: Create a cache LV, first creating a new origin LV,
+DESC: then combining it with the existing cache pool named
+DESC: by the --cachepool arg (variant, infers --type cache).
+FLAGS: SECONDARY_SYNTAX
+
+# alternate form of lvcreate --type cache
+lvcreate --type cache --size SizeMB LV_cachepool
+OO: --cache, OO_LVCREATE_POOL, OO_LVCREATE_CACHE, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+ID: lvcreate_cache_vol_with_new_origin
+DESC: Create a cache LV, first creating a new origin LV,
+DESC: then combining it with the existing cache pool named
+DESC: in the first arg (variant, also use --cachepool).
+FLAGS: SECONDARY_SYNTAX
+
+# This is a ridiculously crazy command which nobody could
+# understand. It should be be eliminated. It does two different
+# things depending on whether LV in pos 1 is a cachepool LV
+# or not. Both variations are unnecessary.
+#
+# 1. If LV is a cachepool, then it's an alternate form of
+# an already complicated command above.
+#
+# # alternate form for lvcreate_cache_vol_with_new_origin
+# lvcreate --cache --size SizeMB LV_cachepool
+# OO: --type cache, --cache, OO_LVCREATE_CACHE, OO_LVCREATE, --stripes Number, --stripesize SizeKB
+# OP: PV ...
+# ID: lvcreate_cache_vol_with_new_origin
+# DESC: Create a cache LV, first creating a new origin LV,
+# DESC: then combining it with the existing cache pool named
+# DESC: in the first arg (variant, infers --type cache,
+# DESC: also use --cachepool).
+#
+# 2. If LV is not a cachepool, then it's a disguised lvconvert.
+#
+# # FIXME: this should be done by lvconvert, and this command removed
+# lvcreate --type cache --size SizeMB LV
+# OO: OO_LVCREATE_POOL, OO_LVCREATE_CACHE, OO_LVCREATE
+# OP: PV ...
+# ID: lvcreate_convert_to_cache_vol_with_cachepool
+# DESC: Convert the specified LV to type cache after creating a new
+# DESC: cache pool LV to use (use lvconvert).
+#
+# Note that stripes are accepted by the first and not by the
+# second, but it's not possible to validate this until after
+# the LV type is known.
+#
+# So, to define this syntax we have to combine both of
+# those variants, each crazy on it's own, into one
+# ridiculous command.
+
+# def1: alternate form of lvcreate --type cache, or
+# def2: it should be done by lvconvert.
+lvcreate --cache --size SizeMB LV
+OO: OO_LVCREATE_CACHE, OO_LVCREATE_POOL, OO_LVCREATE,
+--stripes Number, --stripesize SizeKB
+OP: PV ...
+ID: lvcreate_cache_vol_with_new_origin_or_convert_to_cache_vol_with_cachepool
+DESC: When LV is a cache pool, create a cache LV,
+DESC: first creating a new origin LV, then combining it with
+DESC: the existing cache pool named in the first arg
+DESC: (variant, infers --type cache, also use --cachepool).
+DESC: When LV is not a cache pool, convert the specified LV
+DESC: to type cache after creating a new cache pool LV to use
+DESC: (use lvconvert).
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+lvdisplay
+OO: --aligned, --all, --binary, --colon, --columns,
+--configreport ConfigReport, --foreign, --history, --ignorelockingfailure,
+--ignoreskippedcluster, --logonly, --maps, --noheadings,
+--nosuffix, --options String, --sort String, --partial, --readonly,
+--reportformat ReportFmt, --segments, --select String, --separator String,
+--shared, --unbuffered, --units Units
+OP: VG|LV|Tag ...
+ID: lvdisplay_general
+
+---
+
+# --extents is not specified; it's an automatic alternative for --size
+
+lvextend --size SizeMB LV
+OO: --alloc Alloc, --autobackup Bool, --force, --mirrors SNumber,
+--nofsck, --nosync, --noudevsync, --reportformat ReportFmt, --resizefs,
+--stripes Number, --stripesize SizeKB, --poolmetadatasize SizeMB
+OP: PV ...
+ID: lvextend_by_size
+DESC: Extend an LV by a specified size.
+
+lvextend LV PV ...
+OO: --alloc Alloc, --autobackup Bool, --force, --mirrors SNumber,
+--nofsck, --nosync, --noudevsync,
+--reportformat ReportFmt, --resizefs, --stripes Number, --stripesize SizeKB
+ID: lvextend_by_pv
+DESC: Extend an LV by specified PV extents.
+FLAGS: SECONDARY_SYNTAX
+
+lvextend --poolmetadatasize SizeMB LV_thinpool
+OO: --alloc Alloc, --autobackup Bool, --force, --mirrors SNumber,
+--nofsck, --nosync, --noudevsync,
+--reportformat ReportFmt, --stripes Number, --stripesize SizeKB
+OP: PV ...
+ID: lvextend_pool_metadata_by_size
+DESC: Extend a pool metadata SubLV by a specified size.
+
+lvextend --usepolicies LV_thinpool_snapshot
+OO: --alloc Alloc, --autobackup Bool, --force, --mirrors SNumber,
+--nofsck, --nosync, --noudevsync,
+--reportformat ReportFmt, --resizefs
+OP: PV ...
+ID: lvextend_by_policy
+DESC: Extend an LV according to a predefined policy.
+
+---
+
+lvmconfig
+OO: OO_CONFIG
+OP: String ...
+ID: lvmconfig_general
+
+---
+
+lvreduce --size SizeMB LV
+OO: --autobackup Bool, --force, --nofsck, --noudevsync,
+--reportformat ReportFmt, --resizefs
+ID: lvreduce_general
+
+---
+
+lvremove VG|LV|Tag|Select ...
+OO: --autobackup Bool, --force, --nohistory, --noudevsync,
+--reportformat ReportFmt, --select String
+ID: lvremove_general
+
+---
+
+lvrename VG LV LV_new
+OO: --autobackup Bool, --noudevsync, --reportformat ReportFmt
+ID: lvrename_vg_lv_lv
+
+lvrename LV LV_new
+OO: --autobackup Bool, --noudevsync, --reportformat ReportFmt
+ID: lvrename_lv_lv
+
+---
+
+lvresize --size SizeMB LV
+OO: --alloc Alloc, --autobackup Bool, --force,
+--nofsck, --nosync, --noudevsync, --reportformat ReportFmt, --resizefs,
+--stripes Number, --stripesize SizeKB, --poolmetadatasize SizeMB
+OP: PV ...
+ID: lvresize_by_size
+DESC: Resize an LV by a specified size.
+
+lvresize LV PV ...
+OO: --alloc Alloc, --autobackup Bool, --force,
+--nofsck, --nosync, --noudevsync,
+--reportformat ReportFmt, --resizefs, --stripes Number, --stripesize SizeKB
+ID: lvresize_by_pv
+DESC: Resize an LV by specified PV extents.
+FLAGS: SECONDARY_SYNTAX
+
+lvresize --poolmetadatasize SizeMB LV_thinpool
+OO: --alloc Alloc, --autobackup Bool, --force,
+--nofsck, --nosync, --noudevsync,
+--reportformat ReportFmt, --stripes Number, --stripesize SizeKB
+OP: PV ...
+ID: lvresize_pool_metadata_by_size
+DESC: Resize a pool metadata SubLV by a specified size.
+
+---
+
+lvs
+OO: --history, --segments, OO_REPORT
+OP: VG|LV|Tag ...
+ID: lvs_general
+
+---
+
+lvscan
+OO: --all, --blockdevice, --ignorelockingfailure, --partial,
+--readonly, --reportformat ReportFmt
+ID: lvscan_general
+
+lvscan --cache_long
+OO: --blockdevice, --ignorelockingfailure, --partial,
+--readonly, --reportformat ReportFmt
+OP: LV ...
+ID: lvscan_cache
+
+---
+
+# None of these can function as a required option for pvchange.
+OO_PVCHANGE: --autobackup Bool, --force, --ignoreskippedcluster,
+--reportformat ReportFmt, --uuid
+
+# Any of these can function as a required option for pvchange.
+OO_PVCHANGE_META: --allocatable Bool, --addtag Tag, --deltag Tag,
+--uuid, --metadataignore Bool
+
+pvchange OO_PVCHANGE_META --all
+OO: OO_PVCHANGE
+ID: pvchange_properties_all
+DESC: Change properties of all PVs.
+
+pvchange OO_PVCHANGE_META PV|Select ...
+OO: --select String, OO_PVCHANGE
+ID: pvchange_properties_some
+DESC: Change properties of specified PVs.
+
+---
+
+pvresize PV ...
+OO: --setphysicalvolumesize SizeMB, --reportformat ReportFmt
+ID: pvresize_general
+
+---
+
+pvck PV ...
+OO: --labelsector Number
+ID: pvck_general
+
+---
+
+# Use --uuidstr here which will be converted to uuidstr_ARG
+# which is actually --uuid string on the command line.
+
+pvcreate PV ...
+OO: --dataalignment SizeKB, --dataalignmentoffset SizeKB, --bootloaderareasize SizeMB,
+--force, --labelsector Number, --metadatatype MetadataType,
+--pvmetadatacopies MetadataCopiesPV, --metadatasize SizeMB,
+--metadataignore Bool, --norestorefile, --setphysicalvolumesize SizeMB,
+--reportformat ReportFmt, --restorefile String, --uuidstr String, --zero Bool
+ID: pvcreate_general
+
+---
+
+pvdisplay
+OO: --aligned, --all, --binary, --colon, --columns, --configreport ConfigReport,
+--foreign, --ignorelockingfailure, --ignoreskippedcluster,
+--logonly, --maps, --noheadings, --nosuffix, --options String,
+--readonly, --reportformat ReportFmt, --select String, --separator String, --shared,
+--short, --sort String, --unbuffered, --units Units
+OP: PV|Tag ...
+ID: pvdisplay_general
+
+---
+
+pvmove PV
+OO: --abort, --alloc Alloc, --atomic, --autobackup Bool, --background,
+--interval Number, --name LV, --noudevsync, --reportformat ReportFmt
+OP: PV ...
+ID: pvmove_one
+DESC: Move PV extents.
+
+pvmove
+OO: --abort, --background, --interval Number
+ID: pvmove_any
+DESC: Continue or abort existing pvmove operations.
+
+---
+
+pvremove PV ...
+OO: --force, --reportformat ReportFmt
+ID: pvremove_general
+
+---
+
+pvs
+OO: --segments, OO_REPORT
+OP: PV|Tag ...
+ID: pvs_general
+
+---
+
+pvscan
+OO: --ignorelockingfailure, --reportformat ReportFmt, --exported, --novolumegroup,
+--short, --uuid
+ID: pvscan_show
+DESC: Display PV information.
+
+pvscan --cache_long
+OO: --ignorelockingfailure, --reportformat ReportFmt, --background,
+--activate Active, --major Number, --minor Number
+OP: PV|String ...
+ID: pvscan_cache
+DESC: Populate the lvmetad cache by scanning PVs.
+
+---
+
+vgcfgbackup
+OO: --file String, --foreign, --ignorelockingfailure, --partial, --readonly,
+--reportformat ReportFmt
+OP: VG ...
+ID: vgcfgbackup_general
+
+---
+
+OO_VGCFGRESTORE: --force_long, --metadatatype MetadataType
+
+vgcfgrestore VG
+OO: OO_VGCFGRESTORE
+ID: vgcfgrestore_by_vg
+DESC: Restore VG metadata from last backup.
+
+vgcfgrestore --file String VG
+OO: OO_VGCFGRESTORE
+ID: vgcfgrestore_by_file
+DESC: Restore VG metadata from specified file.
+
+vgcfgrestore --list VG
+OO: OO_VGCFGRESTORE
+ID: vgcfgrestore_list_by_vg
+DESC: List all VG metadata backups.
+
+# FIXME: the optional VG pos arg is not used or checked and can be
+# anything, but a test in the test suite uses it. Fix the test or
+# verify that the positional VG is correct?
+
+vgcfgrestore --list --file String
+OO: OO_VGCFGRESTORE
+OP: VG
+ID: vgcfgrestore_list_by_file
+DESC: List one VG metadata backup file.
+
+---
+
+# None of these can function as a required option for vgchange.
+
+OO_VGCHANGE: --autobackup Bool, --ignoremonitoring, --ignoreskippedcluster,
+--noudevsync, --reportformat ReportFmt, --select String, --force
+
+# Any of these can function as a required option for vgchange.
+# profile is also part of OO_ALL, but is repeated in OO_VGCHANGE_META
+# because it can function as a required opt.
+
+OO_VGCHANGE_META: --addtag Tag, --deltag Tag,
+--logicalvolume Number, --maxphysicalvolumes Number, --alloc Alloc, --uuid,
+--clustered Bool, --pvmetadatacopies MetadataCopiesPV, --vgmetadatacopies MetadataCopiesVG,
+--physicalextentsize SizeMB, --resizeable Bool, --systemid String, --locktype LockType,
+--profile String, --detachprofile, --metadataprofile String
+
+vgchange OO_VGCHANGE_META
+OO: OO_VGCHANGE
+OP: VG|Tag|Select ...
+ID: vgchange_properties
+DESC: Change a general VG property.
+
+vgchange --monitor Bool
+OO: --sysinit, --ignorelockingfailure, --poll Bool, OO_VGCHANGE
+OP: VG|Tag|Select ...
+ID: vgchange_monitor
+DESC: Start or stop monitoring LVs from dmeventd.
+
+vgchange --poll Bool
+OO: --ignorelockingfailure, OO_VGCHANGE
+OP: VG|Tag|Select ...
+ID: vgchange_poll
+DESC: Start or stop processing LV conversions.
+
+vgchange --activate Active
+OO: --activationmode ActivationMode, --ignoreactivationskip, --partial, --sysinit,
+--ignorelockingfailure, --monitor Bool, --poll Bool, OO_VGCHANGE
+OP: VG|Tag|Select ...
+ID: vgchange_activate
+DESC: Activate or deactivate LVs.
+
+vgchange --refresh
+OO: --sysinit, --ignorelockingfailure, --monitor Bool, --poll Bool, OO_VGCHANGE
+OP: VG|Tag|Select ...
+ID: vgchange_refresh
+DESC: Reactivate LVs using the latest metadata.
+
+vgchange --lockstart
+OO: --lockopt String, OO_VGCHANGE
+OP: VG|Tag|Select ...
+ID: vgchange_lockstart
+DESC: Start the lockspace of a shared VG in lvmlockd.
+
+vgchange --lockstop
+OO: --lockopt String, OO_VGCHANGE
+OP: VG|Tag|Select ...
+ID: vgchange_lockstop
+DESC: Stop the lockspace of a shared VG in lvmlockd.
+
+---
+
+vgck
+OO: --reportformat ReportFmt
+OP: VG|Tag ...
+ID: vgck_general
+
+---
+
+vgconvert VG ...
+OO: --force, --labelsector Number, --bootloaderareasize SizeMB,
+--metadatatype MetadataType, --pvmetadatacopies MetadataCopiesPV,
+--metadatasize SizeMB, --reportformat ReportFmt
+ID: vgconvert_general
+
+---
+
+vgcreate VG_new PV ...
+OO: --addtag Tag, --alloc Alloc, --autobackup Bool, --clustered Bool, --maxlogicalvolumes Number,
+--maxphysicalvolumes Number, --metadataprofile String, --metadatatype MetadataType,
+--physicalextentsize SizeMB, --force, --zero Bool, --labelsector Number,
+--metadatasize SizeMB, --pvmetadatacopies MetadataCopiesPV, --vgmetadatacopies MetadataCopiesVG,
+--reportformat ReportFmt, --dataalignment SizeKB, --dataalignmentoffset SizeKB,
+--shared, --systemid String, --locktype LockType, --lockopt String
+ID: vgcreate_general
+
+---
+
+vgdisplay
+OO: --activevolumegroups, --aligned, --binary, --colon, --columns,
+--configreport ConfigReport, --foreign, --ignorelockingfailure,
+--ignoreskippedcluster, --logonly, --noheadings, --nosuffix,
+--options String, --partial, --readonly, --reportformat ReportFmt, --select String,
+--shared, --short, --separator String, --sort String, --unbuffered, --units Units
+OP: VG|Tag ...
+ID: vgdisplay_general
+
+---
+
+OO_VGEXPORT: --reportformat ReportFmt
+
+vgexport VG|Tag|Select ...
+OO: --select String, OO_VGEXPORT
+ID: vgexport_some
+DESC: Export specified VGs.
+
+vgexport --all
+OO: OO_VGEXPORT
+ID: vgexport_all
+DESC: Export all VGs.
+FLAGS: SECONDARY_SYNTAX
+
+---
+
+vgextend VG PV ...
+OO: --autobackup Bool,
+--force, --zero Bool, --labelsector Number, --metadatatype MetadataType,
+--metadatasize SizeMB, --pvmetadatacopies MetadataCopiesPV,
+--metadataignore Bool, --dataalignment SizeKB, --dataalignmentoffset SizeKB,
+--reportformat ReportFmt, --restoremissing
+ID: vgextend_general
+
+---
+
+OO_VGIMPORT: --force, --reportformat ReportFmt
+
+vgimport VG|Tag|Select ...
+OO: --select String, OO_VGIMPORT
+ID: vgimport_some
+DESC: Import specified VGs.
+
+vgimport --all
+OO: OO_VGIMPORT
+ID: vgimport_all
+DESC: Import all VGs.
+
+---
+
+vgimportclone PV ...
+OO: --basevgname VG, --import
+ID: vgimportclone_general
+
+---
+
+vgmerge VG VG
+OO: --autobackup Bool, --list
+ID: vgmerge_general
+
+---
+
+vgmknodes
+OO: --ignorelockingfailure, --refresh, --reportformat ReportFmt
+OP: VG|LV|Tag ...
+ID: vgmknodes_general
+
+---
+
+OO_VGREDUCE: --autobackup Bool, --force, --reportformat ReportFmt
+
+vgreduce VG PV ...
+OO: OO_VGREDUCE
+ID: vgreduce_by_pv
+DESC: Remove a PV from a VG.
+
+vgreduce --all VG
+OO: OO_VGREDUCE
+ID: vgreduce_all
+DESC: Remove all unused PVs from a VG.
+
+vgreduce --removemissing VG
+OO: --mirrorsonly, OO_VGREDUCE
+ID: vgreduce_missing
+DESC: Remove all missing PVs from a VG.
+
+---
+
+vgremove VG|Tag|Select ...
+OO: --force, --noudevsync, --reportformat ReportFmt, --select String
+ID: vgremove_general
+
+---
+
+vgrename VG VG_new
+OO: --autobackup Bool, --force, --reportformat ReportFmt
+ID: vgrename_by_name
+DESC: Rename a VG.
+
+vgrename String VG_new
+OO: --autobackup Bool, --force, --reportformat ReportFmt
+ID: vgrename_by_uuid
+DESC: Rename a VG by specifying the VG UUID.
+
+---
+
+vgs
+OO: OO_REPORT
+OP: VG|Tag ...
+ID: vgs_general
+
+---
+
+vgscan
+OO: --cache_long, --ignorelockingfailure, --mknodes, --notifydbus,
+--partial, --reportformat ReportFmt
+ID: vgscan_general
+
+---
+
+OO_VGSPLIT: --autobackup Bool
+
+# used only when the destination VG is new
+OO_VGSPLIT_NEW: --alloc Alloc, --clustered Bool,
+--maxlogicalvolumes Number, --maxphysicalvolumes Number,
+--metadatatype MetadataType, --vgmetadatacopies MetadataCopiesVG
+
+vgsplit VG VG PV ...
+OO: OO_VGSPLIT, OO_VGSPLIT_NEW
+ID: vgsplit_by_pv
+DESC: Split a VG by specified PVs.
+
+vgsplit --name LV VG VG
+OO: OO_VGSPLIT, OO_VGSPLIT_NEW
+ID: vgsplit_by_lv
+DESC: Split a VG by PVs in a specified LV.
+
+---
+
+# built-in and deprecated commands
+
+# use lvmconfig
+config
+OO: OO_CONFIG
+OP: String ...
+ID: lvmconfig_general
+FLAGS: SECONDARY_SYNTAX
+
+# use lvmconfig
+dumpconfig
+OO: OO_CONFIG
+OP: String ...
+ID: lvmconfig_general
+FLAGS: SECONDARY_SYNTAX
+
+devtypes
+OO: --aligned, --binary, --nameprefixes, --noheadings,
+--nosuffix, --options String, --reportformat ReportFmt, --rows,
+--select String, --separator String, --sort String, --unbuffered, --unquoted
+ID: devtypes_general
+
+fullreport
+OO: OO_REPORT
+OP: VG ...
+ID: fullreport_general
+
+lastlog
+OO: --reportformat ReportFmt, --select String
+ID: lastlog_general
+
+lvpoll --polloperation PollOp LV ...
+OO: --abort, --autobackup Bool, --handlemissingpvs, --interval Number
+ID: lvpoll_general
+
+formats
+ID: formats_general
+
+help
+ID: help_general
+
+version
+ID: version_general
+
+# deprecated
+pvdata
+ID: pvdata_general
+FLAGS: SECONDARY_SYNTAX
+
+segtypes
+ID: segtypes_general
+
+systemid
+ID: systemid_general
+
+tags
+ID: tags_general
+
+# deprecated
+lvmchange
+ID: lvmchange_general
+FLAGS: SECONDARY_SYNTAX
+
+# deprecated
+lvmdiskscan
+OO: --lvmpartition, --readonly
+ID: lvmdiskscan_general
+FLAGS: SECONDARY_SYNTAX
+
+# deprecated
+lvmsadc
+ID: lvmsadc_general
+FLAGS: SECONDARY_SYNTAX
+
+# deprecated
+lvmsar
+OO: --full, --stdin
+ID: lvmsar_general
+FLAGS: SECONDARY_SYNTAX
+
diff --git a/tools/command.h b/tools/command.h
new file mode 100644
index 0000000..e4ce989
--- /dev/null
+++ b/tools/command.h
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
+ * Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of LVM2.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License v.2.1.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef _LVM_COMMAND_H
+#define _LVM_COMMAND_H
+
+struct cmd_context;
+
+/* old per-command-name function */
+typedef int (*command_fn) (struct cmd_context *cmd, int argc, char **argv);
+
+/* new per-command-line-id functions */
+typedef int (*command_line_fn) (struct cmd_context *cmd, int argc, char **argv);
+
+struct command_function {
+ int command_line_enum;
+ command_line_fn fn;
+};
+
+struct command_name {
+ const char *name;
+ const char *desc; /* general command description from commands.h */
+ unsigned int flags;
+
+ /* union of {required,optional}_opt_args for all commands with this name */
+ int valid_args[ARG_COUNT];
+ int num_args;
+};
+
+/*
+ * Command defintion
+ *
+ * A command is defined in terms of a command name,
+ * required options (+args), optional options (+args),
+ * required positional args, optional positional args.
+ *
+ * A positional arg always has non-zero pos_arg.def.types.
+ * The first positional arg has pos_arg.pos of 1.
+ */
+
+/* arg_def flags */
+#define ARG_DEF_FLAG_NEW_VG 1 << 0
+#define ARG_DEF_FLAG_NEW_LV 1 << 1
+#define ARG_DEF_FLAG_MAY_REPEAT 1 << 2
+
+static inline int val_bit_is_set(uint64_t val_bits, int val_enum)
+{
+ return (val_bits & (1 << val_enum)) ? 1 : 0;
+}
+
+static inline uint64_t val_enum_to_bit(int val_enum)
+{
+ return (1ULL << val_enum);
+}
+
+static inline int lvp_bit_is_set(uint64_t lvp_bits, int lvp_enum)
+{
+ return (lvp_bits & (1 << lvp_enum)) ? 1 : 0;
+}
+
+static inline uint64_t lvp_enum_to_bit(int lvp_enum)
+{
+ return (1ULL << lvp_enum);
+}
+
+static inline int lvt_bit_is_set(uint64_t lvt_bits, int lvt_enum)
+{
+ return (lvt_bits & (1 << lvt_enum)) ? 1 : 0;
+}
+
+static inline uint64_t lvt_enum_to_bit(int lvt_enum)
+{
+ return (1ULL << lvt_enum);
+}
+
+/* Description a value that follows an option or exists in a position. */
+
+struct arg_def {
+ uint64_t val_bits; /* bits of x_VAL, can be multiple for pos_arg */
+ uint64_t lvt_bits; /* lvt_enum_to_bit(x_LVT) for lv_VAL, can be multiple */
+ uint64_t num; /* a literal number for conststr_VAL */
+ const char *str; /* a literal string for constnum_VAL */
+ uint32_t flags; /* ARG_DEF_FLAG_ */
+};
+
+/* Description of an option and the value that follows it. */
+
+struct opt_arg {
+ int opt; /* option, e.g. foo_ARG */
+ struct arg_def def; /* defines accepted values */
+};
+
+/* Description of a position and the value that exists there. */
+
+struct pos_arg {
+ int pos; /* position, e.g. first is 1 */
+ struct arg_def def; /* defines accepted values */
+};
+
+/*
+ *
+ * Commands using a given command definition must follow a set
+ * of rules. If a given command+LV matches the conditions in
+ * opts/lvt_bits/lvp_bits, then the checks are applied.
+ * If one condition is not met, the checks are not applied.
+ * If no conditions are set, the checks are always applied.
+ */
+
+#define RULE_INVALID 1
+#define RULE_REQUIRE 2
+
+struct cmd_rule {
+ int *opts; /* if any option in this list is set, the check may apply */
+ uint64_t lvt_bits; /* if LV has one of these types (lvt_enum_to_bit), the check may apply */
+ uint64_t lvp_bits; /* if LV has all of these properties (lvp_enum_to_bit), the check may apply */
+
+ int *check_opts; /* used options must [not] be in this list */
+ uint64_t check_lvt_bits; /* LV must [not] have one of these type */
+ uint64_t check_lvp_bits; /* LV must [not] have all of these properties */
+
+ uint32_t rule; /* RULE_INVALID, RULE_REQUIRE: check values must [not] be true */
+ int opts_count; /* entries in opts[] */
+ int check_opts_count; /* entries in check_opts[] */
+
+};
+
+/*
+ * CMD_RO_ARGS needs to accomodate a list of options,
+ * of which one is required after which the rest are
+ * optional.
+ */
+#define CMD_RO_ARGS 64 /* required opt args */
+#define CMD_OO_ARGS 150 /* optional opt args */
+#define CMD_RP_ARGS 8 /* required positional args */
+#define CMD_OP_ARGS 8 /* optional positional args */
+#define CMD_IO_ARGS 8 /* ignore opt args */
+#define CMD_MAX_RULES 32 /* max number of rules per command def */
+
+/*
+ * one or more from required_opt_args is required,
+ * then the rest are optional.
+ */
+#define CMD_FLAG_ONE_REQUIRED_OPT 1
+#define CMD_FLAG_SECONDARY_SYNTAX 2
+
+/* a register of the lvm commands */
+struct command {
+ const char *name;
+ const char *desc; /* specific command description from command-lines.h */
+ const char *usage; /* excludes common options like --help, --debug */
+ const char *usage_common; /* includes commmon options like --help, --debug */
+ const char *command_line_id;
+ int command_line_enum; /* <command_line_id>_CMD */
+
+ struct command_name *cname;
+
+ command_fn fn; /* old style */
+ struct command_function *functions; /* new style */
+
+ unsigned int flags; /* copied from command_name.flags from commands.h */
+
+ unsigned int cmd_flags; /* CMD_FLAG_ */
+
+ /* definitions of opt/pos args */
+
+ /* required args following an --opt */
+ struct opt_arg required_opt_args[CMD_RO_ARGS];
+
+ /* optional args following an --opt */
+ struct opt_arg optional_opt_args[CMD_OO_ARGS];
+
+ /* required positional args */
+ struct pos_arg required_pos_args[CMD_RP_ARGS];
+
+ /* optional positional args */
+ struct pos_arg optional_pos_args[CMD_OP_ARGS];
+
+ /* unused opt args, are ignored instead of causing an error */
+ struct opt_arg ignore_opt_args[CMD_IO_ARGS];
+
+ struct cmd_rule rules[CMD_MAX_RULES];
+
+ int ro_count;
+ int oo_count;
+ int rp_count;
+ int op_count;
+ int io_count;
+
+ /* used for processing current position */
+ int pos_count;
+
+ int rule_count;
+};
+
+#endif
diff --git a/tools/commands.h b/tools/commands.h
index baf89b1..c663207 100644
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -13,1546 +13,232 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/*********** Replace with script?
-xx(e2fsadm,
- "Resize logical volume and ext2 filesystem",
- "e2fsadm "
- "[-d|--debug] " "[-h|--help] " "[-n|--nofsck]\n"
- "\t{[-l|--extents] [+|-]LogicalExtentsNumber |\n"
- "\t [-L|--size] [+|-]LogicalVolumeSize[bBsSkKmMgGtTpPeE]}\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tLogicalVolumePath\n",
-
- extents_ARG, size_ARG, nofsck_ARG, test_ARG)
-*********/
-
xx(config,
"Display and manipulate configuration information",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "config\n"
- "\t[-f|--file filename]\n"
- "\t[--type {current|default|diff|full|list|missing|new|profilable|profilable-command|profilable-metadata}]\n"
- "\t[--atversion version]\n"
- "\t[--ignoreadvanced]\n"
- "\t[--ignoreunsupported]\n"
- "\t[--ignorelocal]\n"
- "\t[-l|--list]\n"
- "\t[--config ConfigurationString]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[--profile ProfileName]\n"
- "\t[--metadataprofile ProfileName]\n"
- "\t[--mergedconfig]\n"
- "\t[--sinceversion version]\n"
- "\t[--showdeprecated]\n"
- "\t[--showunsupported]\n"
- "\t[--validate]\n"
- "\t[--withsummary]\n"
- "\t[--withcomments]\n"
- "\t[--withspaces]\n"
- "\t[--unconfigured]\n"
- "\t[--withversions]\n"
- "\t[ConfigurationNode...]\n",
- atversion_ARG, configtype_ARG, file_ARG, ignoreadvanced_ARG,
- ignoreunsupported_ARG, ignorelocal_ARG, list_ARG, mergedconfig_ARG, metadataprofile_ARG,
- sinceversion_ARG, showdeprecated_ARG, showunsupported_ARG, validate_ARG, withsummary_ARG,
- withcomments_ARG, withspaces_ARG, unconfigured_ARG, withversions_ARG)
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
xx(devtypes,
"Display recognised built-in block device types",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "devtypes\n"
- "\t[--aligned]\n"
- "\t[--binary]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[--nameprefixes]\n"
- "\t[--noheadings]\n"
- "\t[--nosuffix]\n"
- "\t[-o|--options [+|-|#]Field[,Field]]\n"
- "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[--rows]\n"
- "\t[-S|--select Selection]\n"
- "\t[--separator Separator]\n"
- "\t[--unbuffered]\n"
- "\t[--unquoted]\n"
- "\t[--version]\n",
-
- aligned_ARG, binary_ARG, nameprefixes_ARG, noheadings_ARG,
- nosuffix_ARG, options_ARG, reportformat_ARG, rows_ARG,
- select_ARG, separator_ARG, sort_ARG, unbuffered_ARG, unquoted_ARG)
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
xx(dumpconfig,
"Display and manipulate configuration information",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "dumpconfig\n"
- "\t[-f|--file filename]\n"
- "\t[--type {current|default|diff|full|list|missing|new|profilable|profilable-command|profilable-metadata}]\n"
- "\t[--atversion version]\n"
- "\t[--ignoreadvanced]\n"
- "\t[--ignoreunsupported]\n"
- "\t[--ignorelocal]\n"
- "\t[-l|--list]\n"
- "\t[--config ConfigurationString]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[--profile ProfileName]\n"
- "\t[--metadataprofile ProfileName]\n"
- "\t[--mergedconfig]\n"
- "\t[--sinceversion version]\n"
- "\t[--showdeprecated]\n"
- "\t[--showunsupported]\n"
- "\t[--validate]\n"
- "\t[--withsummary]\n"
- "\t[--withcomments]\n"
- "\t[--withspaces]\n"
- "\t[--unconfigured]\n"
- "\t[--withversions]\n"
- "\t[ConfigurationNode...]\n",
- atversion_ARG, configtype_ARG, file_ARG, ignoreadvanced_ARG,
- ignoreunsupported_ARG, ignorelocal_ARG, list_ARG, mergedconfig_ARG, metadataprofile_ARG,
- sinceversion_ARG, showdeprecated_ARG, showunsupported_ARG, validate_ARG, withsummary_ARG,
- withcomments_ARG, withspaces_ARG, unconfigured_ARG, withversions_ARG)
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
xx(formats,
"List available metadata formats",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "formats\n")
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
xx(help,
"Display help for commands",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "help <command>\n")
-
-/*********
-xx(lvactivate,
- "Activate logical volume on given partition(s)",
- "lvactivate "
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[-v|--verbose]\n"
- "Logical Volume(s)\n")
-***********/
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
xx(fullreport,
"Display full report",
- PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH,
- "fullreport\n"
- "\t[--aligned]\n"
- "\t[--binary]\n"
- "\t[-a|--all]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[--configreport ReportName]\n"
- "\t[-d|--debug]\n"
- "\t[--foreign]\n"
- "\t[-h|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[--logonly]\n"
- "\t[--nameprefixes]\n"
- "\t[--noheadings]\n"
- "\t[--nosuffix]\n"
- "\t[-o|--options [+|-|#]Field[,Field]]\n"
- "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
- "\t[-P|--partial]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[--rows]\n"
- "\t[-S|--select Selection]\n"
- "\t[--separator Separator]\n"
- "\t[--trustcache]\n"
- "\t[--unbuffered]\n"
- "\t[--units hHbBsSkKmMgGtTpPeE]\n"
- "\t[--unquoted]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[VolumeGroupName [VolumeGroupName...]]\n",
-
- aligned_ARG, all_ARG, binary_ARG, configreport_ARG, foreign_ARG,
- ignorelockingfailure_ARG, ignoreskippedcluster_ARG, logonly_ARG,
- nameprefixes_ARG, noheadings_ARG, nolocking_ARG, nosuffix_ARG,
- options_ARG, partial_ARG, readonly_ARG, reportformat_ARG, rows_ARG,
- select_ARG, separator_ARG, shared_ARG, sort_ARG, trustcache_ARG,
- unbuffered_ARG, units_ARG, unquoted_ARG)
+ PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH)
xx(lastlog,
"Display last command's log report",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "log\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n",
-
- reportformat_ARG, select_ARG)
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
xx(lvchange,
"Change the attributes of logical volume(s)",
- CACHE_VGMETADATA | PERMITTED_READ_ONLY,
- "lvchange\n"
- "\t[-A|--autobackup {y|n}]\n"
- "\t[-a|--activate [a][e|s|l]{y|n}]\n"
- "\t[--activationmode {complete|degraded|partial}"
- "\t[--addtag <Tag>]\n"
- "\t[--alloc <AllocationPolicy>]\n"
- "\t[--rebuild PhysicalVolume]\n"
- "\t[-C|--contiguous {y|n}]\n"
- "\t[--cachemode <CacheMode>]\n"
- "\t[--cachepolicy <policyname>] [--cachesettings <parameter=value>]\n"
- "\t[--commandprofile <ProfileName>]\n"
- "\t[-d|--debug]\n"
- "\t[--deltag <Tag>]\n"
- "\t[--detachprofile]\n"
- "\t[--errorwhenfull {y|n}]\n"
- "\t[-f|--force]\n"
- "\t[-h|--help]\n"
- "\t[--discards {ignore|nopassdown|passdown}]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoremonitoring]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[-k|--setactivationskip {y|n}]\n"
- "\t[-K|--ignoreactivationskip]\n"
- "\t[--monitor {y|n}]\n"
- "\t[--poll {y|n}]\n"
- "\t[--noudevsync]\n"
- "\t[-M|--persistent {y|n}] [-j|--major <major>] [--minor <minor>]\n"
- "\t[--metadataprofile <ProfileName>]\n"
- "\t[-P|--partial]\n"
- "\t[-p|--permission {r|rw}]\n"
- "\t[--[raid]minrecoveryrate <Rate>]\n"
- "\t[--[raid]maxrecoveryrate <Rate>]\n"
- "\t[--[raid]syncaction {check|repair}\n"
- "\t[--[raid]writebehind <IOCount>]\n"
- "\t[--[raid]writemostly <PhysicalVolume>[:{t|n|y}]]\n"
- "\t[-r|--readahead <ReadAheadSectors>|auto|none]\n"
- "\t[--refresh]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[--resync]\n"
- "\t[-S|--select Selection]\n"
- "\t[--sysinit]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[-y|--yes]\n"
- "\t[-Z|--zero {y|n}]\n"
- "\t<LogicalVolume[Path]> [<LogicalVolume[Path]>...]\n",
-
- activationmode_ARG, addtag_ARG, alloc_ARG, autobackup_ARG, activate_ARG,
- available_ARG, cachemode_ARG, cachepolicy_ARG, cachesettings_ARG,
- contiguous_ARG, deltag_ARG,
- discards_ARG, detachprofile_ARG, errorwhenfull_ARG, force_ARG,
- ignorelockingfailure_ARG, ignoremonitoring_ARG, ignoreactivationskip_ARG,
- ignoreskippedcluster_ARG, major_ARG, metadataprofile_ARG, minor_ARG,
- monitor_ARG, minrecoveryrate_ARG, maxrecoveryrate_ARG, noudevsync_ARG,
- partial_ARG, permission_ARG, persistent_ARG, poll_ARG,
- raidrebuild_ARG, raidminrecoveryrate_ARG, raidmaxrecoveryrate_ARG,
- raidsyncaction_ARG, raidwritebehind_ARG, raidwritemostly_ARG, readahead_ARG,
- reportformat_ARG, rebuild_ARG, resync_ARG, refresh_ARG, select_ARG, setactivationskip_ARG,
- syncaction_ARG, sysinit_ARG, test_ARG, writebehind_ARG, writemostly_ARG, zero_ARG)
-
-#define COMMON_OPTS \
- "\t[--commandprofile <ProfileName>] [-d|--debug] [-h|-?|--help]\n" \
- "\t[--noudevsync] [-t|--test] [-v|--verbose] [--version] [-y|--yes]\n"
+ CACHE_VGMETADATA | PERMITTED_READ_ONLY)
xx(lvconvert,
"Change logical volume layout",
- 0,
- "lvconvert "
- "[-m|--mirrors <Mirrors> [--mirrorlog {disk|core|mirrored}|--corelog]]\n"
- "\t[--type <SegmentType>]\n"
- "\t[--rebuild PhysicalVolume]\n"
- "\t[--repair [--use-policies]]\n"
- "\t[--replace PhysicalVolume]\n"
- "\t[-R|--regionsize <MirrorLogRegionSize>]\n"
- "\t[--alloc <AllocationPolicy>]\n"
- "\t[-b|--background]\n"
- "\t[-f|--force]\n"
- "\t[-i|--interval <Seconds>]\n"
- "\t[--stripes <Stripes> [-I|--stripesize <StripeSize>]]\n"
- COMMON_OPTS
- "\tLogicalVolume[Path] [PhysicalVolume[Path]...]\n\n"
-
- "lvconvert "
- "[--splitmirrors <Images> --trackchanges]\n"
- "\t[--splitmirrors Images --name SplitLogicalVolumeName]\n"
- COMMON_OPTS
- "\tLogicalVolume[Path] [SplittablePhysicalVolume[Path]...]\n\n"
-
- "lvconvert "
- "--splitsnapshot\n"
- COMMON_OPTS
- "\tSnapshotLogicalVolume[Path]\n\n"
-
- "lvconvert "
- "--splitcache\n"
- COMMON_OPTS
- "\tCacheLogicalVolume[Path]\n\n"
-
- "lvconvert "
- "--split\n"
- "\t[--name SplitLogicalVolumeName]\n"
- COMMON_OPTS
- "\tSplitableLogicalVolume[Path]\n\n"
-
- "lvconvert "
- "--uncache\n"
- COMMON_OPTS
- "\tCacheLogicalVolume[Path]\n\n"
-
- "lvconvert "
- "[--type snapshot|-s|--snapshot]\n"
- "\t[-c|--chunksize <ChunkSize>]\n"
- "\t[-Z|--zero {y|n}]\n"
- COMMON_OPTS
- "\tOriginalLogicalVolume[Path] SnapshotLogicalVolume[Path]\n\n"
-
- "lvconvert "
- "--merge\n"
- "\t[-b|--background]\n"
- "\t[-i|--interval <Seconds>]\n"
- COMMON_OPTS
- "\tLogicalVolume[Path]\n\n"
-
- "lvconvert "
- "[--type thin[-pool]|-T|--thin]\n"
- "\t[--thinpool ThinPoolLogicalVolume[Path]]\n"
- "\t[--chunksize <ChunkSize>]\n"
- "\t[--discards {ignore|nopassdown|passdown}]\n"
- "\t[--poolmetadataspare {y|n}]\n"
- "\t[--poolmetadata ThinMetadataLogicalVolume[Path] |\n"
- "\t --poolmetadatasize <MetadataSize>]\n"
- "\t[-r|--readahead <ReadAheadSectors>|auto|none]\n"
- "\t[--stripes <Stripes> [-I|--stripesize <StripeSize>]]]\n"
- "\t[--originname NewExternalOriginVolumeName]]\n"
- "\t[-Z|--zero {y|n}]\n"
- COMMON_OPTS
- "\t[ExternalOrigin|ThinDataPool]LogicalVolume[Path] [PhysicalVolumePath...]\n\n"
-
- "lvconvert "
- "[--type cache[-pool]|-H|--cache]\n"
- "\t[--cachepool CacheDataLogicalVolume[Path]]\n"
- "\t[--cachemode <CacheMode>]\n"
- "\t[--cachepolicy <CachePolicy>]\n"
- "\t[--cachesettings <Key>=<Value>]\n"
- "\t[--chunksize <ChunkSize>]\n"
- "\t[--poolmetadata CacheMetadataLogicalVolume[Path] |\n"
- "\t --poolmetadatasize <MetadataSize>]\n"
- "\t[--poolmetadataspare {y|n}]]\n"
- COMMON_OPTS
- "\t[Cache|CacheDataPool]LogicalVolume[Path] [PhysicalVolumePath...]\n\n",
-
- alloc_ARG, background_ARG, cache_ARG, cachemode_ARG,
- cachepool_ARG, cachepolicy_ARG, cachesettings_ARG, chunksize_ARG,
- corelog_ARG, discards_ARG, force_ARG, interval_ARG, merge_ARG, mirrorlog_ARG,
- mirrors_ARG, name_ARG, noudevsync_ARG, originname_ARG, poolmetadata_ARG,
- poolmetadatasize_ARG, poolmetadataspare_ARG, readahead_ARG, regionsize_ARG,
- repair_ARG, replace_ARG, snapshot_ARG,
- split_ARG, splitcache_ARG, splitmirrors_ARG, splitsnapshot_ARG,
- stripes_long_ARG, stripesize_ARG, test_ARG, thin_ARG, thinpool_ARG,
- trackchanges_ARG, type_ARG, uncache_ARG, usepolicies_ARG, zero_ARG)
+ 0)
xx(lvcreate,
"Create a logical volume",
- 0,
- "lvcreate\n"
- "\t[-A|--autobackup {y|n}]\n"
- "\t[-a|--activate [a|e|l]{y|n}]\n"
- "\t[--addtag Tag]\n"
- "\t[--alloc AllocationPolicy]\n"
- "\t[-H|--cache\n"
- "\t [--cachemode {writeback|writethrough}]\n"
- "\t [--cachepolicy policy]\n"
- "\t [--cachesettings key=value]\n"
- "\t[--cachepool CachePoolLogicalVolume{Name|Path}]\n"
- "\t[-c|--chunksize ChunkSize]\n"
- "\t[-C|--contiguous {y|n}]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|-?|--help]\n"
- "\t[--errorwhenfull {y|n}]\n"
- "\t[--ignoremonitoring]\n"
- "\t[--monitor {y|n}]\n"
- "\t[-i|--stripes Stripes [-I|--stripesize StripeSize]]\n"
- "\t[-k|--setactivationskip {y|n}]\n"
- "\t[-K|--ignoreactivationskip]\n"
- "\t{-l|--extents LogicalExtentsNumber[%{VG|PVS|FREE}] |\n"
- "\t -L|--size LogicalVolumeSize[bBsSkKmMgGtTpPeE]}\n"
- "\t[-M|--persistent {y|n}] [-j|--major major] [--minor minor]\n"
- "\t[--metadataprofile ProfileName]\n"
- "\t[-m|--mirrors Mirrors [--nosync]\n"
- "\t [{--mirrorlog {disk|core|mirrored}|--corelog}]]\n"
- "\t[-n|--name LogicalVolumeName]\n"
- "\t[--noudevsync]\n"
- "\t[-p|--permission {r|rw}]\n"
- //"\t[--pooldatasize DataSize[bBsSkKmMgGtTpPeE]]\n"
- "\t[--poolmetadatasize MetadataSize[bBsSkKmMgG]]\n"
- "\t[--poolmetadataspare {y|n}]]\n"
- "\t[--[raid]minrecoveryrate Rate]\n"
- "\t[--[raid]maxrecoveryrate Rate]\n"
- "\t[-r|--readahead {ReadAheadSectors|auto|none}]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-R|--regionsize MirrorLogRegionSize]\n"
- "\t[-T|--thin\n"
- "\t [--discards {ignore|nopassdown|passdown}]\n"
- "\t[--thinpool ThinPoolLogicalVolume{Name|Path}]\n"
- "\t[-t|--test]\n"
- "\t[--type VolumeType]\n"
- "\t[-v|--verbose]\n"
- "\t[-W|--wipesignatures {y|n}]\n"
- "\t[-Z|--zero {y|n}]\n"
- "\t[--version]\n"
- "\tVolumeGroupName [PhysicalVolumePath...]\n\n"
-
- "lvcreate\n"
- "\t{ {-s|--snapshot} OriginalLogicalVolume[Path] |\n"
- "\t [-s|--snapshot] VolumeGroupName[Path] -V|--virtualsize VirtualSize}\n"
- "\t {-H|--cache} VolumeGroupName[Path][/OriginalLogicalVolume]\n"
- "\t {-T|--thin} VolumeGroupName[Path][/PoolLogicalVolume]\n"
- "\t -V|--virtualsize VirtualSize}\n"
- "\t[-A|--autobackup {y|n}]\n"
- "\t[--addtag Tag]\n"
- "\t[--alloc AllocationPolicy]\n"
- "\t[--cachepolicy Policy] [--cachesettings Key=Value]\n"
- "\t[-c|--chunksize]\n"
- "\t[-C|--contiguous {y|n}]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[--discards {ignore|nopassdown|passdown}]\n"
- "\t[-h|-?|--help]\n"
- "\t[--ignoremonitoring]\n"
- "\t[--monitor {y|n}]\n"
- "\t[-i|--stripes Stripes [-I|--stripesize StripeSize]]\n"
- "\t[-k|--setactivationskip {y|n}]\n"
- "\t[-K|--ignoreactivationskip]\n"
- "\t{-l|--extents LogicalExtentsNumber[%{VG|FREE|ORIGIN}] |\n"
- "\t -L|--size LogicalVolumeSize[bBsSkKmMgGtTpPeE]}\n"
- //"\t[--pooldatasize DataVolumeSize[bBsSkKmMgGtTpPeE]]\n"
- "\t[--poolmetadatasize MetadataVolumeSize[bBsSkKmMgG]]\n"
- "\t[-M|--persistent {y|n}] [-j|--major major] [--minor minor]\n"
- "\t[--metadataprofile ProfileName]\n"
- "\t[-n|--name LogicalVolumeName]\n"
- "\t[--noudevsync]\n"
- "\t[-p|--permission {r|rw}]\n"
- "\t[-r|--readahead ReadAheadSectors|auto|none]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-t|--test]\n"
- "\t[{--thinpool ThinPoolLogicalVolume[Path] |\n"
- "\t --cachepool CachePoolLogicalVolume[Path]}]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[PhysicalVolumePath...]\n\n",
-
- addtag_ARG, alloc_ARG, autobackup_ARG, activate_ARG, available_ARG,
- cache_ARG, cachemode_ARG, cachepool_ARG, cachepolicy_ARG, cachesettings_ARG,
- chunksize_ARG, contiguous_ARG, corelog_ARG, discards_ARG, errorwhenfull_ARG,
- extents_ARG, ignoreactivationskip_ARG, ignoremonitoring_ARG, major_ARG,
- metadataprofile_ARG, minor_ARG, mirrorlog_ARG, mirrors_ARG, monitor_ARG,
- minrecoveryrate_ARG, maxrecoveryrate_ARG, name_ARG, nosync_ARG,
- noudevsync_ARG, permission_ARG, persistent_ARG,
- //pooldatasize_ARG,
- poolmetadatasize_ARG, poolmetadataspare_ARG,
- raidminrecoveryrate_ARG, raidmaxrecoveryrate_ARG,
- readahead_ARG, regionsize_ARG, reportformat_ARG, setactivationskip_ARG,
- size_ARG, snapshot_ARG, stripes_ARG, stripesize_ARG, test_ARG, thin_ARG,
- thinpool_ARG, type_ARG, virtualoriginsize_ARG, virtualsize_ARG,
- wipesignatures_ARG, zero_ARG)
+ 0)
xx(lvdisplay,
"Display information about a logical volume",
- PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH,
- "lvdisplay\n"
- "\t[-a|--all]\n"
- "\t[-c|--colon]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[--foreign]\n"
- "\t[-h|--help]\n"
- "\t[-H|--history]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[-m|--maps]\n"
- "\t[--nosuffix]\n"
- "\t[-P|--partial]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[--units hHbBsSkKmMgGtTpPeE]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n"
- "\n"
- "lvdisplay --columns|-C\n"
- "\t[--aligned]\n"
- "\t[-a|--all]\n"
- "\t[--binary]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[--configreport ReportName]\n"
- "\t[-d|--debug]\n"
- "\t[--foreign]\n"
- "\t[-h|--help]\n"
- "\t[-H|--history]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[--logonly]\n"
- "\t[--noheadings]\n"
- "\t[--nosuffix]\n"
- "\t[-o|--options [+|-|#]Field[,Field]]\n"
- "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
- "\t[-S|--select Selection]\n"
- "\t[-P|--partial]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[--segments]\n"
- "\t[--separator Separator]\n"
- "\t[--unbuffered]\n"
- "\t[--units hHbBsSkKmMgGtTpPeE]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n",
-
- aligned_ARG, all_ARG, binary_ARG, colon_ARG, columns_ARG,
- configreport_ARG, foreign_ARG, history_ARG, ignorelockingfailure_ARG,
- ignoreskippedcluster_ARG, logonly_ARG, maps_ARG, noheadings_ARG,
- nosuffix_ARG, options_ARG, sort_ARG, partial_ARG, readonly_ARG,
- reportformat_ARG, segments_ARG, select_ARG, separator_ARG,
- shared_ARG, unbuffered_ARG, units_ARG)
+ PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH)
xx(lvextend,
"Add space to a logical volume",
- 0,
- "lvextend\n"
- "\t[-A|--autobackup y|n]\n"
- "\t[--alloc AllocationPolicy]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--force]\n"
- "\t[-h|--help]\n"
- "\t[-i|--stripes Stripes [-I|--stripesize StripeSize]]\n"
- "\t{-l|--extents [+]LogicalExtentsNumber[%{VG|LV|PVS|FREE|ORIGIN}] |\n"
- "\t -L|--size [+]LogicalVolumeSize[bBsSkKmMgGtTpPeE]}\n"
- "\t --poolmetadatasize [+]MetadataVolumeSize[bBsSkKmMgG]}\n"
- "\t[-m|--mirrors Mirrors]\n"
- "\t[--nosync]\n"
- "\t[--use-policies]\n"
- "\t[-n|--nofsck]\n"
- "\t[--noudevsync]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-r|--resizefs]\n"
- "\t[-t|--test]\n"
- "\t[--type VolumeType]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tLogicalVolume[Path] [ PhysicalVolumePath... ]\n",
-
- alloc_ARG, autobackup_ARG, extents_ARG, force_ARG, mirrors_ARG,
- nofsck_ARG, nosync_ARG, noudevsync_ARG, poolmetadatasize_ARG,
- reportformat_ARG, resizefs_ARG, size_ARG, stripes_ARG, stripesize_ARG,
- test_ARG, type_ARG, usepolicies_ARG)
+ 0)
xx(lvmchange,
"With the device mapper, this is obsolete and does nothing.",
- 0,
- "lvmchange\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[-R|--reset]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n",
-
- reset_ARG)
+ 0)
xx(lvmconfig,
"Display and manipulate configuration information",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "lvmconfig\n"
- "\t[-f|--file filename]\n"
- "\t[--type {current|default|diff|full|list|missing|new|profilable|profilable-command|profilable-metadata}]\n"
- "\t[--atversion version]\n"
- "\t[--ignoreadvanced]\n"
- "\t[--ignoreunsupported]\n"
- "\t[--ignorelocal]\n"
- "\t[-l|--list]\n"
- "\t[--config ConfigurationString]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[--profile ProfileName]\n"
- "\t[--metadataprofile ProfileName]\n"
- "\t[--mergedconfig]\n"
- "\t[--sinceversion version]\n"
- "\t[--showdeprecated]\n"
- "\t[--showunsupported]\n"
- "\t[--validate]\n"
- "\t[--withsummary]\n"
- "\t[--withcomments]\n"
- "\t[--withspaces]\n"
- "\t[--unconfigured]\n"
- "\t[--withversions]\n"
- "\t[ConfigurationNode...]\n",
- atversion_ARG, configtype_ARG, file_ARG, ignoreadvanced_ARG,
- ignoreunsupported_ARG, ignorelocal_ARG, list_ARG, mergedconfig_ARG, metadataprofile_ARG,
- sinceversion_ARG, showdeprecated_ARG, showunsupported_ARG, validate_ARG, withsummary_ARG,
- withcomments_ARG, withspaces_ARG, unconfigured_ARG, withversions_ARG)
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
xx(lvmdiskscan,
"List devices that may be used as physical volumes",
- PERMITTED_READ_ONLY | ENABLE_ALL_DEVS,
- "lvmdiskscan\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[-l|--lvmpartition]\n"
- "\t[--readonly]\n"
- "\t[--version]\n",
-
- lvmpartition_ARG, readonly_ARG)
+ PERMITTED_READ_ONLY | ENABLE_ALL_DEVS)
xx(lvmsadc,
"Collect activity data",
- 0,
- "lvmsadc\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[LogFilePath]\n")
+ 0)
xx(lvmsar,
"Create activity report",
- 0,
- "lvmsar\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--full]\n"
- "\t[-h|--help]\n"
- "\t[-s|--stdin]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tLogFilePath\n",
-
- full_ARG, stdin_ARG)
+ 0)
xx(lvreduce,
"Reduce the size of a logical volume",
- 0,
- "lvreduce\n"
- "\t[-A|--autobackup y|n]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--force]\n"
- "\t[-h|--help]\n"
- "\t{-l|--extents [-]LogicalExtentsNumber[%{VG|LV|FREE|ORIGIN}] |\n"
- "\t -L|--size [-]LogicalVolumeSize[bBsSkKmMgGtTpPeE]}\n"
- "\t[-n|--nofsck]\n"
- "\t[--noudevsync]\n"
- "\t[-r|--resizefs]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[-y|--yes]\n"
- "\tLogicalVolume[Path]\n",
-
- autobackup_ARG, force_ARG, extents_ARG, nofsck_ARG, noudevsync_ARG,
- reportformat_ARG, resizefs_ARG, size_ARG, test_ARG)
+ 0)
xx(lvremove,
"Remove logical volume(s) from the system",
- ALL_VGS_IS_DEFAULT, /* all VGs only with --select */
- "lvremove\n"
- "\t[-A|--autobackup y|n]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--force]\n"
- "\t[-h|--help]\n"
- "\t[--nohistory]\n"
- "\t[--noudevsync]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tLogicalVolume[Path] [LogicalVolume[Path]...]\n",
-
- autobackup_ARG, force_ARG, nohistory_ARG, noudevsync_ARG,
- reportformat_ARG, select_ARG, test_ARG)
+ ALL_VGS_IS_DEFAULT) /* all VGs only with --select */
xx(lvrename,
"Rename a logical volume",
- 0,
- "lvrename\n"
- "\t[-A|--autobackup {y|n}]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|-?|--help]\n"
- "\t[--noudevsync]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t{ OldLogicalVolumePath NewLogicalVolumePath |\n"
- "\t VolumeGroupName OldLogicalVolumeName NewLogicalVolumeName }\n",
-
- autobackup_ARG, noudevsync_ARG, reportformat_ARG, test_ARG)
+ 0)
xx(lvresize,
"Resize a logical volume",
- 0,
- "lvresize\n"
- "\t[-A|--autobackup y|n]\n"
- "\t[--alloc AllocationPolicy]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--force]\n"
- "\t[-h|--help]\n"
- "\t[-i|--stripes Stripes [-I|--stripesize StripeSize]]\n"
- "\t{-l|--extents [+|-]LogicalExtentsNumber[%{VG|LV|PVS|FREE|ORIGIN}] |\n"
- "\t -L|--size [+|-]LogicalVolumeSize[bBsSkKmMgGtTpPeE]}\n"
- "\t --poolmetadatasize [+]MetadataVolumeSize[bBsSkKmMgG]}\n"
- "\t[-n|--nofsck]\n"
- "\t[--noudevsync]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-r|--resizefs]\n"
- "\t[-t|--test]\n"
- "\t[--type VolumeType]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tLogicalVolume[Path] [ PhysicalVolumePath... ]\n",
-
- alloc_ARG, autobackup_ARG, extents_ARG, force_ARG, nofsck_ARG,
- noudevsync_ARG, reportformat_ARG, resizefs_ARG,
- poolmetadatasize_ARG, size_ARG, stripes_ARG, stripesize_ARG,
- test_ARG, type_ARG)
+ 0)
xx(lvs,
"Display information about logical volumes",
- PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH,
- "lvs\n"
- "\t[-a|--all]\n"
- "\t[--aligned]\n"
- "\t[--binary]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[--configreport ReportName]\n"
- "\t[-d|--debug]\n"
- "\t[--foreign]\n"
- "\t[-h|--help]\n"
- "\t[-H|--history]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[--logonly]\n"
- "\t[--nameprefixes]\n"
- "\t[--noheadings]\n"
- "\t[--nosuffix]\n"
- "\t[-o|--options [+|-|#]Field[,Field]]\n"
- "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
- "\t[-P|--partial]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[--rows]\n"
- "\t[--segments]\n"
- "\t[-S|--select Selection]\n"
- "\t[--separator Separator]\n"
- "\t[--trustcache]\n"
- "\t[--unbuffered]\n"
- "\t[--units hHbBsSkKmMgGtTpPeE]\n"
- "\t[--unquoted]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n",
-
- aligned_ARG, all_ARG, binary_ARG, configreport_ARG, foreign_ARG, history_ARG,
- ignorelockingfailure_ARG, ignoreskippedcluster_ARG, logonly_ARG,
- nameprefixes_ARG, noheadings_ARG, nolocking_ARG, nosuffix_ARG,
- options_ARG, partial_ARG, readonly_ARG, reportformat_ARG, rows_ARG,
- segments_ARG, select_ARG, separator_ARG, shared_ARG, sort_ARG,
- trustcache_ARG, unbuffered_ARG, units_ARG, unquoted_ARG)
+ PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH)
xx(lvscan,
"List all logical volumes in all volume groups",
- PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | NO_LVMETAD_AUTOSCAN,
- "lvscan\n"
- "\t[-a|--all]\n"
- "\t[-b|--blockdevice]\n"
- "\t[--cache]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|-?|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[-P|--partial]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n",
-
- all_ARG, blockdevice_ARG, ignorelockingfailure_ARG, partial_ARG,
- readonly_ARG, reportformat_ARG, cache_long_ARG)
+ PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | NO_LVMETAD_AUTOSCAN)
xx(pvchange,
"Change attributes of physical volume(s)",
- 0,
- "pvchange\n"
- "\t[-a|--all]\n"
- "\t[-A|--autobackup y|n]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--force]\n"
- "\t[-h|--help]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[--metadataignore y|n]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[-t|--test]\n"
- "\t[-u|--uuid]\n"
- "\t[-x|--allocatable y|n]\n"
- "\t[-v|--verbose]\n"
- "\t[--addtag Tag]\n"
- "\t[--deltag Tag]\n"
- "\t[--version]\n"
- "\t[PhysicalVolumePath...]\n",
-
- all_ARG, allocatable_ARG, allocation_ARG, autobackup_ARG, deltag_ARG,
- addtag_ARG, force_ARG, ignoreskippedcluster_ARG, metadataignore_ARG,
- reportformat_ARG, select_ARG, test_ARG, uuid_ARG)
+ 0)
xx(pvresize,
"Resize physical volume(s)",
- 0,
- "pvresize\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|-?|--help]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[--setphysicalvolumesize PhysicalVolumeSize[bBsSkKmMgGtTpPeE]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tPhysicalVolume [PhysicalVolume...]\n",
-
- physicalvolumesize_ARG, reportformat_ARG, test_ARG)
+ 0)
xx(pvck,
"Check the consistency of physical volume(s)",
- LOCKD_VG_SH,
- "pvck "
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[--labelsector sector]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tPhysicalVolume [PhysicalVolume...]\n",
-
- labelsector_ARG)
+ LOCKD_VG_SH)
xx(pvcreate,
"Initialize physical volume(s) for use by LVM",
- ENABLE_ALL_DEVS,
- "pvcreate\n"
- "\t[--norestorefile]\n"
- "\t[--restorefile file]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f[f]|--force [--force]]\n"
- "\t[-h|-?|--help]\n"
- "\t[--labelsector sector]\n"
- "\t[-M|--metadatatype 1|2]\n"
- "\t[--pvmetadatacopies #copies]\n"
- "\t[--bootloaderareasize BootLoaderAreaSize[bBsSkKmMgGtTpPeE]]\n"
- "\t[--metadatasize MetadataSize[bBsSkKmMgGtTpPeE]]\n"
- "\t[--dataalignment Alignment[bBsSkKmMgGtTpPeE]]\n"
- "\t[--dataalignmentoffset AlignmentOffset[bBsSkKmMgGtTpPeE]]\n"
- "\t[--setphysicalvolumesize PhysicalVolumeSize[bBsSkKmMgGtTpPeE]\n"
- "\t[-t|--test]\n"
- "\t[-u|--uuid uuid]\n"
- "\t[-v|--verbose]\n"
- "\t[-y|--yes]\n"
- "\t[-Z|--zero {y|n}]\n"
- "\t[--version]\n"
- "\tPhysicalVolume [PhysicalVolume...]\n",
-
- dataalignment_ARG, dataalignmentoffset_ARG, bootloaderareasize_ARG,
- force_ARG, test_ARG, labelsector_ARG, metadatatype_ARG,
- metadatacopies_ARG, metadatasize_ARG, metadataignore_ARG,
- norestorefile_ARG, physicalvolumesize_ARG, pvmetadatacopies_ARG,
- reportformat_ARG, restorefile_ARG, uuidstr_ARG, zero_ARG)
+ ENABLE_ALL_DEVS)
xx(pvdata,
"Display the on-disk metadata for physical volume(s)",
- 0,
- "pvdata\n"
- "\t[-a|--all]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-E|--physicalextent]\n"
- "\t[-h|-?|--help]\n"
- "\t[-L|--logicalvolume]\n"
- "\t[-P[P]|--physicalvolume [--physicalvolume]]\n"
- "\t[-U|--uuidlist]\n"
- "\t[-v[v]|--verbose [--verbose]]\n"
- "\t[-V|--volumegroup]\n"
- "\t[--version]\n"
- "\tPhysicalVolume [PhysicalVolume...]\n",
-
- all_ARG, logicalextent_ARG, physicalextent_ARG,
- physicalvolume_ARG, uuidlist_ARG, volumegroup_ARG)
+ 0)
xx(pvdisplay,
"Display various attributes of physical volume(s)",
- CACHE_VGMETADATA | PERMITTED_READ_ONLY | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH,
- "pvdisplay\n"
- "\t[-c|--colon]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[--foreign]\n"
- "\t[-h|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[-m|--maps]\n"
- "\t[--nosuffix]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[-s|--short]\n"
- "\t[--units hHbBsSkKmMgGtTpPeE]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[PhysicalVolumePath [PhysicalVolumePath...]]\n"
- "\n"
- "pvdisplay --columns|-C\n"
- "\t[--aligned]\n"
- "\t[-a|--all]\n"
- "\t[--binary]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[--configreport ReportName]\n"
- "\t[-d|--debug]\n"
- "\t[--foreign]\n"
- "\t[-h|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[--logonly]\n"
- "\t[--noheadings]\n"
- "\t[--nosuffix]\n"
- "\t[-o|--options [+|-|#]Field[,Field]]\n"
- "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[--readonly]\n"
- "\t[--separator Separator]\n"
- "\t[--unbuffered]\n"
- "\t[--units hHbBsSkKmMgGtTpPeE]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[PhysicalVolumePath [PhysicalVolumePath...]]\n",
-
- aligned_ARG, all_ARG, binary_ARG, colon_ARG, columns_ARG, configreport_ARG,
- foreign_ARG, ignorelockingfailure_ARG, ignoreskippedcluster_ARG,
- logonly_ARG, maps_ARG, noheadings_ARG, nosuffix_ARG, options_ARG,
- readonly_ARG, reportformat_ARG, select_ARG, separator_ARG, shared_ARG,
- short_ARG, sort_ARG, unbuffered_ARG, units_ARG)
+ CACHE_VGMETADATA | PERMITTED_READ_ONLY | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH)
/* ALL_VGS_IS_DEFAULT is for polldaemon to find pvmoves in-progress using process_each_vg. */
xx(pvmove,
"Move extents from one physical volume to another",
- ALL_VGS_IS_DEFAULT | DISALLOW_TAG_ARGS,
- "pvmove\n"
- "\t[--abort]\n"
- "\t[--alloc AllocationPolicy]\n"
- "\t[--atomic]\n"
- "\t[-A|--autobackup {y|n}]\n"
- "\t[-b|--background]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n "
- "\t[-h|-?|--help]\n"
- "\t[-i|--interval seconds]\n"
- "\t[--noudevsync]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-t|--test]\n "
- "\t[-v|--verbose]\n "
- "\t[--version]\n"
- "\t[{-n|--name} LogicalVolume]\n"
-/* "\t[{-n|--name} LogicalVolume[:LogicalExtent[-LogicalExtent]...]]\n" */
- "\tSourcePhysicalVolume[:PhysicalExtent[-PhysicalExtent]...]}\n"
- "\t[DestinationPhysicalVolume[:PhysicalExtent[-PhysicalExtent]...]...]\n",
-
- abort_ARG, alloc_ARG, atomic_ARG, autobackup_ARG, background_ARG,
- interval_ARG, name_ARG, noudevsync_ARG, reportformat_ARG, test_ARG)
+ ALL_VGS_IS_DEFAULT | DISALLOW_TAG_ARGS)
xx(lvpoll,
"Continue already initiated poll operation on a logical volume",
- 0,
- "\t[--abort]\n"
- "\t[-A|--autobackup {y|n}]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n "
- "\t[-h|-?|--help]\n"
- "\t[--handlemissingpvs]\n"
- "\t[-i|--interval seconds]\n"
- "\t[--polloperation]\n"
- "\t[-t|--test]\n "
- "\t[-v|--verbose]\n "
- "\t[--version]\n",
-
- abort_ARG, autobackup_ARG, handlemissingpvs_ARG, interval_ARG, polloperation_ARG,
- test_ARG)
+ 0)
xx(pvremove,
"Remove LVM label(s) from physical volume(s)",
- ENABLE_ALL_DEVS,
- "pvremove\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f[f]|--force [--force]]\n"
- "\t[-h|-?|--help]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[-y|--yes]\n"
- "\tPhysicalVolume [PhysicalVolume...]\n",
-
- force_ARG, reportformat_ARG, test_ARG)
+ ENABLE_ALL_DEVS)
xx(pvs,
"Display information about physical volumes",
- CACHE_VGMETADATA | PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH,
- "pvs\n"
- "\t[-a|--all]\n"
- "\t[--aligned]\n"
- "\t[--binary]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[--configreport ReportName]\n"
- "\t[-d|--debug]\n"
- "\t[--foreign]\n"
- "\t[-h|-?|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[--logonly]\n"
- "\t[--nameprefixes]\n"
- "\t[--noheadings]\n"
- "\t[--nosuffix]\n"
- "\t[-o|--options [+|-|#]Field[,Field]]\n"
- "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
- "\t[-P|--partial]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[--rows]\n"
- "\t[--segments]\n"
- "\t[-S|--select Selection]\n"
- "\t[--separator Separator]\n"
- "\t[--trustcache]\n"
- "\t[--unbuffered]\n"
- "\t[--units hHbBsSkKmMgGtTpPeE]\n"
- "\t[--unquoted]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[PhysicalVolume [PhysicalVolume...]]\n",
-
- aligned_ARG, all_ARG, binary_ARG, configreport_ARG, foreign_ARG,
- ignorelockingfailure_ARG, ignoreskippedcluster_ARG, logonly_ARG,
- nameprefixes_ARG, noheadings_ARG, nolocking_ARG, nosuffix_ARG,
- options_ARG, partial_ARG, readonly_ARG, reportformat_ARG, rows_ARG,
- segments_ARG, select_ARG, separator_ARG, shared_ARG, sort_ARG,
- trustcache_ARG, unbuffered_ARG, units_ARG, unquoted_ARG)
+ CACHE_VGMETADATA | PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | ENABLE_ALL_DEVS | ENABLE_DUPLICATE_DEVS | LOCKD_VG_SH)
xx(pvscan,
"List all physical volumes",
- PERMITTED_READ_ONLY | LOCKD_VG_SH | NO_LVMETAD_AUTOSCAN,
- "pvscan\n"
- "\t[-b|--background]\n"
- "\t[--cache [-a|--activate ay] [ DevicePath | -j|--major major --minor minor]...]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t{-e|--exported | -n|--novolumegroup}\n"
- "\t[-h|-?|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[-P|--partial]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-s|--short]\n"
- "\t[-u|--uuid]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n",
-
- activate_ARG, available_ARG, backgroundfork_ARG, cache_long_ARG,
- exported_ARG, ignorelockingfailure_ARG, major_ARG, minor_ARG,
- novolumegroup_ARG, partial_ARG, readonly_ARG, reportformat_ARG,
- short_ARG, uuid_ARG)
+ PERMITTED_READ_ONLY | LOCKD_VG_SH | NO_LVMETAD_AUTOSCAN)
xx(segtypes,
"List available segment types",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "segtypes\n")
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
xx(systemid,
"Display the system ID, if any, currently set on this host",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "systemid\n")
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
xx(tags,
"List tags defined on this host",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "tags\n")
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
xx(vgcfgbackup,
"Backup volume group configuration(s)",
- PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH,
- "vgcfgbackup\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--file filename]\n"
- "\t[--foreign]\n"
- "\t[-h|-?|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[-P|--partial]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[VolumeGroupName...]\n",
-
- file_ARG, foreign_ARG, ignorelockingfailure_ARG, partial_ARG, readonly_ARG,
- reportformat_ARG)
+ PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH)
xx(vgcfgrestore,
"Restore volume group configuration",
- 0,
- "vgcfgrestore\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--file filename]\n"
- "\t[--force]\n"
- "\t[-l[l]|--list [--list]]\n"
- "\t[-M|--metadatatype 1|2]\n"
- "\t[-h|--help]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tVolumeGroupName",
-
- file_ARG, force_long_ARG, list_ARG, metadatatype_ARG, test_ARG)
+ 0)
xx(vgchange,
"Change volume group attributes",
- CACHE_VGMETADATA | PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT,
- "vgchange\n"
- "\t[-A|--autobackup {y|n}]\n"
- "\t[--alloc AllocationPolicy]\n"
- "\t[-P|--partial]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[--detachprofile]\n"
- "\t[-h|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoremonitoring]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[-K|--ignoreactivationskip]\n"
- "\t[--metadataprofile ProfileName]\n"
- "\t[--monitor {y|n}]\n"
- "\t[--[vg]metadatacopies #copies]\n"
- "\t[--poll {y|n}]\n"
- "\t[--noudevsync]\n"
- "\t[--refresh]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[--sysinit]\n"
- "\t[--systemid SystemID]\n"
- "\t[-t|--test]\n"
- "\t[-u|--uuid]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t{-a|--activate [a|e|l]{y|n} |\n"
- "\t[--activationmode {complete|degraded|partial}]\n"
- "\t -c|--clustered {y|n} |\n"
- "\t -x|--resizeable {y|n} |\n"
- "\t -l|--logicalvolume MaxLogicalVolumes |\n"
- "\t -p|--maxphysicalvolumes MaxPhysicalVolumes |\n"
- "\t -s|--physicalextentsize PhysicalExtentSize[bBsSkKmMgGtTpPeE] |\n"
- "\t --addtag Tag |\n"
- "\t --deltag Tag}\n"
- "\t[VolumeGroupName...]\n",
-
- activationmode_ARG, addtag_ARG, alloc_ARG, allocation_ARG, autobackup_ARG,
- activate_ARG, available_ARG, clustered_ARG, deltag_ARG, detachprofile_ARG,
- ignoreactivationskip_ARG, ignorelockingfailure_ARG, ignoremonitoring_ARG,
- ignoreskippedcluster_ARG, logicalvolume_ARG, maxphysicalvolumes_ARG,
- metadataprofile_ARG, monitor_ARG, noudevsync_ARG, metadatacopies_ARG,
- vgmetadatacopies_ARG, partial_ARG, physicalextentsize_ARG, poll_ARG,
- refresh_ARG, reportformat_ARG, resizeable_ARG, resizable_ARG, select_ARG,
- sysinit_ARG, systemid_ARG, test_ARG, uuid_ARG, lockstart_ARG, lockstop_ARG,
- locktype_ARG, lockopt_ARG, force_ARG)
+ CACHE_VGMETADATA | PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT)
xx(vgck,
"Check the consistency of volume group(s)",
- ALL_VGS_IS_DEFAULT | LOCKD_VG_SH,
- "vgck "
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[VolumeGroupName...]\n",
-
- reportformat_ARG)
+ ALL_VGS_IS_DEFAULT | LOCKD_VG_SH)
xx(vgconvert,
"Change volume group metadata format",
- 0,
- "vgconvert\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[--labelsector sector]\n"
- "\t[-M|--metadatatype 1|2]\n"
- "\t[--pvmetadatacopies #copies]\n"
- "\t[--metadatasize MetadataSize[bBsSkKmMgGtTpPeE]]\n"
- "\t[--bootloaderareasize BootLoaderAreaSize[bBsSkKmMgGtTpPeE]]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tVolumeGroupName [VolumeGroupName...]\n",
-
- force_ARG, test_ARG, labelsector_ARG, bootloaderareasize_ARG,
- metadatatype_ARG, metadatacopies_ARG, pvmetadatacopies_ARG,
- metadatasize_ARG, reportformat_ARG)
+ 0)
xx(vgcreate,
"Create a volume group",
- MUST_USE_ALL_ARGS | ENABLE_ALL_DEVS,
- "vgcreate\n"
- "\t[-A|--autobackup {y|n}]\n"
- "\t[--addtag Tag]\n"
- "\t[--alloc AllocationPolicy]\n"
- "\t[-c|--clustered {y|n}]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[-l|--maxlogicalvolumes MaxLogicalVolumes]\n"
- "\t[--metadataprofile ProfileName]\n"
- "\t[-M|--metadatatype 1|2]\n"
- "\t[--[vg]metadatacopies #copies]\n"
- "\t[-p|--maxphysicalvolumes MaxPhysicalVolumes]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-s|--physicalextentsize PhysicalExtentSize[bBsSkKmMgGtTpPeE]]\n"
- "\t[--systemid SystemID]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[-y|--yes]\n"
- "\t[ PHYSICAL DEVICE OPTIONS ]\n"
- "\tVolumeGroupName PhysicalDevicePath [PhysicalDevicePath...]\n",
-
- addtag_ARG, alloc_ARG, autobackup_ARG, clustered_ARG, maxlogicalvolumes_ARG,
- maxphysicalvolumes_ARG, metadataprofile_ARG, metadatatype_ARG,
- physicalextentsize_ARG, test_ARG, force_ARG, zero_ARG, labelsector_ARG,
- metadatasize_ARG, pvmetadatacopies_ARG, reportformat_ARG, metadatacopies_ARG,
- vgmetadatacopies_ARG, dataalignment_ARG, dataalignmentoffset_ARG,
- shared_ARG, systemid_ARG, locktype_ARG, lockopt_ARG)
+ MUST_USE_ALL_ARGS | ENABLE_ALL_DEVS)
xx(vgdisplay,
"Display volume group information",
- PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH,
- "vgdisplay\n"
- "\t[-A|--activevolumegroups]\n"
- "\t[-c|--colon | -s|--short | -v|--verbose]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[--foreign]\n"
- "\t[-h|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[--nosuffix]\n"
- "\t[-P|--partial]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[--units hHbBsSkKmMgGtTpPeE]\n"
- "\t[--version]\n"
- "\t[VolumeGroupName [VolumeGroupName...]]\n"
- "\n"
- "vgdisplay --columns|-C\n"
- "\t[--aligned]\n"
- "\t[--binary]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[--configreport ReportName]\n"
- "\t[-d|--debug]\n"
- "\t[--foreign]\n"
- "\t[-h|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[--logonly]\n"
- "\t[--noheadings]\n"
- "\t[--nosuffix]\n"
- "\t[-o|--options [+|-|#]Field[,Field]]\n"
- "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
- "\t[-P|--partial]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[--readonly]\n"
- "\t[--separator Separator]\n"
- "\t[--unbuffered]\n"
- "\t[--units hHbBsSkKmMgGtTpPeE]\n"
- "\t[--verbose]\n"
- "\t[--version]\n"
- "\t[VolumeGroupName [VolumeGroupName...]]\n",
-
- activevolumegroups_ARG, aligned_ARG, binary_ARG, colon_ARG, columns_ARG,
- configreport_ARG, foreign_ARG, ignorelockingfailure_ARG,
- ignoreskippedcluster_ARG, logonly_ARG, noheadings_ARG, nosuffix_ARG,
- options_ARG, partial_ARG, readonly_ARG, reportformat_ARG, select_ARG,
- shared_ARG, short_ARG, separator_ARG, sort_ARG, unbuffered_ARG, units_ARG)
+ PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH)
xx(vgexport,
"Unregister volume group(s) from the system",
- ALL_VGS_IS_DEFAULT,
- "vgexport\n"
- "\t[-a|--all]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tVolumeGroupName [VolumeGroupName...]\n",
-
- all_ARG, reportformat_ARG, select_ARG, test_ARG)
+ ALL_VGS_IS_DEFAULT)
xx(vgextend,
"Add physical volumes to a volume group",
- MUST_USE_ALL_ARGS | ENABLE_ALL_DEVS,
- "vgextend\n"
- "\t[-A|--autobackup y|n]\n"
- "\t[--restoremissing]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--force]\n"
- "\t[-h|--help]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[-y|--yes]\n"
- "\t[ PHYSICAL DEVICE OPTIONS ]\n"
- "\tVolumeGroupName PhysicalDevicePath [PhysicalDevicePath...]\n",
-
- autobackup_ARG, test_ARG,
- force_ARG, zero_ARG, labelsector_ARG, metadatatype_ARG,
- metadatasize_ARG, pvmetadatacopies_ARG, metadatacopies_ARG,
- metadataignore_ARG, dataalignment_ARG, dataalignmentoffset_ARG,
- reportformat_ARG, restoremissing_ARG)
+ MUST_USE_ALL_ARGS | ENABLE_ALL_DEVS)
xx(vgimport,
"Register exported volume group with system",
- ALL_VGS_IS_DEFAULT | NO_LVMETAD_AUTOSCAN,
- "vgimport\n"
- "\t[-a|--all]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--force]\n"
- "\t[-h|--help]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tVolumeGroupName...\n",
-
- all_ARG, force_ARG, reportformat_ARG, select_ARG, test_ARG)
+ ALL_VGS_IS_DEFAULT | NO_LVMETAD_AUTOSCAN)
xx(vgimportclone,
"Import a VG from cloned PVs",
- NO_LVMETAD_AUTOSCAN,
- "vgimportclone\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[-i|--import]\n"
- "\t[-n|--basevgname]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[PhysicalVolumePath...]\n",
-
- basevgname_ARG, test_ARG, import_ARG)
+ NO_LVMETAD_AUTOSCAN)
xx(vgmerge,
"Merge volume groups",
- 0,
- "vgmerge\n"
- "\t[-A|--autobackup y|n]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[-l|--list]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tDestinationVolumeGroupName SourceVolumeGroupName\n",
-
- autobackup_ARG, list_ARG, test_ARG)
+ 0)
xx(vgmknodes,
"Create the special files for volume group devices in /dev",
- ALL_VGS_IS_DEFAULT,
- "vgmknodes\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--refresh]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[VolumeGroupName...]\n",
-
- ignorelockingfailure_ARG, refresh_ARG, reportformat_ARG)
+ ALL_VGS_IS_DEFAULT)
xx(vgreduce,
"Remove physical volume(s) from a volume group",
- 0,
- "vgreduce\n"
- "\t[-a|--all]\n"
- "\t[-A|--autobackup y|n]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[--mirrorsonly]\n"
- "\t[--removemissing]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-f|--force]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tVolumeGroupName\n"
- "\t[PhysicalVolumePath...]\n",
-
- all_ARG, autobackup_ARG, force_ARG, mirrorsonly_ARG, removemissing_ARG,
- reportformat_ARG, test_ARG)
+ 0)
xx(vgremove,
"Remove volume group(s)",
- ALL_VGS_IS_DEFAULT, /* all VGs only with select */
- "vgremove\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-f|--force]\n"
- "\t[-h|--help]\n"
- "\t[--noudevsync]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-S|--select Selection]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tVolumeGroupName [VolumeGroupName...]\n",
-
- force_ARG, noudevsync_ARG, reportformat_ARG, select_ARG, test_ARG)
+ ALL_VGS_IS_DEFAULT) /* all VGs only with select */
xx(vgrename,
"Rename a volume group",
- ALLOW_UUID_AS_NAME | REQUIRES_FULL_LABEL_SCAN,
- "vgrename\n"
- "\t[-A|--autobackup y|n]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tOldVolumeGroupPath NewVolumeGroupPath |\n"
- "\tOldVolumeGroupName NewVolumeGroupName\n",
-
- autobackup_ARG, force_ARG, reportformat_ARG, test_ARG)
+ ALLOW_UUID_AS_NAME | REQUIRES_FULL_LABEL_SCAN)
xx(vgs,
"Display information about volume groups",
- PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH,
- "vgs\n"
- "\t[--aligned]\n"
- "\t[--binary]\n"
- "\t[-a|--all]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[--configreport ReportName]\n"
- "\t[-d|--debug]\n"
- "\t[--foreign]\n"
- "\t[-h|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--ignoreskippedcluster]\n"
- "\t[--logonly]\n"
- "\t[--nameprefixes]\n"
- "\t[--noheadings]\n"
- "\t[--nosuffix]\n"
- "\t[-o|--options [+|-|#]Field[,Field]]\n"
- "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n"
- "\t[-P|--partial]\n"
- "\t[--readonly]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[--rows]\n"
- "\t[-S|--select Selection]\n"
- "\t[--separator Separator]\n"
- "\t[--trustcache]\n"
- "\t[--unbuffered]\n"
- "\t[--units hHbBsSkKmMgGtTpPeE]\n"
- "\t[--unquoted]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\t[VolumeGroupName [VolumeGroupName...]]\n",
-
- aligned_ARG, all_ARG, binary_ARG, configreport_ARG, foreign_ARG,
- ignorelockingfailure_ARG, ignoreskippedcluster_ARG, logonly_ARG,
- nameprefixes_ARG, noheadings_ARG, nolocking_ARG, nosuffix_ARG,
- options_ARG, partial_ARG, readonly_ARG, reportformat_ARG, rows_ARG,
- select_ARG, separator_ARG, shared_ARG, sort_ARG, trustcache_ARG,
- unbuffered_ARG, units_ARG, unquoted_ARG)
+ PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH)
xx(vgscan,
"Search for all volume groups",
- PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | NO_LVMETAD_AUTOSCAN,
- "vgscan "
- "\t[--cache]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[--ignorelockingfailure]\n"
- "\t[--mknodes]\n"
- "\t[--notifydbus]\n"
- "\t[-P|--partial]\n"
- "\t[--reportformat {basic|json}]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n",
-
- cache_long_ARG, ignorelockingfailure_ARG, mknodes_ARG, notifydbus_ARG,
- partial_ARG, reportformat_ARG)
+ PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | LOCKD_VG_SH | NO_LVMETAD_AUTOSCAN)
xx(vgsplit,
"Move physical volumes into a new or existing volume group",
- 0,
- "vgsplit\n"
- "\t[-A|--autobackup {y|n}]\n"
- "\t[--alloc AllocationPolicy]\n"
- "\t[-c|--clustered {y|n}]\n"
- "\t[--commandprofile ProfileName]\n"
- "\t[-d|--debug]\n"
- "\t[-h|--help]\n"
- "\t[-l|--maxlogicalvolumes MaxLogicalVolumes]\n"
- "\t[-M|--metadatatype 1|2]\n"
- "\t[--[vg]metadatacopies #copies]\n"
- "\t[-n|--name LogicalVolumeName]\n"
- "\t[-p|--maxphysicalvolumes MaxPhysicalVolumes]\n"
- "\t[-t|--test]\n"
- "\t[-v|--verbose]\n"
- "\t[--version]\n"
- "\tSourceVolumeGroupName DestinationVolumeGroupName\n"
- "\t[PhysicalVolumePath...]\n",
-
- alloc_ARG, autobackup_ARG, clustered_ARG,
- maxlogicalvolumes_ARG, maxphysicalvolumes_ARG,
- metadatatype_ARG, vgmetadatacopies_ARG, name_ARG, test_ARG)
+ 0)
xx(version,
"Display software and driver version information",
- PERMITTED_READ_ONLY | NO_METADATA_PROCESSING,
- "version\n")
+ PERMITTED_READ_ONLY | NO_METADATA_PROCESSING)
diff --git a/tools/create-commands.c b/tools/create-commands.c
new file mode 100644
index 0000000..704ec47
--- /dev/null
+++ b/tools/create-commands.c
@@ -0,0 +1,2990 @@
+#include <asm/types.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <limits.h>
+#include <unistd.h>
+#include <syslog.h>
+#include <sched.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <getopt.h>
+
+/* needed to include args.h */
+#define ARG_COUNTABLE 0x00000001
+#define ARG_GROUPABLE 0x00000002
+struct cmd_context;
+struct arg_values;
+
+int yes_no_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int activation_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int cachemode_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int discards_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int mirrorlog_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int size_kb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int size_mb_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int size_mb_arg_with_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int int_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int int_arg_with_sign(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int int_arg_with_sign_and_percent(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int major_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int minor_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int string_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int tag_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int permission_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int metadatatype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int units_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int segtype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int alloc_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int locktype_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int readahead_arg(struct cmd_context *cmd, struct arg_values *av) { return 0; }
+int vgmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+int pvmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+int metadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+int polloperation_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+int writemostly_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+int syncaction_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+int reportformat_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+int configreport_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+int configtype_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) { return 0; }
+
+/* also see arg_props in tools.h and args.h */
+struct opt_name {
+ const char *name; /* "foo_ARG" */
+ int opt_enum; /* foo_ARG */
+ const char short_opt; /* -f */
+ char _padding[7];
+ const char *long_opt; /* --foo */
+ int val_enum; /* xyz_VAL when --foo takes a val like "--foo xyz" */
+ uint32_t unused1;
+ uint32_t unused2;
+};
+
+/* also see val_props in tools.h and vals.h */
+struct val_name {
+ const char *enum_name; /* "foo_VAL" */
+ int val_enum; /* foo_VAL */
+ int (*fn) (struct cmd_context *cmd, struct arg_values *av); /* foo_arg() */
+ const char *name; /* FooVal */
+ const char *usage;
+};
+
+/* also see lv_props in tools.h and lv_props.h */
+struct lvp_name {
+ const char *enum_name; /* "is_foo_LVP" */
+ int lvp_enum; /* is_foo_LVP */
+ const char *name; /* "lv_is_foo" */
+};
+
+/* also see lv_types in tools.h and lv_types.h */
+struct lvt_name {
+ const char *enum_name; /* "foo_LVT" */
+ int lvt_enum; /* foo_LVT */
+ const char *name; /* "foo" */
+};
+
+/* create foo_VAL enums for option and position values */
+
+enum {
+#define val(a, b, c, d) a ,
+#include "vals.h"
+#undef val
+};
+
+/* create foo_ARG enums for --option's */
+
+enum {
+#define arg(a, b, c, d, e, f) a ,
+#include "args.h"
+#undef arg
+};
+
+/* create foo_LVP enums for LV properties */
+
+enum {
+#define lvp(a, b, c) a,
+#include "lv_props.h"
+#undef lvp
+};
+
+/* create foo_LVT enums for LV types */
+
+enum {
+#define lvt(a, b, c) a,
+#include "lv_types.h"
+#undef lvt
+};
+
+/* create table of value names, e.g. String, and corresponding enum from vals.h */
+
+static struct val_name val_names[VAL_COUNT + 1] = {
+#define val(a, b, c, d) { # a, a, b, c, d },
+#include "vals.h"
+#undef val
+};
+
+/* create table of option names, e.g. --foo, and corresponding enum from args.h */
+
+static struct opt_name opt_names[ARG_COUNT + 1] = {
+#define arg(a, b, c, d, e, f) { # a, a, b, "", "--" c, d, e, f },
+#include "args.h"
+#undef arg
+};
+
+/* create table of lv property names, e.g. lv_is_foo, and corresponding enum from lv_props.h */
+
+static struct lvp_name lvp_names[LVP_COUNT + 1] = {
+#define lvp(a, b, c) { # a, a, b },
+#include "lv_props.h"
+#undef lvp
+};
+
+/* create table of lv type names, e.g. linear and corresponding enum from lv_types.h */
+
+static struct lvt_name lvt_names[LVT_COUNT + 1] = {
+#define lvt(a, b, c) { # a, a, b },
+#include "lv_types.h"
+#undef lvt
+};
+
+#include "command.h"
+
+#define MAX_CMD_NAMES 128
+struct cmd_name {
+ const char *name;
+ const char *desc;
+ int common_options[ARG_COUNT + 1];
+ int all_options[ARG_COUNT + 1];
+ int variants;
+ int variant_has_ro;
+ int variant_has_rp;
+ int variant_has_oo;
+ int variant_has_op;
+};
+
+/* create table of command names, e.g. vgcreate */
+
+static struct cmd_name cmd_names[MAX_CMD_NAMES] = {
+#define xx(a, b, c) { # a , b } ,
+#include "commands.h"
+#undef xx
+};
+
+#define MAX_LINE 1024
+#define MAX_LINE_ARGC 256
+
+#define REQUIRED 1 /* required option */
+#define OPTIONAL 0 /* optional option */
+#define IGNORE -1 /* ignore option */
+
+struct oo_line {
+ char *name;
+ char *line;
+};
+
+#define MAX_CMDS 256
+int cmd_count;
+struct command cmd_array[MAX_CMDS];
+
+struct command lvm_all; /* for printing common options for all lvm commands */
+
+#define MAX_OO_LINES 256
+int oo_line_count;
+struct oo_line oo_lines[MAX_OO_LINES];
+
+static int include_man_secondary = 1;
+static int include_man_primary = 1;
+static char *man_command_name = NULL;
+
+static void add_optional_opt_line(struct command *cmd, int argc, char *argv[]);
+
+/*
+ * modifies buf, replacing the sep characters with \0
+ * argv pointers point to positions in buf
+ */
+
+static char *split_line(char *buf, int *argc, char **argv, char sep)
+{
+ char *p = buf, *rp = NULL;
+ int i;
+
+ argv[0] = p;
+
+ for (i = 1; i < MAX_LINE_ARGC; i++) {
+ p = strchr(buf, sep);
+ if (!p)
+ break;
+ *p = '\0';
+
+ argv[i] = p + 1;
+ buf = p + 1;
+ }
+ *argc = i;
+
+ /* we ended by hitting \0, return the point following that */
+ if (!rp)
+ rp = strchr(buf, '\0') + 1;
+
+ return rp;
+}
+
+/* convert value string, e.g. Number, to foo_VAL enum */
+
+static int val_str_to_num(char *str)
+{
+ char name[32] = { 0 };
+ char *new;
+ int i;
+
+ /* compare the name before any suffix like _new or _<lvtype> */
+
+ strncpy(name, str, 31);
+ if ((new = strstr(name, "_")))
+ *new = '\0';
+
+ for (i = 0; i < VAL_COUNT; i++) {
+ if (!val_names[i].name)
+ break;
+ if (!strncmp(name, val_names[i].name, strlen(val_names[i].name)))
+ return val_names[i].val_enum;
+ }
+
+ return 0;
+}
+
+/* convert "--option" to foo_ARG enum */
+
+static int opt_str_to_num(char *str)
+{
+ char long_name[32];
+ char *p;
+ int i;
+
+ /*
+ * --foo_long means there are two args entries
+ * for --foo, one with a short option and one
+ * without, and we want the one without the
+ * short option.
+ */
+ if (strstr(str, "_long")) {
+ strcpy(long_name, str);
+ p = strstr(long_name, "_long");
+ *p = '\0';
+
+ for (i = 0; i < ARG_COUNT; i++) {
+ if (!opt_names[i].long_opt)
+ continue;
+ /* skip anything with a short opt */
+ if (opt_names[i].short_opt)
+ continue;
+ if (!strcmp(opt_names[i].long_opt, long_name))
+ return opt_names[i].opt_enum;
+ }
+
+ printf("Unknown opt str: %s %s\n", str, long_name);
+ exit(1);
+ }
+
+ for (i = 0; i < ARG_COUNT; i++) {
+ if (!opt_names[i].long_opt)
+ continue;
+ /* These are only selected using --foo_long */
+ if (strstr(opt_names[i].name, "_long_ARG"))
+ continue;
+ if (!strcmp(opt_names[i].long_opt, str))
+ return opt_names[i].opt_enum;
+ }
+
+ printf("Unknown opt str: \"%s\"\n", str);
+ exit(1);
+}
+
+static char *val_bits_to_str(uint64_t val_bits)
+{
+ static char buf[1024];
+ int i;
+ int or = 0;
+
+ memset(buf, 0, sizeof(buf));
+
+ for (i = 0; i < VAL_COUNT; i++) {
+ if (val_bits & val_enum_to_bit(i)) {
+ if (or) strcat(buf, " | ");
+ strcat(buf, "val_enum_to_bit(");
+ strcat(buf, val_names[i].enum_name);
+ strcat(buf, ")");
+ or = 1;
+ }
+ }
+
+ return buf;
+}
+
+/*
+ * When bits for foo_LVP and bar_LVP are both set in bits, print:
+ * lvp_enum_to_bit(foo_LVP) | lvp_enum_to_bit(bar_LVP)
+ */
+
+static char *lvp_bits_to_str(uint64_t bits)
+{
+ static char lvp_buf[1024];
+ int i;
+ int or = 0;
+
+ memset(lvp_buf, 0, sizeof(lvp_buf));
+
+ for (i = 0; i < LVP_COUNT; i++) {
+ if (bits & lvp_enum_to_bit(i)) {
+ if (or) strcat(lvp_buf, " | ");
+ strcat(lvp_buf, "lvp_enum_to_bit(");
+ strcat(lvp_buf, lvp_names[i].enum_name);
+ strcat(lvp_buf, ")");
+ or = 1;
+ }
+ }
+
+ return lvp_buf;
+}
+
+/*
+ * When bits for foo_LVT and bar_LVT are both set in bits, print:
+ * lvt_enum_to_bit(foo_LVT) | lvt_enum_to_bit(bar_LVT)
+ */
+
+static char *lvt_bits_to_str(uint64_t bits)
+{
+ static char lvt_buf[1024];
+ int i;
+ int or = 0;
+
+ memset(lvt_buf, 0, sizeof(lvt_buf));
+
+ for (i = 1; i < LVT_COUNT; i++) {
+ if (bits & lvt_enum_to_bit(i)) {
+ if (or) strcat(lvt_buf, " | ");
+ strcat(lvt_buf, "lvt_enum_to_bit(");
+ strcat(lvt_buf, lvt_names[i].enum_name);
+ strcat(lvt_buf, ")");
+ or = 1;
+ }
+ }
+
+ return lvt_buf;
+}
+
+/* "lv_is_prop" to is_prop_LVP */
+
+static int lvp_name_to_enum(char *str)
+{
+ int i;
+
+ for (i = 1; i < LVP_COUNT; i++) {
+ if (!strcmp(str, lvp_names[i].name))
+ return lvp_names[i].lvp_enum;
+ }
+ printf("unknown lv property %s\n", str);
+ exit(1);
+}
+
+/* type_LVT to "type" */
+
+static const char *lvt_enum_to_name(int lvt_enum)
+{
+ return lvt_names[lvt_enum].name;
+}
+
+/* "type" to type_LVT */
+
+static int lvt_name_to_enum(char *str)
+{
+ int i;
+
+ for (i = 1; i < LVT_COUNT; i++) {
+ if (!strcmp(str, lvt_names[i].name))
+ return lvt_names[i].lvt_enum;
+ }
+ printf("unknown lv type %s\n", str);
+ exit(1);
+}
+
+/* LV_<type> to <type>_LVT */
+
+int lv_to_enum(char *name)
+{
+ return lvt_name_to_enum(name + 3);
+}
+
+/*
+ * LV_<type1>_<type2> to lvt_bits
+ *
+ * type1 to lvt_enum
+ * lvt_bits |= lvt_enum_to_bit(lvt_enum)
+ * type2 to lvt_enum
+ * lvt_bits |= lvt_enum_to_bit(lvt_enum)
+ */
+
+uint64_t lv_to_bits(char *name)
+{
+ char buf[64];
+ char *argv[MAX_LINE_ARGC];
+ uint64_t lvt_bits = 0;
+ int lvt_enum;
+ int argc;
+ int i;
+
+ strcpy(buf, name);
+
+ split_line(buf, &argc, argv, '_');
+
+ /* 0 is "LV" */
+ for (i = 1; i < argc; i++) {
+ if (!strcmp(argv[i], "new"))
+ continue;
+ lvt_enum = lvt_name_to_enum(argv[i]);
+ lvt_bits |= lvt_enum_to_bit(lvt_enum);
+ }
+
+ return lvt_bits;
+}
+
+static const char *is_command_name(char *str)
+{
+ int i;
+
+ for (i = 0; i < MAX_CMD_NAMES; i++) {
+ if (!cmd_names[i].name)
+ break;
+ if (!strcmp(cmd_names[i].name, str))
+ return cmd_names[i].name;
+ }
+ return NULL;
+}
+
+static const char *cmd_name_desc(const char *name)
+{
+ int i;
+
+ for (i = 0; i < MAX_CMD_NAMES; i++) {
+ if (!cmd_names[i].name)
+ break;
+ if (!strcmp(cmd_names[i].name, name))
+ return cmd_names[i].desc;
+ }
+ return NULL;
+}
+
+static struct cmd_name *find_command_name(const char *str)
+{
+ int i;
+
+ for (i = 0; i < MAX_CMD_NAMES; i++) {
+ if (!cmd_names[i].name)
+ break;
+ if (!strcmp(cmd_names[i].name, str))
+ return &cmd_names[i];
+ }
+ return NULL;
+}
+
+static int is_opt_name(char *str)
+{
+ if (!strncmp(str, "--", 2))
+ return 1;
+
+ if ((str[0] == '-') && (str[1] != '-')) {
+ printf("Options must be specified in long form: %s\n", str);
+ exit(1);
+ }
+
+ return 0;
+}
+
+/*
+ * "Select" as a pos name means that the position
+ * can be empty if the --select option is used.
+ */
+
+static int is_pos_name(char *str)
+{
+ if (!strncmp(str, "VG", 2))
+ return 1;
+ if (!strncmp(str, "LV", 2))
+ return 1;
+ if (!strncmp(str, "PV", 2))
+ return 1;
+ if (!strncmp(str, "Tag", 3))
+ return 1;
+ if (!strncmp(str, "String", 6))
+ return 1;
+ if (!strncmp(str, "Select", 6))
+ return 1;
+ return 0;
+}
+
+static int is_oo_definition(char *str)
+{
+ if (!strncmp(str, "OO_", 3) && strstr(str, ":"))
+ return 1;
+ return 0;
+}
+
+static int is_oo_line(char *str)
+{
+ if (!strncmp(str, "OO:", 3))
+ return 1;
+ return 0;
+}
+
+static int is_io_line(char *str)
+{
+ if (!strncmp(str, "IO:", 3))
+ return 1;
+ return 0;
+}
+
+static int is_op_line(char *str)
+{
+ if (!strncmp(str, "OP:", 3))
+ return 1;
+ return 0;
+}
+
+static int is_desc_line(char *str)
+{
+ if (!strncmp(str, "DESC:", 5))
+ return 1;
+ return 0;
+}
+
+static int is_flags_line(char *str)
+{
+ if (!strncmp(str, "FLAGS:", 6))
+ return 1;
+ return 0;
+}
+
+static int is_rule_line(char *str)
+{
+ if (!strncmp(str, "RULE:", 5))
+ return 1;
+ return 0;
+}
+
+static int is_id_line(char *str)
+{
+ if (!strncmp(str, "ID:", 3))
+ return 1;
+ return 0;
+}
+
+/*
+ * parse str for anything that can appear in a position,
+ * like VG, VG|LV, VG|LV_linear|LV_striped, etc
+ */
+
+static void set_pos_def(struct command *cmd, char *str, struct arg_def *def)
+{
+ char *argv[MAX_LINE_ARGC];
+ int argc;
+ char *name;
+ int val_enum;
+ int i;
+
+ split_line(str, &argc, argv, '|');
+
+ for (i = 0; i < argc; i++) {
+ name = argv[i];
+
+ val_enum = val_str_to_num(name);
+
+ if (!val_enum) {
+ printf("Unknown pos arg: %s\n", name);
+ exit(1);
+ }
+
+ def->val_bits |= val_enum_to_bit(val_enum);
+
+ if ((val_enum == lv_VAL) && strstr(name, "_"))
+ def->lvt_bits = lv_to_bits(name);
+
+ if (strstr(name, "_new")) {
+ if (val_enum == lv_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_LV;
+ else if (val_enum == vg_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_VG;
+ }
+ }
+}
+
+/*
+ * parse str for anything that can follow --option
+ */
+
+static void set_opt_def(struct command *cmd, char *str, struct arg_def *def)
+{
+ char *argv[MAX_LINE_ARGC];
+ int argc;
+ char *name;
+ int val_enum;
+ int i, j;
+
+ split_line(str, &argc, argv, '|');
+
+ for (i = 0; i < argc; i++) {
+ name = argv[i];
+
+ val_enum = val_str_to_num(name);
+
+ if (!val_enum) {
+ /* a literal number or string */
+
+ if (isdigit(name[0]))
+ val_enum = constnum_VAL;
+
+ else if (isalpha(name[0]))
+ val_enum = conststr_VAL;
+
+ else {
+ printf("Unknown opt arg: %s\n", name);
+ exit(0);
+ }
+ }
+
+
+ def->val_bits |= val_enum_to_bit(val_enum);
+
+ if (val_enum == constnum_VAL)
+ def->num = (uint64_t)atoi(name);
+
+ if (val_enum == conststr_VAL)
+ def->str = strdup(name);
+
+ if (val_enum == lv_VAL) {
+ if (strstr(name, "_"))
+ def->lvt_bits = lv_to_bits(name);
+ }
+
+ if (strstr(name, "_new")) {
+ if (val_enum == lv_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_LV;
+ else if (val_enum == vg_VAL)
+ def->flags |= ARG_DEF_FLAG_NEW_VG;
+
+ }
+ }
+}
+
+
+/*
+ * OO_FOO: --opt1 ...
+ *
+ * oo->name = "OO_FOO";
+ * oo->line = "--opt1 ...";
+ */
+
+static void add_oo_definition_line(const char *name, const char *line)
+{
+ struct oo_line *oo;
+ char *colon;
+ char *start;
+
+ oo = &oo_lines[oo_line_count++];
+ oo->name = strdup(name);
+
+ if ((colon = strstr(oo->name, ":")))
+ *colon = '\0';
+ else {
+ printf("invalid OO definition\n");
+ exit(1);
+ }
+
+ start = strstr(line, ":") + 2;
+ oo->line = strdup(start);
+}
+
+/* when OO_FOO: continues on multiple lines */
+
+static void append_oo_definition_line(const char *new_line)
+{
+ struct oo_line *oo;
+ char *old_line;
+ char *line;
+ int len;
+
+ oo = &oo_lines[oo_line_count-1];
+
+ old_line = oo->line;
+
+ /* +2 = 1 space between old and new + 1 terminating \0 */
+ len = strlen(old_line) + strlen(new_line) + 2;
+ line = malloc(len);
+ memset(line, 0, len);
+
+ strcat(line, old_line);
+ strcat(line, " ");
+ strcat(line, new_line);
+
+ free(oo->line);
+ oo->line = line;
+}
+
+char *get_oo_line(char *str)
+{
+ char *name;
+ char *end;
+ char str2[64];
+ int i;
+
+ strcpy(str2, str);
+ if ((end = strstr(str2, ":")))
+ *end = '\0';
+ if ((end = strstr(str2, ",")))
+ *end = '\0';
+
+ for (i = 0; i < oo_line_count; i++) {
+ name = oo_lines[i].name;
+ if (!strcmp(name, str2))
+ return oo_lines[i].line;
+ }
+ return NULL;
+}
+
+/* add optional_opt_args entries when OO_FOO appears on OO: line */
+
+static void include_optional_opt_args(struct command *cmd, char *str)
+{
+ char *oo_line;
+ char *line;
+ char *line_argv[MAX_LINE_ARGC];
+ int line_argc;
+
+ if (!(oo_line = get_oo_line(str))) {
+ printf("No OO line found for %s\n", str);
+ exit(1);
+ }
+
+ if (!(line = strdup(oo_line)))
+ exit(1);
+
+ split_line(line, &line_argc, line_argv, ' ');
+ add_optional_opt_line(cmd, line_argc, line_argv);
+ free(line);
+}
+
+static void add_opt_arg(struct command *cmd, char *str, int *takes_arg, int required)
+{
+ char *comma;
+ int opt;
+
+ /* opt_arg.opt set here */
+ /* opt_arg.def will be set in update_prev_opt_arg() if needed */
+
+ if ((comma = strstr(str, ",")))
+ *comma = '\0';
+
+ /*
+ * Work around nasty hack where --uuid is used for both uuid_ARG
+ * and uuidstr_ARG. The input uses --uuidstr, where an actual
+ * command uses --uuid string.
+ */
+ if (!strcmp(str, "--uuidstr")) {
+ opt = uuidstr_ARG;
+ goto skip;
+ }
+
+ opt = opt_str_to_num(str);
+skip:
+ if (required > 0)
+ cmd->required_opt_args[cmd->ro_count++].opt = opt;
+ else if (!required)
+ cmd->optional_opt_args[cmd->oo_count++].opt = opt;
+ else if (required < 0)
+ cmd->ignore_opt_args[cmd->io_count++].opt = opt;
+ else
+ exit(1);
+
+ *takes_arg = opt_names[opt].val_enum ? 1 : 0;
+}
+
+static void update_prev_opt_arg(struct command *cmd, char *str, int required)
+{
+ struct arg_def def = { 0 };
+ char *comma;
+
+ if (str[0] == '-') {
+ printf("Option %s must be followed by an arg.\n", str);
+ exit(1);
+ }
+
+ /* opt_arg.def set here */
+ /* opt_arg.opt was previously set in add_opt_arg() when --foo was read */
+
+ if ((comma = strstr(str, ",")))
+ *comma = '\0';
+
+ set_opt_def(cmd, str, &def);
+
+ if (required > 0)
+ cmd->required_opt_args[cmd->ro_count-1].def = def;
+ else if (!required)
+ cmd->optional_opt_args[cmd->oo_count-1].def = def;
+ else if (required < 0)
+ cmd->ignore_opt_args[cmd->io_count-1].def = def;
+ else
+ exit(1);
+}
+
+static void add_pos_arg(struct command *cmd, char *str, int required)
+{
+ struct arg_def def = { 0 };
+
+ /* pos_arg.pos and pos_arg.def are set here */
+
+ set_pos_def(cmd, str, &def);
+
+ if (required) {
+ cmd->required_pos_args[cmd->rp_count].pos = cmd->pos_count++;
+ cmd->required_pos_args[cmd->rp_count].def = def;
+ cmd->rp_count++;
+ } else {
+ cmd->optional_pos_args[cmd->op_count].pos = cmd->pos_count++;;
+ cmd->optional_pos_args[cmd->op_count].def = def;
+ cmd->op_count++;
+ }
+}
+
+/* process something that follows a pos arg, which is not a new pos arg */
+
+static void update_prev_pos_arg(struct command *cmd, char *str, int required)
+{
+ struct arg_def *def;
+
+ /* a previous pos_arg.def is modified here */
+
+ if (required)
+ def = &cmd->required_pos_args[cmd->rp_count-1].def;
+ else
+ def = &cmd->optional_pos_args[cmd->op_count-1].def;
+
+ if (!strcmp(str, "..."))
+ def->flags |= ARG_DEF_FLAG_MAY_REPEAT;
+ else {
+ printf("Unknown pos arg: %s\n", str);
+ exit(1);
+ }
+}
+
+/* process what follows OO:, which are optional opt args */
+
+static void add_optional_opt_line(struct command *cmd, int argc, char *argv[])
+{
+ int takes_arg;
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (!i && !strncmp(argv[i], "OO:", 3))
+ continue;
+ if (is_opt_name(argv[i]))
+ add_opt_arg(cmd, argv[i], &takes_arg, OPTIONAL);
+ else if (!strncmp(argv[i], "OO_", 3))
+ include_optional_opt_args(cmd, argv[i]);
+ else if (takes_arg)
+ update_prev_opt_arg(cmd, argv[i], OPTIONAL);
+ else
+ printf("Can't parse argc %d argv %s prev %s\n",
+ i, argv[i], argv[i-1]);
+ }
+}
+
+static void add_ignore_opt_line(struct command *cmd, int argc, char *argv[])
+{
+ int takes_arg;
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (!i && !strncmp(argv[i], "IO:", 3))
+ continue;
+ if (is_opt_name(argv[i]))
+ add_opt_arg(cmd, argv[i], &takes_arg, IGNORE);
+ else if (takes_arg)
+ update_prev_opt_arg(cmd, argv[i], IGNORE);
+ else
+ printf("Can't parse argc %d argv %s prev %s\n",
+ i, argv[i], argv[i-1]);
+ }
+}
+
+/* process what follows OP:, which are optional pos args */
+
+static void add_optional_pos_line(struct command *cmd, int argc, char *argv[])
+{
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (!i && !strncmp(argv[i], "OP:", 3))
+ continue;
+ if (is_pos_name(argv[i]))
+ add_pos_arg(cmd, argv[i], OPTIONAL);
+ else
+ update_prev_pos_arg(cmd, argv[i], OPTIONAL);
+ }
+}
+
+/* add required opt args from OO_FOO definition */
+
+static void add_required_opt_line(struct command *cmd, int argc, char *argv[])
+{
+ int takes_arg;
+ int i;
+
+ for (i = 0; i < argc; i++) {
+ if (is_opt_name(argv[i]))
+ add_opt_arg(cmd, argv[i], &takes_arg, REQUIRED);
+ else if (takes_arg)
+ update_prev_opt_arg(cmd, argv[i], REQUIRED);
+ else
+ printf("Can't parse argc %d argv %s prev %s\n",
+ i, argv[i], argv[i-1]);
+ }
+}
+
+/* add to required_opt_args when OO_FOO appears on required line */
+
+static void include_required_opt_args(struct command *cmd, char *str)
+{
+ char *oo_line;
+ char *line;
+ char *line_argv[MAX_LINE_ARGC];
+ int line_argc;
+
+ if (!(oo_line = get_oo_line(str))) {
+ printf("No OO line found for %s\n", str);
+ exit(1);
+ }
+
+ if (!(line = strdup(oo_line)))
+ exit(1);
+
+ split_line(line, &line_argc, line_argv, ' ');
+ add_required_opt_line(cmd, line_argc, line_argv);
+ free(line);
+}
+
+/* process what follows command_name, which are required opt/pos args */
+
+static void add_required_line(struct command *cmd, int argc, char *argv[])
+{
+ int i;
+ int takes_arg;
+ int prev_was_opt = 0, prev_was_pos = 0;
+
+ /* argv[0] is command name */
+
+ for (i = 1; i < argc; i++) {
+ if (is_opt_name(argv[i])) {
+ add_opt_arg(cmd, argv[i], &takes_arg, REQUIRED);
+ prev_was_opt = 1;
+ prev_was_pos = 0;
+ } else if (prev_was_opt && takes_arg) {
+ update_prev_opt_arg(cmd, argv[i], REQUIRED);
+ prev_was_opt = 0;
+ prev_was_pos = 0;
+ } else if (is_pos_name(argv[i])) {
+ add_pos_arg(cmd, argv[i], REQUIRED);
+ prev_was_opt = 0;
+ prev_was_pos = 1;
+ } else if (!strncmp(argv[i], "OO_", 3)) {
+ cmd->cmd_flags |= CMD_FLAG_ONE_REQUIRED_OPT;
+ include_required_opt_args(cmd, argv[i]);
+ } else if (prev_was_pos) {
+ update_prev_pos_arg(cmd, argv[i], REQUIRED);
+ } else
+ printf("Can't parse argc %d argv %s prev %s\n",
+ i, argv[i], argv[i-1]);
+
+ }
+}
+
+static void print_def(struct arg_def *def, int usage)
+{
+ int val_enum;
+ int lvt_enum;
+ int sep = 0;
+ int i;
+
+ for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
+ if (def->val_bits & val_enum_to_bit(val_enum)) {
+
+ if (val_enum == conststr_VAL)
+ printf("%s", def->str);
+
+ else if (val_enum == constnum_VAL)
+ printf("%llu", (unsigned long long)def->num);
+
+ else {
+ if (sep) printf("|");
+
+ if (!usage || !val_names[val_enum].usage)
+ printf("%s", val_names[val_enum].name);
+ else
+ printf("%s", val_names[val_enum].usage);
+
+ sep = 1;
+ }
+
+ if (val_enum == lv_VAL && def->lvt_bits) {
+ for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
+ if (lvt_bit_is_set(def->lvt_bits, lvt_enum))
+ printf("_%s", lvt_enum_to_name(lvt_enum));
+ }
+ }
+
+ if ((val_enum == vg_VAL) && (def->flags & ARG_DEF_FLAG_NEW_VG))
+ printf("_new");
+ if ((val_enum == lv_VAL) && (def->flags & ARG_DEF_FLAG_NEW_LV))
+ printf("_new");
+ }
+ }
+
+ if (def->flags & ARG_DEF_FLAG_MAY_REPEAT)
+ printf(" ...");
+}
+
+void print_expanded(void)
+{
+ struct command *cmd;
+ int onereq;
+ int i, ro, rp, oo, op;
+
+ for (i = 0; i < cmd_count; i++) {
+ cmd = &cmd_array[i];
+ printf("%s", cmd->name);
+
+ onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
+
+ if (cmd->ro_count) {
+ if (onereq)
+ printf(" (");
+
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ if (ro && onereq)
+ printf(",");
+ printf(" %s", opt_names[cmd->required_opt_args[ro].opt].long_opt);
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->required_opt_args[ro].def, 0);
+ }
+ }
+ if (onereq)
+ printf(" )");
+ }
+
+ if (cmd->rp_count) {
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->required_pos_args[rp].def, 0);
+ }
+ }
+ }
+
+ if (cmd->oo_count) {
+ printf("\n");
+ printf("OO:");
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (oo)
+ printf(",");
+ printf(" %s", opt_names[cmd->optional_opt_args[oo].opt].long_opt);
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->optional_opt_args[oo].def, 0);
+ }
+ }
+ }
+
+ if (cmd->op_count) {
+ printf("\n");
+ printf("OP:");
+ for (op = 0; op < cmd->op_count; op++) {
+ if (cmd->optional_pos_args[op].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->optional_pos_args[op].def, 0);
+ }
+ }
+ }
+
+ printf("\n\n");
+ }
+}
+
+static int opt_arg_matches(struct opt_arg *oa1, struct opt_arg *oa2)
+{
+ if (oa1->opt != oa2->opt)
+ return 0;
+
+ /* FIXME: some cases may need more specific val_bits checks */
+ if (oa1->def.val_bits != oa2->def.val_bits)
+ return 0;
+
+ if (oa1->def.str && oa2->def.str && strcmp(oa1->def.str, oa2->def.str))
+ return 0;
+
+ if (oa1->def.num != oa2->def.num)
+ return 0;
+
+ /*
+ * Do NOT compare lv_types because we are checking if two
+ * command lines are ambiguous before the LV type is known.
+ */
+
+ return 1;
+}
+
+static int pos_arg_matches(struct pos_arg *pa1, struct pos_arg *pa2)
+{
+ if (pa1->pos != pa2->pos)
+ return 0;
+
+ /* FIXME: some cases may need more specific val_bits checks */
+ if (pa1->def.val_bits != pa2->def.val_bits)
+ return 0;
+
+ if (pa1->def.str && pa2->def.str && strcmp(pa1->def.str, pa2->def.str))
+ return 0;
+
+ if (pa1->def.num != pa2->def.num)
+ return 0;
+
+ /*
+ * Do NOT compare lv_types because we are checking if two
+ * command lines are ambiguous before the LV type is known.
+ */
+
+ return 1;
+}
+
+static const char *opt_to_enum_str(int opt)
+{
+ return opt_names[opt].name;
+}
+
+static char *flags_to_str(int flags)
+{
+ static char buf_flags[32];
+
+ memset(buf_flags, 0, sizeof(buf_flags));
+
+ if (flags & ARG_DEF_FLAG_MAY_REPEAT) {
+ if (buf_flags[0])
+ strcat(buf_flags, " | ");
+ strcat(buf_flags, "ARG_DEF_FLAG_MAY_REPEAT");
+ }
+ if (flags & ARG_DEF_FLAG_NEW_VG) {
+ if (buf_flags[0])
+ strcat(buf_flags, " | ");
+ strcat(buf_flags, "ARG_DEF_FLAG_NEW_VG");
+ }
+ if (flags & ARG_DEF_FLAG_NEW_LV) {
+ if (buf_flags[0])
+ strcat(buf_flags, " | ");
+ strcat(buf_flags, "ARG_DEF_FLAG_NEW_LV");
+ }
+
+ return buf_flags;
+}
+
+static void add_flags(struct command *cmd, char *line)
+{
+ if (strstr(line, "SECONDARY_SYNTAX"))
+ cmd->cmd_flags |= CMD_FLAG_SECONDARY_SYNTAX;
+}
+
+#define MAX_RULE_OPTS 64
+
+static void add_rule(struct command *cmd, char *line)
+{
+ struct cmd_rule *rule;
+ char *line_argv[MAX_LINE_ARGC];
+ char *arg;
+ int line_argc;
+ int i, lvt_enum, lvp_enum;
+ int check = 0;
+
+ if (cmd->rule_count == CMD_MAX_RULES) {
+ printf("too many rules for cmd\n");
+ exit(1);
+ }
+
+ rule = &cmd->rules[cmd->rule_count++];
+
+ split_line(line, &line_argc, line_argv, ' ');
+
+ for (i = 0; i < line_argc; i++) {
+ arg = line_argv[i];
+
+ if (!strcmp(arg, "not")) {
+ rule->rule = RULE_INVALID;
+ check = 1;
+ }
+
+ else if (!strcmp(arg, "and")) {
+ rule->rule = RULE_REQUIRE;
+ check = 1;
+ }
+
+ else if (!strncmp(arg, "all", 3)) {
+ /* opt/lvt_bits/lvp_bits all remain 0 to mean all */
+ continue;
+ }
+
+ else if (!strncmp(arg, "--", 2)) {
+ if (!rule->opts) {
+ if (!(rule->opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
+ printf("no mem\n");
+ exit(1);
+ }
+ memset(rule->opts, 0, MAX_RULE_OPTS * sizeof(int));
+ }
+
+ if (!rule->check_opts) {
+ if (!(rule->check_opts = malloc(MAX_RULE_OPTS * sizeof(int)))) {
+ printf("no mem\n");
+ exit(1);
+ }
+ memset(rule->check_opts, 0, MAX_RULE_OPTS * sizeof(int));
+ }
+
+ if (check)
+ rule->check_opts[rule->check_opts_count++] = opt_str_to_num(arg);
+ else
+ rule->opts[rule->opts_count++] = opt_str_to_num(arg);
+ }
+
+ else if (!strncmp(arg, "LV_", 3)) {
+ lvt_enum = lv_to_enum(arg);
+
+ if (check)
+ rule->check_lvt_bits |= lvt_enum_to_bit(lvt_enum);
+ else
+ rule->lvt_bits |= lvt_enum_to_bit(lvt_enum);
+ }
+
+ else if (!strncmp(arg, "lv_is_", 6)) {
+ lvp_enum = lvp_name_to_enum(arg);
+
+ if (check)
+ rule->check_lvp_bits |= lvp_enum_to_bit(lvp_enum);
+ else
+ rule->lvp_bits |= lvp_enum_to_bit(lvp_enum);
+ }
+ }
+}
+
+static char *rule_to_define_str(int rule_type)
+{
+ switch (rule_type) {
+ case RULE_INVALID:
+ return "RULE_INVALID";
+ case RULE_REQUIRE:
+ return "RULE_REQUIRE";
+ }
+}
+
+static char *cmd_flags_to_str(uint32_t flags)
+{
+ static char buf_cmd_flags[32];
+
+ memset(buf_cmd_flags, 0, sizeof(buf_cmd_flags));
+
+ if (flags & CMD_FLAG_SECONDARY_SYNTAX) {
+ if (buf_cmd_flags[0])
+ strcat(buf_cmd_flags, " | ");
+ strcat(buf_cmd_flags, "CMD_FLAG_SECONDARY_SYNTAX");
+ }
+ if (flags & CMD_FLAG_ONE_REQUIRED_OPT) {
+ if (buf_cmd_flags[0])
+ strcat(buf_cmd_flags, " | ");
+ strcat(buf_cmd_flags, "CMD_FLAG_ONE_REQUIRED_OPT");
+ }
+
+ return buf_cmd_flags;
+}
+
+void print_command_count(void)
+{
+ struct command *cmd;
+ int i, j;
+
+ printf("/* Do not edit. This file is generated by tools/create-commands */\n");
+ printf("/* using command definitions from tools/command-lines.in */\n");
+ printf("#define COMMAND_COUNT %d\n", cmd_count);
+
+ printf("enum {\n");
+ printf("\tno_CMD,\n"); /* enum value 0 is not used */
+
+ for (i = 0; i < cmd_count; i++) {
+ cmd = &cmd_array[i];
+
+ if (!cmd->command_line_id) {
+ printf("Missing ID: at %d\n", i);
+ exit(1);
+ }
+
+ for (j = 0; j < i; j++) {
+ if (!strcmp(cmd->command_line_id, cmd_array[j].command_line_id))
+ goto next;
+ }
+
+ printf("\t%s_CMD,\n", cmd->command_line_id);
+ next:
+ ;
+ }
+ printf("\tCOMMAND_ID_COUNT,\n");
+ printf("};\n");
+}
+
+static int is_lvm_all_opt(int opt)
+{
+ int oo;
+
+ for (oo = 0; oo < lvm_all.oo_count; oo++) {
+ if (lvm_all.optional_opt_args[oo].opt == opt)
+ return 1;
+ }
+ return 0;
+}
+
+static void factor_common_options(void)
+{
+ int cn, opt_enum, ci, oo, ro, found;
+ struct command *cmd;
+
+ for (cn = 0; cn < MAX_CMD_NAMES; cn++) {
+ if (!cmd_names[cn].name)
+ break;
+
+ for (ci = 0; ci < cmd_count; ci++) {
+ cmd = &cmd_array[ci];
+
+ if (strcmp(cmd->name, cmd_names[cn].name))
+ continue;
+
+ cmd_names[cn].variants++;
+ }
+
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+
+ for (ci = 0; ci < cmd_count; ci++) {
+ cmd = &cmd_array[ci];
+
+ if (strcmp(cmd->name, cmd_names[cn].name))
+ continue;
+
+ if (cmd->ro_count)
+ cmd_names[cn].variant_has_ro = 1;
+ if (cmd->rp_count)
+ cmd_names[cn].variant_has_rp = 1;
+ if (cmd->oo_count)
+ cmd_names[cn].variant_has_oo = 1;
+ if (cmd->op_count)
+ cmd_names[cn].variant_has_op = 1;
+
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ cmd_names[cn].all_options[cmd->required_opt_args[ro].opt] = 1;
+
+ if ((cmd->required_opt_args[ro].opt == size_ARG) && !strncmp(cmd->name, "lv", 2))
+ cmd_names[cn].all_options[extents_ARG] = 1;
+ }
+ for (oo = 0; oo < cmd->oo_count; oo++)
+ cmd_names[cn].all_options[cmd->optional_opt_args[oo].opt] = 1;
+
+ found = 0;
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt == opt_enum) {
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found)
+ goto next_opt;
+ }
+
+ /* all commands starting with this name use this option */
+ cmd_names[cn].common_options[opt_enum] = 1;
+ next_opt:
+ ;
+ }
+ }
+
+ /*
+ for (cn = 0; cn < MAX_CMD_NAMES; cn++) {
+ if (!cmd_names[cn].name)
+ break;
+
+ printf("%s (%d)\n", cmd_names[cn].name, cmd_names[cn].variants);
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ if (cmd_names[cn].common_options[opt_enum])
+ printf(" %s\n", opt_names[opt_enum].long_opt);
+ }
+ }
+ */
+}
+
+void print_usage_common(struct command *cmd)
+{
+ struct cmd_name *cname;
+ int i, sep, ro, rp, oo, op, opt_enum;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ sep = 0;
+
+ /*
+ * when there's more than one variant, options that
+ * are common to all commands with a common name.
+ */
+
+ if (cname->variants < 2)
+ goto all;
+
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ if (!cname->common_options[opt_enum])
+ continue;
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (!sep) {
+ printf("\n");
+ printf("\" [");
+ } else {
+ printf(",");
+ }
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ printf(" %s", opt_names[opt_enum].long_opt);
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ break;
+ }
+ }
+
+ all:
+ /* options that are common to all lvm commands */
+
+ for (oo = 0; oo < lvm_all.oo_count; oo++) {
+ opt_enum = lvm_all.optional_opt_args[oo].opt;
+
+ if (!sep) {
+ printf("\n");
+ printf("\" [");
+ } else {
+ printf(",");
+ }
+
+ printf(" %s", opt_names[opt_enum].long_opt);
+ if (lvm_all.optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def(&lvm_all.optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ printf(" ]\"");
+ printf(";\n");
+}
+
+void print_usage(struct command *cmd)
+{
+ struct cmd_name *cname;
+ int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
+ int i, sep, ro, rp, oo, op, opt_enum;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ printf("\"%s", cmd->name);
+
+ if (cmd->ro_count) {
+ if (onereq)
+ printf(" (");
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ if (ro && onereq)
+ printf(",");
+ printf(" %s", opt_names[cmd->required_opt_args[ro].opt].long_opt);
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->required_opt_args[ro].def, 1);
+ }
+ }
+ if (onereq)
+ printf(" )");
+ }
+
+ if (cmd->rp_count) {
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->required_pos_args[rp].def, 1);
+ }
+ }
+ }
+
+ printf("\"");
+
+ oo_count:
+ if (!cmd->oo_count)
+ goto op_count;
+
+ sep = 0;
+
+ if (cmd->oo_count) {
+ printf("\n");
+ printf("\" [");
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ opt_enum = cmd->optional_opt_args[oo].opt;
+
+ /*
+ * Skip common opts which are in the usage_common string.
+ * The common opts are those in lvm_all and in
+ * cname->common_options.
+ */
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if ((cname->variants > 1) && cname->common_options[opt_enum])
+ continue;
+
+ if (sep)
+ printf(",");
+
+ printf(" %s", opt_names[opt_enum].long_opt);
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ if (sep)
+ printf(",");
+ printf(" COMMON_OPTIONS");
+ printf(" ]\"");
+ }
+
+ op_count:
+ if (!cmd->op_count)
+ goto done;
+
+ printf("\n");
+ printf("\" [");
+
+ if (cmd->op_count) {
+ for (op = 0; op < cmd->op_count; op++) {
+ if (cmd->optional_pos_args[op].def.val_bits) {
+ printf(" ");
+ print_def(&cmd->optional_pos_args[op].def, 1);
+ }
+ }
+ }
+
+ printf(" ]\"");
+
+ done:
+ printf(";\n");
+}
+
+static void print_val_man(const char *str)
+{
+ char *line;
+ char *line_argv[MAX_LINE_ARGC];
+ int line_argc;
+ int i;
+
+ if (!strcmp(str, "Number") ||
+ !strcmp(str, "String") ||
+ !strncmp(str, "VG", 2) ||
+ !strncmp(str, "LV", 2) ||
+ !strncmp(str, "PV", 2) ||
+ !strcmp(str, "Tag")) {
+ printf("\\fI%s\\fP", str);
+ return;
+ }
+
+ if (strstr(str, "Number[") || strstr(str, "]Number")) {
+ for (i = 0; i < strlen(str); i++) {
+ if (str[i] == 'N')
+ printf("\\fI");
+ if (str[i] == 'r') {
+ printf("%c", str[i]);
+ printf("\\fP");
+ continue;
+ }
+ printf("%c", str[i]);
+ }
+ return;
+ }
+
+ if (strstr(str, "|")) {
+ int len = strlen(str);
+ line = strdup(str);
+ split_line(line, &line_argc, line_argv, '|');
+ for (i = 0; i < line_argc; i++) {
+ if (i) {
+ printf("|");
+
+ /* this is a hack to add a line break for
+ a long string of opt values */
+ if ((len > 40) && (i >= (line_argc / 2) + 1)) {
+ printf("\n");
+ printf(" ");
+ len = 0;
+ }
+ }
+ if (strstr(line_argv[i], "Number"))
+ printf("\\fI%s\\fP", line_argv[i]);
+ else
+ printf("\\fB%s\\fP", line_argv[i]);
+ }
+ return;
+ }
+
+ printf("\\fB%s\\fP", str);
+}
+
+static void print_def_man(struct arg_def *def, int usage)
+{
+ int val_enum;
+ int lvt_enum;
+ int sep = 0;
+ int i;
+
+ for (val_enum = 0; val_enum < VAL_COUNT; val_enum++) {
+ if (def->val_bits & val_enum_to_bit(val_enum)) {
+
+ if (val_enum == conststr_VAL) {
+ printf("\\fB");
+ printf("%s", def->str);
+ printf("\\fP");
+ }
+
+ else if (val_enum == constnum_VAL) {
+ printf("\\fB");
+ printf("%llu", (unsigned long long)def->num);
+ printf("\\fP");
+ }
+
+ else {
+ if (sep) printf("|");
+
+ if (!usage || !val_names[val_enum].usage) {
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ sep = 1;
+ }
+
+ if (val_enum == lv_VAL && def->lvt_bits) {
+ printf("\\fI");
+ for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
+ if (lvt_bit_is_set(def->lvt_bits, lvt_enum))
+ printf("_%s", lvt_enum_to_name(lvt_enum));
+ }
+ printf("\\fP");
+ }
+
+ if ((val_enum == vg_VAL) && (def->flags & ARG_DEF_FLAG_NEW_VG)) {
+ printf("\\fI");
+ printf("_new");
+ printf("\\fP");
+ }
+ if ((val_enum == lv_VAL) && (def->flags & ARG_DEF_FLAG_NEW_LV)) {
+ printf("\\fI");
+ printf("_new");
+ printf("\\fP");
+ }
+ }
+ }
+
+ if (def->flags & ARG_DEF_FLAG_MAY_REPEAT)
+ printf(" ...");
+}
+
+static char *man_long_opt_name(const char *cmdname, int opt_enum)
+{
+ static char long_opt_name[64];
+
+ memset(&long_opt_name, 0, sizeof(long_opt_name));
+
+ switch (opt_enum) {
+ case syncaction_ARG:
+ strncpy(long_opt_name, "--[raid]syncaction", 63);
+ break;
+ case writemostly_ARG:
+ strncpy(long_opt_name, "--[raid]writemostly", 63);
+ break;
+ case minrecoveryrate_ARG:
+ strncpy(long_opt_name, "--[raid]minrecoveryrate", 63);
+ break;
+ case maxrecoveryrate_ARG:
+ strncpy(long_opt_name, "--[raid]maxrecoveryrate", 63);
+ break;
+ case writebehind_ARG:
+ strncpy(long_opt_name, "--[raid]writebehind", 63);
+ break;
+ case vgmetadatacopies_ARG:
+ if (!strncmp(cmdname, "vg", 2))
+ strncpy(long_opt_name, "--[vg]metadatacopies", 63);
+ else
+ strncpy(long_opt_name, "--vgmetadatacopies", 63);
+ break;
+ case pvmetadatacopies_ARG:
+ if (!strncmp(cmdname, "pv", 2))
+ strncpy(long_opt_name, "--[pv]metadatacopies", 63);
+ else
+ strncpy(long_opt_name, "--pvmetadatacopies", 63);
+ break;
+ default:
+ strncpy(long_opt_name, opt_names[opt_enum].long_opt, 63);
+ break;
+ }
+
+ return long_opt_name;
+}
+
+void print_man_usage(struct command *cmd)
+{
+ struct cmd_name *cname;
+ int onereq = (cmd->cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) ? 1 : 0;
+ int i, sep, ro, rp, oo, op, opt_enum;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ printf("\\fB%s\\fP", cmd->name);
+
+ if (!onereq)
+ goto ro_normal;
+
+ /*
+ * one required option in a set, print as:
+ * ( -a|--a,
+ * -b|--b,
+ * --c,
+ * --d )
+ *
+ * First loop through ro prints those with short opts,
+ * and the second loop prints those without short opts.
+ */
+
+ if (cmd->ro_count) {
+ printf("\n");
+ printf(".RS 4\n");
+ printf("(");
+
+ sep = 0;
+
+ /* print required options with a short opt */
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ opt_enum = cmd->required_opt_args[ro].opt;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ if (opt_names[opt_enum].short_opt) {
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+ } else {
+ printf(" ");
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+ }
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_opt_args[ro].def, 1);
+ }
+
+ sep = 1;
+ }
+
+ /* print required options without a short opt */
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ opt_enum = cmd->required_opt_args[ro].opt;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ printf(" ");
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_opt_args[ro].def, 1);
+ }
+
+ sep = 1;
+ }
+
+ printf(" )\n");
+ printf(".RE\n");
+ }
+
+ /* print required position args on a new line after the onereq set */
+ if (cmd->rp_count) {
+ printf(".RS 4\n");
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_pos_args[rp].def, 1);
+ }
+ }
+
+ printf("\n");
+ printf(".RE\n");
+ } else {
+ /* printf("\n"); */
+ }
+
+ printf(".br\n");
+ goto oo_count;
+
+ ro_normal:
+
+ /*
+ * all are required options, print as:
+ * -a|--aaa <val> -b|--bbb <val>
+ */
+
+ if (cmd->ro_count) {
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ opt_enum = cmd->required_opt_args[ro].opt;
+
+ if (opt_names[opt_enum].short_opt) {
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+ } else {
+ printf(" \\fB%s\\fP", opt_names[cmd->required_opt_args[ro].opt].long_opt);
+ }
+
+ if (cmd->required_opt_args[ro].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_opt_args[ro].def, 1);
+ }
+ }
+ }
+
+ /* print required position args on the same line as the required options */
+ if (cmd->rp_count) {
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (cmd->required_pos_args[rp].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->required_pos_args[rp].def, 1);
+ }
+ }
+
+ printf("\n");
+ } else {
+ printf("\n");
+ }
+
+ printf(".br\n");
+
+ oo_count:
+ if (!cmd->oo_count)
+ goto op_count;
+
+ sep = 0;
+
+ if (cmd->oo_count) {
+ printf(".RS 4\n");
+ printf("[");
+
+ /* print optional options with short opts */
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ opt_enum = cmd->optional_opt_args[oo].opt;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ /*
+ * Skip common opts which are in the usage_common string.
+ * The common opts are those in lvm_all and in
+ * cname->common_options.
+ */
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if ((cname->variants > 1) && cname->common_options[opt_enum])
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ /* print optional options without short opts */
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ opt_enum = cmd->optional_opt_args[oo].opt;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ /*
+ * Skip common opts which are in the usage_common string.
+ * The common opts are those in lvm_all and in
+ * cname->common_options.
+ */
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if ((cname->variants > 1) && cname->common_options[opt_enum])
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ /* space alignment without short opt */
+ printf(" ");
+ }
+ printf(" COMMON_OPTIONS");
+ printf(" ]\n");
+ printf(".RE\n");
+ printf(".br\n");
+ }
+
+ op_count:
+ if (!cmd->op_count)
+ goto done;
+
+ printf(".RS 4\n");
+ printf("[");
+
+ if (cmd->op_count) {
+ for (op = 0; op < cmd->op_count; op++) {
+ if (cmd->optional_pos_args[op].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_pos_args[op].def, 1);
+ }
+ }
+ }
+
+ printf(" ]\n");
+ printf(".RE\n");
+
+ done:
+ printf("\n");
+}
+
+void print_man_usage_common(struct command *cmd)
+{
+ struct cmd_name *cname;
+ int i, sep, ro, rp, oo, op, opt_enum;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ sep = 0;
+
+ printf(".RS 4\n");
+ printf("[");
+
+ /*
+ * when there's more than one variant, options that
+ * are common to all commands with a common name.
+ */
+
+ if (cname->variants < 2)
+ goto all;
+
+ /* print those with short opts */
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ if (!cname->common_options[opt_enum])
+ continue;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ break;
+ }
+
+ }
+
+ /* print those without short opts */
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ if (!cname->common_options[opt_enum])
+ continue;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if (is_lvm_all_opt(opt_enum))
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ if (cmd->optional_opt_args[oo].opt != opt_enum)
+ continue;
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (cmd->optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def_man(&cmd->optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ break;
+ }
+ }
+ all:
+ /* options that are common to all lvm commands */
+
+ /* those with short opts */
+ for (oo = 0; oo < lvm_all.oo_count; oo++) {
+ opt_enum = lvm_all.optional_opt_args[oo].opt;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cmd->name, opt_enum));
+
+ if (lvm_all.optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def(&lvm_all.optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+
+ /* those without short opts */
+ for (oo = 0; oo < lvm_all.oo_count; oo++) {
+ opt_enum = lvm_all.optional_opt_args[oo].opt;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep) {
+ printf(",");
+ printf("\n.br\n");
+ printf(" ");
+ }
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cmd->name, opt_enum));
+
+ if (lvm_all.optional_opt_args[oo].def.val_bits) {
+ printf(" ");
+ print_def(&lvm_all.optional_opt_args[oo].def, 1);
+ }
+ sep = 1;
+ }
+ printf(" ]\n");
+}
+
+void print_man_all_options(struct cmd_name *cname)
+{
+ int opt_enum, val_enum;
+ int sep = 0;
+
+ /* print those with short opts */
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ if (!cname->all_options[opt_enum])
+ continue;
+
+ if (!opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep)
+ printf("\n.br\n");
+
+ printf(" \\fB-%c\\fP|\\fB%s\\fP",
+ opt_names[opt_enum].short_opt,
+ man_long_opt_name(cname->name, opt_enum));
+
+ val_enum = opt_names[opt_enum].val_enum;
+
+ if (!val_names[val_enum].fn) {
+ /* takes no arg */
+ } else if (!val_names[val_enum].usage) {
+ printf(" ");
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ printf(" ");
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ sep = 1;
+ }
+
+ /* print those without short opts */
+ for (opt_enum = 0; opt_enum < ARG_COUNT; opt_enum++) {
+ if (!cname->all_options[opt_enum])
+ continue;
+
+ if (opt_names[opt_enum].short_opt)
+ continue;
+
+ if (sep)
+ printf("\n.br\n");
+
+ /* space alignment without short opt */
+ printf(" ");
+
+ printf(" \\fB%s\\fP", man_long_opt_name(cname->name, opt_enum));
+
+ val_enum = opt_names[opt_enum].val_enum;
+
+ if (!val_names[val_enum].fn) {
+ /* takes no arg */
+ } else if (!val_names[val_enum].usage) {
+ printf(" ");
+ printf("\\fI");
+ printf("%s", val_names[val_enum].name);
+ printf("\\fP");
+ } else {
+ printf(" ");
+ print_val_man(val_names[val_enum].usage);
+ }
+
+ sep = 1;
+ }
+}
+
+#define DESC_LINE 256
+
+void print_desc_man(const char *desc)
+{
+ char buf[DESC_LINE] = {0};
+ int di = 0;
+ int bi = 0;
+
+ for (di = 0; di < strlen(desc); di++) {
+ if (desc[di] == '\0')
+ break;
+ if (desc[di] == '\n')
+ continue;
+
+ if (!strncmp(&desc[di], "DESC:", 5)) {
+ if (bi) {
+ printf("%s\n", buf);
+ printf(".br\n");
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ }
+ di += 5;
+ continue;
+ }
+
+ if (!bi && desc[di] == ' ')
+ continue;
+
+ buf[bi++] = desc[di];
+
+ if (bi == (DESC_LINE - 1))
+ break;
+ }
+
+ if (bi) {
+ printf("%s\n", buf);
+ printf(".br\n");
+ }
+}
+
+static char *upper_command_name(char *str)
+{
+ static char str_upper[32];
+ int i = 0;
+
+ while (*str) {
+ str_upper[i++] = toupper(*str);
+ str++;
+ }
+ str_upper[i] = '\0';
+ return str_upper;
+}
+
+void print_man_command(void)
+{
+ struct cmd_name *cname;
+ struct command *cmd, *prev_cmd = NULL;
+ const char *desc;
+ int i, j, ro, rp, oo, op;
+
+ include_optional_opt_args(&lvm_all, "OO_USAGE_COMMON");
+
+ printf(".TH %s 8 \"LVM TOOLS #VERSION#\" \"Sistina Software UK\"\n",
+ man_command_name ? upper_command_name(man_command_name) : "LVM_COMMANDS");
+
+ for (i = 0; i < cmd_count; i++) {
+
+ cmd = &cmd_array[i];
+
+ if (prev_cmd && strcmp(prev_cmd->name, cmd->name)) {
+ printf("Common options:\n");
+ printf(".\n");
+ print_man_usage_common(prev_cmd);
+ prev_cmd = NULL;
+ }
+
+ if ((cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_man_secondary)
+ continue;
+
+ if (!(cmd->cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && !include_man_primary)
+ continue;
+
+ if (man_command_name && strcmp(man_command_name, cmd->name))
+ continue;
+
+ if (!prev_cmd || strcmp(prev_cmd->name, cmd->name)) {
+ printf(".SH NAME\n");
+ printf(".\n");
+ if ((desc = cmd_name_desc(cmd->name)))
+ printf("%s \\- %s\n", cmd->name, desc);
+ else
+ printf("%s\n", cmd->name);
+ printf(".br\n");
+ printf(".P\n");
+ printf(".\n");
+ printf(".SH SYNOPSIS\n");
+ printf(".br\n");
+ printf(".P\n");
+ printf(".\n");
+ prev_cmd = cmd;
+
+ if (!(cname = find_command_name(cmd->name)))
+ return;
+
+ if (cname->variant_has_ro && cname->variant_has_rp)
+ printf("\\fB%s\\fP \\fIrequired_option_args\\fP \\fIrequired_position_args\\fP\n", cmd->name);
+ else if (cname->variant_has_ro && !cname->variant_has_rp)
+ printf("\\fB%s\\fP \\fIrequired_option_args\\fP\n", cmd->name);
+ else if (!cname->variant_has_ro && cname->variant_has_rp)
+ printf("\\fB%s\\fP \\fIrequired_position_args\\fP\n", cmd->name);
+ else if (!cname->variant_has_ro && !cname->variant_has_rp)
+ printf("\\fB%s\\fP\n", cmd->name);
+
+ printf(".br\n");
+
+ if (cname->variant_has_oo) {
+ printf(" [ \\fIoptional_option_args\\fP ]\n");
+ printf(".br\n");
+ }
+
+ if (cname->variant_has_op) {
+ printf(" [ \\fIoptional_position_args\\fP ]\n");
+ printf(".br\n");
+ }
+
+ printf(".P\n");
+ printf("\n");
+
+ /* listing them all when there's only 1 or 2 is just repetative */
+ if (cname->variants > 2) {
+ printf(".P\n");
+ print_man_all_options(cname);
+ printf("\n");
+ printf(".P\n");
+ printf("\n");
+ }
+
+ printf(".SH USAGE\n");
+ printf(".br\n");
+ printf(".P\n");
+ printf(".\n");
+ }
+
+ if (cmd->desc) {
+ print_desc_man(cmd->desc);
+ printf(".P\n");
+ }
+
+ print_man_usage(cmd);
+
+ if (i == (cmd_count - 1)) {
+ printf("Common options:\n");
+ printf(".\n");
+ print_man_usage_common(cmd);
+ }
+
+ printf("\n");
+ continue;
+ }
+}
+
+void print_command_struct(int only_usage)
+{
+ struct command *cmd;
+ int i, j, ro, rp, oo, op, ru, ruo, io;
+
+ include_optional_opt_args(&lvm_all, "OO_USAGE_COMMON");
+
+ printf("/* Do not edit. This file is generated by tools/create-commands */\n");
+ printf("/* using command definitions from tools/command-lines.in */\n");
+ printf("\n");
+
+ for (i = 0; i < cmd_count; i++) {
+ cmd = &cmd_array[i];
+
+ if (only_usage) {
+ print_usage(cmd);
+ print_usage_common(cmd);
+ printf("\n");
+ continue;
+ }
+
+ printf("commands[%d].name = \"%s\";\n", i, cmd->name);
+ printf("commands[%d].command_line_id = \"%s\";\n", i, cmd->command_line_id);
+ printf("commands[%d].command_line_enum = %s_CMD;\n", i, cmd->command_line_id);
+ printf("commands[%d].fn = %s;\n", i, cmd->name);
+ printf("commands[%d].ro_count = %d;\n", i, cmd->ro_count);
+ printf("commands[%d].rp_count = %d;\n", i, cmd->rp_count);
+ printf("commands[%d].oo_count = %d;\n", i, cmd->oo_count);
+ printf("commands[%d].op_count = %d;\n", i, cmd->op_count);
+ printf("commands[%d].io_count = %d;\n", i, cmd->io_count);
+ printf("commands[%d].rule_count = %d;\n", i, cmd->rule_count);
+
+ if (cmd->cmd_flags)
+ printf("commands[%d].cmd_flags = %s;\n", i, cmd_flags_to_str(cmd->cmd_flags));
+ else
+ printf("commands[%d].cmd_flags = 0;\n", i, cmd_flags_to_str(cmd->cmd_flags));
+
+ printf("commands[%d].desc = \"%s\";\n", i, cmd->desc ?: "");
+ printf("commands[%d].usage = ", i);
+ print_usage(cmd);
+
+ if (cmd->oo_count) {
+ printf("commands[%d].usage_common = ", i);
+ print_usage_common(cmd);
+ } else {
+ printf("commands[%d].usage_common = \"NULL\";\n", i);
+ }
+
+ if (cmd->ro_count) {
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ printf("commands[%d].required_opt_args[%d].opt = %s;\n",
+ i, ro, opt_to_enum_str(cmd->required_opt_args[ro].opt));
+
+ if (!cmd->required_opt_args[ro].def.val_bits)
+ continue;
+
+ printf("commands[%d].required_opt_args[%d].def.val_bits = %s;\n",
+ i, ro, val_bits_to_str(cmd->required_opt_args[ro].def.val_bits));
+
+ if (cmd->required_opt_args[ro].def.lvt_bits)
+ printf("commands[%d].required_opt_args[%d].def.lvt_bits = %s;\n",
+ i, ro, lvt_bits_to_str(cmd->required_opt_args[ro].def.lvt_bits));
+
+ if (cmd->required_opt_args[ro].def.flags)
+ printf("commands[%d].required_opt_args[%d].def.flags = %s;\n",
+ i, ro, flags_to_str(cmd->required_opt_args[ro].def.flags));
+
+ if (val_bit_is_set(cmd->required_opt_args[ro].def.val_bits, constnum_VAL))
+ printf("commands[%d].required_opt_args[%d].def.num = %d;\n",
+ i, ro, cmd->required_opt_args[ro].def.num);
+
+ if (val_bit_is_set(cmd->required_opt_args[ro].def.val_bits, conststr_VAL))
+ printf("commands[%d].required_opt_args[%d].def.str = \"%s\";\n",
+ i, ro, cmd->required_opt_args[ro].def.str ?: "NULL");
+ }
+ }
+
+ if (cmd->rp_count) {
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ printf("commands[%d].required_pos_args[%d].pos = %d;\n",
+ i, rp, cmd->required_pos_args[rp].pos);
+
+ if (!cmd->required_pos_args[rp].def.val_bits)
+ continue;
+
+ printf("commands[%d].required_pos_args[%d].def.val_bits = %s;\n",
+ i, rp, val_bits_to_str(cmd->required_pos_args[rp].def.val_bits));
+
+ if (cmd->required_pos_args[rp].def.lvt_bits)
+ printf("commands[%d].required_pos_args[%d].def.lvt_bits = %s;\n",
+ i, rp, lvt_bits_to_str(cmd->required_pos_args[rp].def.lvt_bits));
+
+ if (cmd->required_pos_args[rp].def.flags)
+ printf("commands[%d].required_pos_args[%d].def.flags = %s;\n",
+ i, rp, flags_to_str(cmd->required_pos_args[rp].def.flags));
+
+ if (val_bit_is_set(cmd->required_pos_args[rp].def.val_bits, constnum_VAL))
+ printf("commands[%d].required_pos_args[%d].def.num = %d;\n",
+ i, rp, cmd->required_pos_args[rp].def.num);
+
+ if (val_bit_is_set(cmd->required_pos_args[rp].def.val_bits, conststr_VAL))
+ printf("commands[%d].required_pos_args[%d].def.str = \"%s\";\n",
+ i, rp, cmd->required_pos_args[rp].def.str ?: "NULL");
+ }
+ }
+
+ if (cmd->oo_count) {
+ for (oo = 0; oo < cmd->oo_count; oo++) {
+ printf("commands[%d].optional_opt_args[%d].opt = %s;\n",
+ i, oo, opt_to_enum_str(cmd->optional_opt_args[oo].opt));
+
+ if (!cmd->optional_opt_args[oo].def.val_bits)
+ continue;
+
+ printf("commands[%d].optional_opt_args[%d].def.val_bits = %s;\n",
+ i, oo, val_bits_to_str(cmd->optional_opt_args[oo].def.val_bits));
+
+ if (cmd->optional_opt_args[oo].def.lvt_bits)
+ printf("commands[%d].optional_opt_args[%d].def.lvt_bits = %s;\n",
+ i, oo, lvt_bits_to_str(cmd->optional_opt_args[oo].def.lvt_bits));
+
+ if (cmd->optional_opt_args[oo].def.flags)
+ printf("commands[%d].optional_opt_args[%d].def.flags = %s;\n",
+ i, oo, flags_to_str(cmd->optional_opt_args[oo].def.flags));
+
+ if (val_bit_is_set(cmd->optional_opt_args[oo].def.val_bits, constnum_VAL))
+ printf("commands[%d].optional_opt_args[%d].def.num = %d;\n",
+ i, oo, cmd->optional_opt_args[oo].def.num);
+
+ if (val_bit_is_set(cmd->optional_opt_args[oo].def.val_bits, conststr_VAL))
+ printf("commands[%d].optional_opt_args[%d].def.str = \"%s\";\n",
+ i, oo, cmd->optional_opt_args[oo].def.str ?: "NULL");
+ }
+ }
+
+ if (cmd->io_count) {
+ for (io = 0; io < cmd->io_count; io++) {
+ printf("commands[%d].ignore_opt_args[%d].opt = %s;\n",
+ i, io, opt_to_enum_str(cmd->ignore_opt_args[io].opt));
+
+ if (!cmd->ignore_opt_args[io].def.val_bits)
+ continue;
+
+ printf("commands[%d].ignore_opt_args[%d].def.val_bits = %s;\n",
+ i, io, val_bits_to_str(cmd->ignore_opt_args[io].def.val_bits));
+
+ if (cmd->ignore_opt_args[io].def.lvt_bits)
+ printf("commands[%d].ignore_opt_args[%d].def.lvt_bits = %s;\n",
+ i, io, lvt_bits_to_str(cmd->ignore_opt_args[io].def.lvt_bits));
+
+ if (cmd->ignore_opt_args[io].def.flags)
+ printf("commands[%d].ignore_opt_args[%d].def.flags = %s;\n",
+ i, io, flags_to_str(cmd->ignore_opt_args[io].def.flags));
+
+ if (val_bit_is_set(cmd->ignore_opt_args[io].def.val_bits, constnum_VAL))
+ printf("commands[%d].ignore_opt_args[%d].def.num = %d;\n",
+ i, io, cmd->ignore_opt_args[io].def.num);
+
+ if (val_bit_is_set(cmd->ignore_opt_args[io].def.val_bits, conststr_VAL))
+ printf("commands[%d].ignore_opt_args[%d].def.str = \"%s\";\n",
+ i, io, cmd->ignore_opt_args[io].def.str ?: "NULL");
+ }
+ }
+
+ if (cmd->op_count) {
+ for (op = 0; op < cmd->op_count; op++) {
+ printf("commands[%d].optional_pos_args[%d].pos = %d;\n",
+ i, op, cmd->optional_pos_args[op].pos);
+
+ if (!cmd->optional_pos_args[op].def.val_bits)
+ continue;
+
+ printf("commands[%d].optional_pos_args[%d].def.val_bits = %s;\n",
+ i, op, val_bits_to_str(cmd->optional_pos_args[op].def.val_bits));
+
+ if (cmd->optional_pos_args[op].def.lvt_bits)
+ printf("commands[%d].optional_pos_args[%d].def.lvt_bits = %s;\n",
+ i, op, lvt_bits_to_str(cmd->optional_pos_args[op].def.lvt_bits));
+
+ if (cmd->optional_pos_args[op].def.flags)
+ printf("commands[%d].optional_pos_args[%d].def.flags = %s;\n",
+ i, op, flags_to_str(cmd->optional_pos_args[op].def.flags));
+
+ if (val_bit_is_set(cmd->optional_pos_args[op].def.val_bits, constnum_VAL))
+ printf("commands[%d].optional_pos_args[%d].def.num = %d;\n",
+ i, op, cmd->optional_pos_args[op].def.num);
+
+ if (val_bit_is_set(cmd->optional_pos_args[op].def.val_bits, conststr_VAL))
+ printf("commands[%d].optional_pos_args[%d].def.str = \"%s\";\n",
+ i, op, cmd->optional_pos_args[op].def.str ?: "NULL");
+ }
+ }
+
+ if (cmd->rule_count) {
+ for (ru = 0; ru < cmd->rule_count; ru++) {
+
+ printf("commands[%d].rules[%d].opts_count = %d;\n", i, ru, cmd->rules[ru].opts_count);
+
+ if (cmd->rules[ru].opts_count) {
+ printf("static int _command%d_rule%d_opts[] = { ", i, ru);
+ for (ruo = 0; ruo < cmd->rules[ru].opts_count; ruo++) {
+ if (ruo)
+ printf(", ");
+ printf("%s", opt_to_enum_str(cmd->rules[ru].opts[ruo]));
+ }
+ printf(" };\n");
+ printf("commands[%d].rules[%d].opts = _command%d_rule%d_opts;\n", i, ru, i, ru);
+ } else {
+ printf("commands[%d].rules[%d].opts = NULL;\n", i, ru);
+ }
+
+ printf("commands[%d].rules[%d].check_opts_count = %d;\n", i, ru, cmd->rules[ru].check_opts_count);
+
+ if (cmd->rules[ru].check_opts_count) {
+ printf("static int _command%d_rule%d_check_opts[] = { ", i, ru);
+ for (ruo = 0; ruo < cmd->rules[ru].check_opts_count; ruo++) {
+ if (ruo)
+ printf(",");
+ printf("%s ", opt_to_enum_str(cmd->rules[ru].check_opts[ruo]));
+ }
+ printf(" };\n");
+ printf("commands[%d].rules[%d].check_opts = _command%d_rule%d_check_opts;\n", i, ru, i, ru);
+ } else {
+ printf("commands[%d].rules[%d].check_opts = NULL;\n", i, ru);
+ }
+
+ printf("commands[%d].rules[%d].lvt_bits = %s;\n", i, ru,
+ cmd->rules[ru].lvt_bits ? lvt_bits_to_str(cmd->rules[ru].lvt_bits) : "0");
+
+ printf("commands[%d].rules[%d].lvp_bits = %s;\n", i, ru,
+ cmd->rules[ru].lvp_bits ? lvp_bits_to_str(cmd->rules[ru].lvp_bits) : "0");
+
+ printf("commands[%d].rules[%d].rule = %s;\n", i, ru,
+ rule_to_define_str(cmd->rules[ru].rule));
+
+ printf("commands[%d].rules[%d].check_lvt_bits = %s;\n", i, ru,
+ cmd->rules[ru].check_lvt_bits ? lvt_bits_to_str(cmd->rules[ru].check_lvt_bits) : "0");
+
+ printf("commands[%d].rules[%d].check_lvp_bits = %s;\n", i, ru,
+ cmd->rules[ru].check_lvp_bits ? lvp_bits_to_str(cmd->rules[ru].check_lvp_bits) : "0");
+ }
+ }
+
+ printf("\n");
+ }
+}
+
+struct cmd_pair {
+ int i, j;
+};
+
+static void print_ambiguous(void)
+{
+ struct command *cmd, *dup;
+ struct cmd_pair dups[64] = { 0 };
+ int found = 0;
+ int i, j, f, ro, rp;
+
+ for (i = 0; i < cmd_count; i++) {
+ cmd = &cmd_array[i];
+
+ for (j = 0; j < cmd_count; j++) {
+ dup = &cmd_array[j];
+
+ if (i == j)
+ continue;
+ if (strcmp(cmd->name, dup->name))
+ continue;
+ if (cmd->ro_count != dup->ro_count)
+ continue;
+ if (cmd->rp_count != dup->rp_count)
+ continue;
+
+ for (ro = 0; ro < cmd->ro_count; ro++) {
+ if (!opt_arg_matches(&cmd->required_opt_args[ro],
+ &dup->required_opt_args[ro]))
+ goto next;
+ }
+
+ for (rp = 0; rp < cmd->rp_count; rp++) {
+ if (!pos_arg_matches(&cmd->required_pos_args[rp],
+ &dup->required_pos_args[rp]))
+ goto next;
+ }
+
+ for (f = 0; f < found; f++) {
+ if ((dups[f].i == j) && (dups[f].j == i))
+ goto next;
+ }
+
+ printf("Ambiguous commands %d and %d:\n", i, j);
+ print_usage(cmd);
+ print_usage(dup);
+ printf("\n");
+
+ dups[found].i = i;
+ dups[found].j = j;
+ found++;
+next:
+ ;
+ }
+ }
+}
+
+void print_command_list(void)
+{
+ int i;
+
+ for (i = 0; i < MAX_CMD_NAMES; i++) {
+ if (!cmd_names[i].name) {
+ printf("found %d command names\n", i);
+ break;
+ }
+ printf("%s\n", cmd_names[i].name);
+ }
+}
+
+void print_option_list(void)
+{
+ int i;
+
+ for (i = 0; i < ARG_COUNT; i++)
+ printf("%d %s %s %c (%d)\n",
+ opt_names[i].opt_enum, opt_names[i].name,
+ opt_names[i].long_opt, opt_names[i].short_opt ?: ' ',
+ opt_names[i].short_opt ? opt_names[i].short_opt : 0);
+}
+
+static void print_help(int argc, char *argv[])
+{
+ printf("%s [options] --output <format> <filename>\n", argv[0]);
+ printf("\n");
+ printf("output formats:\n");
+ printf("struct: print C structures for command-lines.h\n");
+ printf("count: print defines and enums for command-lines-count.h\n");
+ printf("ambiguous: print commands differing only by LV types\n");
+ printf("usage: print usage format.\n");
+ printf("expanded: print expanded input format.\n");
+ printf("man: print man page format.\n");
+ printf("\n");
+ printf("options:\n");
+ printf("-c|--man-command <commandname> man output for one command name\n");
+}
+
+int main(int argc, char *argv[])
+{
+ char *outputformat = NULL;
+ char *inputfile = NULL;
+ FILE *file;
+ struct command *cmd;
+ char line[MAX_LINE];
+ char line_orig[MAX_LINE];
+ const char *name;
+ char *line_argv[MAX_LINE_ARGC];
+ char *n;
+ int line_argc;
+ int prev_was_oo_def = 0;
+ int prev_was_oo = 0;
+ int prev_was_op = 0;
+
+ if (argc < 2) {
+ print_help(argc, argv);
+ exit(EXIT_FAILURE);
+ }
+
+ if (!strcmp(argv[1], "debug")) {
+ print_command_list();
+ print_option_list();
+ return 0;
+ }
+
+ static struct option long_options[] = {
+ {"help", no_argument, 0, 'h' },
+ {"output", required_argument, 0, 'o' },
+ {"man-primary", required_argument, 0, 'p' },
+ {"man-secondary", required_argument, 0, 's' },
+ {"man-command", required_argument, 0, 'c' },
+ {0, 0, 0, 0 }
+ };
+
+ while (1) {
+ int c;
+ int option_index = 0;
+
+ c = getopt_long(argc, argv, "ho:p:s:c:",
+ long_options, &option_index);
+ if (c == -1)
+ break;
+
+ switch (c) {
+ case '0':
+ break;
+ case 'h':
+ print_help(argc, argv);
+ exit(EXIT_SUCCESS);
+ case 'o':
+ outputformat = strdup(optarg);
+ break;
+ case 'p':
+ include_man_primary = atoi(optarg);
+ break;
+ case 's':
+ include_man_secondary = atoi(optarg);
+ break;
+ case 'c':
+ man_command_name = strdup(optarg);
+ break;
+ }
+ }
+
+ if (optind < argc)
+ inputfile = argv[optind];
+ else {
+ printf("Missing filename.\n");
+ return 0;
+ }
+
+ if (!(file = fopen(inputfile, "r"))) {
+ printf("Cannot open %s\n", argv[1]);
+ return -1;
+ }
+
+ while (fgets(line, MAX_LINE, file)) {
+ if (line[0] == '#')
+ continue;
+ if (line[0] == '\n')
+ continue;
+ if (line[0] == '-' && line[1] == '-' && line[2] == '-')
+ continue;
+
+ if ((n = strchr(line, '\n')))
+ *n = '\0';
+
+ memcpy(line_orig, line, sizeof(line));
+ split_line(line, &line_argc, line_argv, ' ');
+
+ if (!line_argc)
+ continue;
+
+ /* command ... */
+ if ((name = is_command_name(line_argv[0]))) {
+ if (cmd_count >= MAX_CMDS) {
+ printf("MAX_CMDS too small\n");
+ return -1;
+ }
+ cmd = &cmd_array[cmd_count++];
+ cmd->name = name;
+ cmd->pos_count = 1;
+ add_required_line(cmd, line_argc, line_argv);
+
+ /* Every cmd gets the OO_ALL options */
+ include_optional_opt_args(cmd, "OO_ALL:");
+ continue;
+ }
+
+ if (is_desc_line(line_argv[0])) {
+ char *desc = strdup(line_orig);
+ if (cmd->desc) {
+ int newlen = strlen(cmd->desc) + strlen(desc) + 2;
+ char *newdesc = malloc(newlen);
+ memset(newdesc, 0, newlen);
+ snprintf(newdesc, newlen, "%s %s", cmd->desc, desc);
+ cmd->desc = newdesc;
+ free(desc);
+ } else
+ cmd->desc = desc;
+ continue;
+ }
+
+ if (is_flags_line(line_argv[0])) {
+ add_flags(cmd, line_orig);
+ continue;
+ }
+
+ if (is_rule_line(line_argv[0])) {
+ add_rule(cmd, line_orig);
+ continue;
+ }
+
+ if (is_id_line(line_argv[0])) {
+ cmd->command_line_id = strdup(line_argv[1]);
+ continue;
+ }
+
+ /* OO_FOO: ... */
+ if (is_oo_definition(line_argv[0])) {
+ add_oo_definition_line(line_argv[0], line_orig);
+ prev_was_oo_def = 1;
+ prev_was_oo = 0;
+ prev_was_op = 0;
+ continue;
+ }
+
+ /* OO: ... */
+ if (is_oo_line(line_argv[0])) {
+ add_optional_opt_line(cmd, line_argc, line_argv);
+ prev_was_oo_def = 0;
+ prev_was_oo = 1;
+ prev_was_op = 0;
+ continue;
+ }
+
+ /* OP: ... */
+ if (is_op_line(line_argv[0])) {
+ add_optional_pos_line(cmd, line_argc, line_argv);
+ prev_was_oo_def = 0;
+ prev_was_oo = 0;
+ prev_was_op = 1;
+ continue;
+ }
+
+ /* IO: ... */
+ if (is_io_line(line_argv[0])) {
+ add_ignore_opt_line(cmd, line_argc, line_argv);
+ prev_was_oo = 0;
+ prev_was_op = 0;
+ continue;
+ }
+
+ /* handle OO_FOO:, OO:, OP: continuing on multiple lines */
+
+ if (prev_was_oo_def) {
+ append_oo_definition_line(line_orig);
+ continue;
+ }
+
+ if (prev_was_oo) {
+ add_optional_opt_line(cmd, line_argc, line_argv);
+ continue;
+ }
+
+ if (prev_was_op) {
+ add_optional_pos_line(cmd, line_argc, line_argv);
+ continue;
+ }
+ }
+
+ fclose(file);
+
+ factor_common_options();
+
+ if (!outputformat)
+ print_command_struct(1);
+ else if (!strcmp(outputformat, "struct")) {
+ print_command_struct(0);
+ print_ambiguous();
+ }
+ else if (!strcmp(outputformat, "count"))
+ print_command_count();
+ else if (!strcmp(outputformat, "usage"))
+ print_command_struct(1);
+ else if (!strcmp(outputformat, "expanded"))
+ print_expanded();
+ else if (!strcmp(outputformat, "ambiguous"))
+ print_ambiguous();
+ else if (!strcmp(outputformat, "man"))
+ print_man_command();
+ else
+ print_help(argc, argv);
+
+ return 0;
+}
+
diff --git a/tools/lv_props.h b/tools/lv_props.h
new file mode 100644
index 0000000..2925028
--- /dev/null
+++ b/tools/lv_props.h
@@ -0,0 +1,56 @@
+
+/*
+ * NULL in the last arg can be replaced with actual
+ * calls to the lv_is_prop() function when those
+ * become functions (are #define now), take uniform
+ * args (e.g. some take cmd others don't), and are
+ * exposed in tools.h
+ *
+ * Until then, the lv_is_prop() functions are
+ * called indirectly through _lv_is_prop().
+ */
+
+lvp(LVP_NONE, "", NULL) /* enum value 0 means none */
+lvp(is_locked_LVP, "lv_is_locked", NULL)
+lvp(is_partial_LVP, "lv_is_partial", NULL)
+lvp(is_virtual_LVP, "lv_is_virtual", NULL)
+lvp(is_merging_LVP, "lv_is_merging", NULL)
+lvp(is_merging_origin_LVP, "lv_is_merging_origin", NULL)
+lvp(is_converting_LVP, "lv_is_converting", NULL)
+lvp(is_external_origin_LVP, "lv_is_external_origin", NULL)
+lvp(is_virtual_origin_LVP, "lv_is_virtual_origin", NULL)
+lvp(is_not_synced_LVP, "lv_is_not_synced", NULL)
+lvp(is_pending_delete_LVP, "lv_is_pending_delete", NULL)
+lvp(is_error_when_full_LVP, "lv_is_error_when_full", NULL)
+lvp(is_pvmove_LVP, "lv_is_pvmove", NULL)
+lvp(is_removed_LVP, "lv_is_removed", NULL)
+lvp(is_vg_writable_LVP, "lv_is_vg_writable", NULL)
+
+/* kinds of sub LV */
+lvp(is_thinpool_data_LVP, "lv_is_thinpool_data", NULL)
+lvp(is_thinpool_metadata_LVP, "lv_is_thinpool_metadata", NULL)
+lvp(is_cachepool_data_LVP, "lv_is_cachepool_data", NULL)
+lvp(is_cachepool_metadata_LVP, "lv_is_cachepool_metadata", NULL)
+lvp(is_mirror_image_LVP, "lv_is_mirror_image", NULL)
+lvp(is_mirror_log_LVP, "lv_is_mirror_log", NULL)
+lvp(is_raid_image_LVP, "lv_is_raid_image", NULL)
+lvp(is_raid_metadata_LVP, "lv_is_raid_metadata", NULL)
+
+/*
+ * is_thick_origin should be used instead of is_origin
+ * is_thick_snapshot is generally used as LV_snapshot from lv_types.h
+ */
+lvp(is_origin_LVP, "lv_is_origin", NULL)
+lvp(is_thick_origin_LVP, "lv_is_thick_origin", NULL)
+lvp(is_thick_snapshot_LVP, "lv_is_thick_snapshot", NULL)
+lvp(is_thin_origin_LVP, "lv_is_thin_origin", NULL)
+lvp(is_thin_snapshot_LVP, "lv_is_thin_snapshot", NULL)
+
+lvp(is_cache_origin_LVP, "lv_is_cache_origin", NULL)
+lvp(is_merging_cow_LVP, "lv_is_merging_cow", NULL)
+lvp(is_cow_covering_origin_LVP, "lv_is_cow_covering_origin", NULL)
+lvp(is_visible_LVP, "lv_is_visible", NULL)
+lvp(is_historical_LVP, "lv_is_historical", NULL)
+lvp(is_raid_with_tracking_LVP, "lv_is_raid_with_tracking", NULL)
+lvp(LVP_COUNT, "", NULL)
+
diff --git a/tools/lv_types.h b/tools/lv_types.h
new file mode 100644
index 0000000..22d0522
--- /dev/null
+++ b/tools/lv_types.h
@@ -0,0 +1,34 @@
+
+
+/*
+ * LV types used in command definitions. The type strings are used
+ * as LV suffixes, e.g. LV_type or LV_type1_type2.
+ *
+ * The final NULL arg can be replaced with lv_is_type() functions
+ * if the current lv_is_type #defines become functions and are
+ * moved to tools.h
+ *
+ * Until then, the lv_is_type() functions are called indirectly
+ * through _lv_is_type().
+ */
+
+lvt(LVT_NONE, "", NULL)
+lvt(linear_LVT, "linear", NULL)
+lvt(striped_LVT, "striped", NULL)
+lvt(snapshot_LVT, "snapshot", NULL) /* lv_is_cow, lv_is_thick_snapshot */
+lvt(thin_LVT, "thin", NULL)
+lvt(thinpool_LVT, "thinpool", NULL)
+lvt(cache_LVT, "cache", NULL)
+lvt(cachepool_LVT, "cachepool", NULL)
+lvt(mirror_LVT, "mirror", NULL)
+lvt(raid_LVT, "raid", NULL)
+lvt(raid0_LVT, "raid0", NULL)
+lvt(raid1_LVT, "raid1", NULL)
+lvt(raid4_LVT, "raid4", NULL)
+lvt(raid5_LVT, "raid5", NULL)
+lvt(raid6_LVT, "raid6", NULL)
+lvt(raid10_LVT, "raid10", NULL)
+lvt(error_LVT, "error", NULL)
+lvt(zero_LVT, "zero", NULL)
+lvt(LVT_COUNT, "", NULL)
+
diff --git a/tools/lvm.c b/tools/lvm.c
index b3af020..aae6da0 100644
--- a/tools/lvm.c
+++ b/tools/lvm.c
@@ -45,9 +45,9 @@ static char *_list_cmds(const char *text, int state)
len = strlen(text);
}
- while (i < _cmdline->num_commands)
- if (!strncmp(text, _cmdline->commands[i++].name, len))
- return strdup(_cmdline->commands[i - 1].name);
+ while (i < _cmdline->num_command_names)
+ if (!strncmp(text, _cmdline->command_names[i++].name, len))
+ return strdup(_cmdline->command_names[i - 1].name);
return NULL;
}
@@ -57,7 +57,7 @@ static char *_list_args(const char *text, int state)
{
static int match_no = 0;
static size_t len = 0;
- static struct command *com;
+ static struct command_name *cname;
/* Initialise if this is a new completion attempt */
if (!state) {
@@ -65,40 +65,40 @@ static char *_list_args(const char *text, int state)
int j;
match_no = 0;
- com = NULL;
+ cname = NULL;
len = strlen(text);
/* Find start of first word in line buffer */
while (isspace(*s))
s++;
- /* Look for word in list of commands */
- for (j = 0; j < _cmdline->num_commands; j++) {
+ /* Look for word in list of command names */
+ for (j = 0; j < _cmdline->num_command_names; j++) {
const char *p;
char *q = s;
- p = _cmdline->commands[j].name;
+ p = _cmdline->command_names[j].name;
while (*p == *q) {
p++;
q++;
}
if ((!*p) && *q == ' ') {
- com = _cmdline->commands + j;
+ cname = _cmdline->command_names + j;
break;
}
}
}
- if (!com)
+ if (!cname)
return NULL;
/* Short form arguments */
if (len < 3) {
- while (match_no < com->num_args) {
+ while (match_no < cname->num_args) {
char s[3];
char c;
if (!(c = (_cmdline->arg_props +
- com->valid_args[match_no++])->short_arg))
+ cname->valid_args[match_no++])->short_arg))
continue;
sprintf(s, "-%c", c);
@@ -108,13 +108,13 @@ static char *_list_args(const char *text, int state)
}
/* Long form arguments */
- if (match_no < com->num_args)
- match_no = com->num_args;
+ if (match_no < cname->num_args)
+ match_no = cname->num_args;
- while (match_no - com->num_args < com->num_args) {
+ while (match_no - cname->num_args < cname->num_args) {
const char *l;
l = (_cmdline->arg_props +
- com->valid_args[match_no++ - com->num_args])->long_arg;
+ cname->valid_args[match_no++ - cname->num_args])->long_arg;
if (*(l + 2) && !strncmp(text, l, len))
return strdup(l);
}
diff --git a/tools/lvm2cmdline.h b/tools/lvm2cmdline.h
index 80bd03e..9b75c36 100644
--- a/tools/lvm2cmdline.h
+++ b/tools/lvm2cmdline.h
@@ -19,10 +19,11 @@
struct cmd_context;
struct cmdline_context {
- struct arg_props *arg_props;
- struct command *commands;
- int num_commands;
- int commands_size;
+ struct arg_props *arg_props;
+ struct command *commands;
+ int num_commands;
+ struct command_name *command_names;
+ int num_command_names;
};
int lvm2_main(int argc, char **argv);
diff --git a/tools/lvmcmdlib.c b/tools/lvmcmdlib.c
index 64c0d8b..a1e938b 100644
--- a/tools/lvmcmdlib.c
+++ b/tools/lvmcmdlib.c
@@ -30,12 +30,12 @@ void *cmdlib_lvm2_init(unsigned static_compile)
{
struct cmd_context *cmd;
- lvm_register_commands();
-
init_is_static(static_compile);
if (!(cmd = init_lvm(1, 1)))
return NULL;
+ lvm_register_commands();
+
return (void *) cmd;
}
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index ae26957..231ef68 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -49,21 +49,106 @@ extern char *optarg;
# define OPTIND_INIT 1
#endif
+#include "command-lines-count.h"
+
+/*
+ * Table of valid --option values.
+ */
+static struct val_props _val_props[VAL_COUNT + 1] = {
+#define val(a, b, c, d) {a, b, c, d},
+#include "vals.h"
+#undef val
+};
+
/*
- * Table of valid switches
+ * Table of valid --option's
*/
static struct arg_props _arg_props[ARG_COUNT + 1] = {
-#define arg(a, b, c, d, e, f) {b, "", "--" c, d, e, f},
+#define arg(a, b, c, d, e, f) {a, b, "", "--" c, d, e, f},
#include "args.h"
#undef arg
};
+/*
+ * Table of valid command names
+ */
+#define MAX_COMMAND_NAMES 64
+struct command_name command_names[MAX_COMMAND_NAMES] = {
+#define xx(a, b, c...) { # a, b, c },
+#include "commands.h"
+#undef xx
+};
+
+/*
+ * Table of LV properties
+ */
+static struct lv_props _lv_props[LVP_COUNT + 1] = {
+#define lvp(a, b, c) {a, b, c},
+#include "lv_props.h"
+#undef lvp
+};
+
+/*
+ * Table of LV types
+ */
+static struct lv_types _lv_types[LVT_COUNT + 1] = {
+#define lvt(a, b, c) {a, b, c},
+#include "lv_types.h"
+#undef lvt
+};
+
+
+/*
+ * Table of valid command lines
+ */
+static struct command commands[COMMAND_COUNT];
static struct cmdline_context _cmdline;
+/*
+ * Table of command line functions
+ *
+ * This table could be auto-generated once all commands have been converted
+ * to use these functions instead of the old per-command-name function.
+ * For now, any command id not included here uses the old command fn.
+ */
+struct command_function command_functions[COMMAND_ID_COUNT] = {
+ { lvmconfig_general_CMD, lvmconfig },
+};
+#if 0
+ /* all raid-related type conversions */
+
+ { lvconvert_raid_types_CMD, lvconvert_raid_types_fn },
+
+ /* raid-related utilities (move into lvconvert_raid_types?) */
+
+ { lvconvert_split_mirror_images_CMD, lvconvert_split_mirror_images_fn },
+ { lvconvert_change_mirrorlog_CMD, lvconvert_change_mirrorlog_fn },
+
+ /* utilities for creating/maintaining thin and cache objects. */
+
+ { lvconvert_to_thin_with_external_CMD, lvconvert_to_thin_with_external_fn },
+ { lvconvert_to_cache_vol_CMD, lvconvert_to_cache_vol_fn },
+ { lvconvert_to_thinpool_CMD, lvconvert_to_thinpool_fn },
+ { lvconvert_to_cachepool_CMD, lvconvert_to_cachepool_fn },
+ { lvconvert_split_and_keep_cachepool_CMD, lvconvert_split_and_keep_cachepool_fn },
+ { lvconvert_split_and_delete_cachepool_CMD, lvconvert_split_and_delete_cachepool_fn },
+ { lvconvert_swap_pool_metadata_CMD, lvconvert_swap_pool_metadata_fn },
+
+ /* utilities related to snapshots and repair. */
+
+ { lvconvert_merge_CMD, lvconvert_merge_fn },
+ { lvconvert_combine_split_snapshot_CMD, lvconvert_combine_split_snapshot_fn },
+ { lvconvert_repair_pvs_or_thinpool_CMD, lvconvert_repair_pvs_or_thinpool_fn },
+ { lvconvert_replace_pv_CMD, lvconvert_replace_pv_fn },
+ { lvconvert_split_cow_snapshot_CMD, lvconvert_split_cow_snapshot_fn },
+ { lvconvert_poll_start_CMD, lvconvert_poll_start_fn },
+
+#endif
+
/* Command line args */
unsigned arg_count(const struct cmd_context *cmd, int a)
{
- return cmd->arg_values ? cmd->arg_values[a].count : 0;
+ return cmd->opt_arg_values ? cmd->opt_arg_values[a].count : 0;
}
unsigned grouped_arg_count(const struct arg_values *av, int a)
@@ -182,12 +267,12 @@ const char *arg_long_option_name(int a)
const char *arg_value(const struct cmd_context *cmd, int a)
{
- return cmd->arg_values ? cmd->arg_values[a].value : NULL;
+ return cmd->opt_arg_values ? cmd->opt_arg_values[a].value : NULL;
}
const char *arg_str_value(const struct cmd_context *cmd, int a, const char *def)
{
- return arg_is_set(cmd, a) ? cmd->arg_values[a].value : def;
+ return arg_is_set(cmd, a) ? cmd->opt_arg_values[a].value : def;
}
const char *grouped_arg_str_value(const struct arg_values *av, int a, const char *def)
@@ -217,44 +302,44 @@ int32_t first_grouped_arg_int_value(const struct cmd_context *cmd, int a, const
int32_t arg_int_value(const struct cmd_context *cmd, int a, const int32_t def)
{
return (_cmdline.arg_props[a].flags & ARG_GROUPABLE) ?
- first_grouped_arg_int_value(cmd, a, def) : (arg_is_set(cmd, a) ? cmd->arg_values[a].i_value : def);
+ first_grouped_arg_int_value(cmd, a, def) : (arg_is_set(cmd, a) ? cmd->opt_arg_values[a].i_value : def);
}
uint32_t arg_uint_value(const struct cmd_context *cmd, int a, const uint32_t def)
{
- return arg_is_set(cmd, a) ? cmd->arg_values[a].ui_value : def;
+ return arg_is_set(cmd, a) ? cmd->opt_arg_values[a].ui_value : def;
}
int64_t arg_int64_value(const struct cmd_context *cmd, int a, const int64_t def)
{
- return arg_is_set(cmd, a) ? cmd->arg_values[a].i64_value : def;
+ return arg_is_set(cmd, a) ? cmd->opt_arg_values[a].i64_value : def;
}
uint64_t arg_uint64_value(const struct cmd_context *cmd, int a, const uint64_t def)
{
- return arg_is_set(cmd, a) ? cmd->arg_values[a].ui64_value : def;
+ return arg_is_set(cmd, a) ? cmd->opt_arg_values[a].ui64_value : def;
}
/* No longer used.
const void *arg_ptr_value(struct cmd_context *cmd, int a, const void *def)
{
- return arg_is_set(cmd, a) ? cmd->arg_values[a].ptr : def;
+ return arg_is_set(cmd, a) ? cmd->opt_arg_values[a].ptr : def;
}
*/
sign_t arg_sign_value(const struct cmd_context *cmd, int a, const sign_t def)
{
- return arg_is_set(cmd, a) ? cmd->arg_values[a].sign : def;
+ return arg_is_set(cmd, a) ? cmd->opt_arg_values[a].sign : def;
}
percent_type_t arg_percent_value(const struct cmd_context *cmd, int a, const percent_type_t def)
{
- return arg_is_set(cmd, a) ? cmd->arg_values[a].percent : def;
+ return arg_is_set(cmd, a) ? cmd->opt_arg_values[a].percent : def;
}
int arg_count_increment(struct cmd_context *cmd, int a)
{
- return cmd->arg_values[a].count++;
+ return cmd->opt_arg_values[a].count++;
}
int yes_no_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av)
@@ -700,121 +785,987 @@ int readahead_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_va
/*
* Non-zero, positive integer, "all", or "unmanaged"
*/
+int vgmetadatacopies_arg(struct cmd_context *cmd, struct arg_values *av)
+{
+ if (!strcasecmp(av->value, "all")) {
+ av->ui_value = VGMETADATACOPIES_ALL;
+ return 1;
+ }
+
+ if (!strcasecmp(av->value, "unmanaged")) {
+ av->ui_value = VGMETADATACOPIES_UNMANAGED;
+ return 1;
+ }
+
+ return int_arg(cmd, av);
+}
+
+int pvmetadatacopies_arg(struct cmd_context *cmd, struct arg_values *av)
+{
+ int num;
+
+ if (!int_arg(cmd, av))
+ return 0;
+
+ num = av->i_value;
+
+ if ((num != 0) && (num != 1) && (num != 2))
+ return 0;
+
+ return 1;
+}
+
int metadatacopies_arg(struct cmd_context *cmd, struct arg_values *av)
{
- if (!strncmp(cmd->command->name, "vg", 2)) {
- if (!strcasecmp(av->value, "all")) {
- av->ui_value = VGMETADATACOPIES_ALL;
- return 1;
+ if (!strncmp(cmd->name, "pv", 2))
+ return pvmetadatacopies_arg(cmd, av);
+ if (!strncmp(cmd->name, "vg", 2))
+ return vgmetadatacopies_arg(cmd, av);
+ return 0;
+}
+
+int polloperation_arg(struct cmd_context *cmd, struct arg_values *av)
+{
+ if (!strcmp(av->value, "pvmove") ||
+ !strcmp(av->value, "convert") ||
+ !strcmp(av->value, "merge") ||
+ !strcmp(av->value, "merge_thin"))
+ return 1;
+ return 0;
+}
+
+int writemostly_arg(struct cmd_context *cmd, struct arg_values *av)
+{
+ /* Could we verify that a PV arg looks like /dev/foo ? */
+ return 1;
+}
+
+int syncaction_arg(struct cmd_context *cmd, struct arg_values *av)
+{
+ if (!strcmp(av->value, "check") ||
+ !strcmp(av->value, "repair"))
+ return 1;
+ return 0;
+}
+
+int reportformat_arg(struct cmd_context *cmd, struct arg_values *av)
+{
+ if (!strcmp(av->value, "basic") ||
+ !strcmp(av->value, "json"))
+ return 1;
+ return 0;
+}
+
+int configreport_arg(struct cmd_context *cmd, struct arg_values *av)
+{
+ if (!strcmp(av->value, "log") ||
+ !strcmp(av->value, "vg") ||
+ !strcmp(av->value, "lv") ||
+ !strcmp(av->value, "pv") ||
+ !strcmp(av->value, "pvseg") ||
+ !strcmp(av->value, "seg"))
+ return 1;
+ return 0;
+}
+
+int configtype_arg(struct cmd_context *cmd, struct arg_values *av)
+{
+ if (!strcmp(av->value, "current") ||
+ !strcmp(av->value, "default") ||
+ !strcmp(av->value, "diff") ||
+ !strcmp(av->value, "full") ||
+ !strcmp(av->value, "list") ||
+ !strcmp(av->value, "missing") ||
+ !strcmp(av->value, "new") ||
+ !strcmp(av->value, "profilable") ||
+ !strcmp(av->value, "profilable-command") ||
+ !strcmp(av->value, "profilable-metadata"))
+ return 1;
+ return 0;
+}
+
+/*
+ * FIXME: there's been a confusing mixup among:
+ * resizeable, resizable, allocatable, allocation.
+ *
+ * resizeable and allocatable are the preferred,
+ * standard option names.
+ *
+ * The dispreferred "resizable" is always translated
+ * to the preferred resizeable.
+ *
+ * But, the dispreferred "allocation" name seems
+ * to translate to either or both resizeable
+ * and allocatable, it's not clear which.
+ */
+
+static int _opt_standard_to_synonym(const char *cmd_name, int opt)
+{
+ switch (opt) {
+ case mirrorlog_ARG:
+ return corelog_ARG;
+ case resizeable_ARG:
+ return resizable_ARG;
+ case allocatable_ARG:
+ return allocation_ARG;
+ case activate_ARG:
+ return available_ARG;
+ case rebuild_ARG:
+ return raidrebuild_ARG;
+ case syncaction_ARG:
+ return raidsyncaction_ARG;
+ case writemostly_ARG:
+ return raidwritemostly_ARG;
+ case minrecoveryrate_ARG:
+ return raidminrecoveryrate_ARG;
+ case maxrecoveryrate_ARG:
+ return raidmaxrecoveryrate_ARG;
+ case writebehind_ARG:
+ return raidwritebehind_ARG;
+ case virtualsize_ARG:
+ return virtualoriginsize_ARG;
+ case pvmetadatacopies_ARG:
+ if (!strncmp(cmd_name, "pv", 2))
+ return metadatacopies_ARG;
+ return 0;
+ case vgmetadatacopies_ARG:
+ if (!strncmp(cmd_name, "vg", 2))
+ return metadatacopies_ARG;
+ return 0;
+ }
+ return 0;
+}
+
+static int _opt_synonym_to_standard(const char *cmd_name, int opt)
+{
+ switch (opt) {
+ case corelog_ARG:
+ return mirrorlog_ARG;
+ case resizable_ARG:
+ return resizeable_ARG;
+ case allocation_ARG:
+ return allocatable_ARG;
+ case available_ARG:
+ return activate_ARG;
+ case raidrebuild_ARG:
+ return rebuild_ARG;
+ case raidsyncaction_ARG:
+ return syncaction_ARG;
+ case raidwritemostly_ARG:
+ return writemostly_ARG;
+ case raidminrecoveryrate_ARG:
+ return minrecoveryrate_ARG;
+ case raidmaxrecoveryrate_ARG:
+ return maxrecoveryrate_ARG;
+ case raidwritebehind_ARG:
+ return writebehind_ARG;
+ case virtualoriginsize_ARG:
+ return virtualsize_ARG;
+ case metadatacopies_ARG:
+ if (!strncmp(cmd_name, "pv", 2))
+ return pvmetadatacopies_ARG;
+ if (!strncmp(cmd_name, "vg", 2))
+ return vgmetadatacopies_ARG;
+ return 0;
+ }
+ return 0;
+}
+
+static void _add_getopt_arg(int arg_enum, char **optstrp, struct option **longoptsp);
+
+/*
+ * The valid args for a command name in general is a union of
+ * required_opt_args and optional_opt_args for all commands[]
+ * with the given name.
+ */
+
+static void _set_valid_args_for_command_name(int ci)
+{
+ int all_args[ARG_COUNT] = { 0 };
+ int num_args = 0;
+ int opt_enum; /* foo_ARG from args.h */
+ int opt_syn;
+ int i, ro, oo;
+
+ /*
+ * all_args is indexed by the foo_ARG enum vals
+ */
+
+ for (i = 0; i < COMMAND_COUNT; i++) {
+ if (strcmp(commands[i].name, command_names[ci].name))
+ continue;
+
+ for (ro = 0; ro < commands[i].ro_count; ro++) {
+ opt_enum = commands[i].required_opt_args[ro].opt;
+ all_args[opt_enum] = 1;
+
}
+ for (oo = 0; oo < commands[i].oo_count; oo++) {
+ opt_enum = commands[i].optional_opt_args[oo].opt;
+ all_args[opt_enum] = 1;
+ }
+ }
- if (!strcasecmp(av->value, "unmanaged")) {
- av->ui_value = VGMETADATACOPIES_UNMANAGED;
- return 1;
+ for (i = 0; i < ARG_COUNT; i++) {
+ if (all_args[i]) {
+ opt_enum = _cmdline.arg_props[i].arg_enum;
+
+ command_names[ci].valid_args[num_args] = opt_enum;
+ num_args++;
+
+ /* Automatically recognize --extents in addition to --size. */
+ if (opt_enum == size_ARG) {
+ command_names[ci].valid_args[num_args] = extents_ARG;
+ num_args++;
+ }
+
+ /* Recognize synonyms */
+ if ((opt_syn = _opt_standard_to_synonym(command_names[ci].name, opt_enum))) {
+ command_names[ci].valid_args[num_args] = opt_syn;
+ num_args++;
+ }
+
+ /*
+ * "--allocation" is a weird option that seems to be
+ * a synonym for either allocatable or resizeable,
+ * each which already have their own other synonyms,
+ * so just add allocation whenever either is seen.
+ */
+ if ((opt_enum == allocatable_ARG) || (opt_enum == resizeable_ARG)) {
+ command_names[ci].valid_args[num_args] = allocation_ARG;
+ num_args++;
+ }
}
}
- return int_arg(cmd, av);
+ command_names[ci].num_args = num_args;
+}
+
+static struct command_name *_find_command_name(const char *name)
+{
+ int i;
+
+ for (i = 0; i < MAX_COMMAND_NAMES; i++) {
+ if (!command_names[i].name)
+ break;
+ if (!strcmp(command_names[i].name, name))
+ return &command_names[i];
+ }
+ return NULL;
+}
+
+static struct command_function *_find_command_function(int command_line_enum)
+{
+ int i;
+
+ if (!command_line_enum)
+ return NULL;
+
+ for (i = 0; i < COMMAND_ID_COUNT; i++) {
+ if (command_functions[i].command_line_enum == command_line_enum)
+ return &command_functions[i];
+ }
+ return NULL;
+}
+
+static void _define_commands(void)
+{
+/* command-lines.h defines command[] structs, generated from command-lines.in */
+#include "command-lines.h" /* generated from command-lines.in */
}
-static void __alloc(int size)
+void lvm_register_commands(void)
{
- if (!(_cmdline.commands = dm_realloc(_cmdline.commands, sizeof(*_cmdline.commands) * size))) {
- log_fatal("Couldn't allocate memory.");
- exit(ECMD_FAILED);
+ struct command_name *cname;
+ int i;
+
+ memset(&commands, 0, sizeof(commands));
+
+ _define_commands();
+
+ _cmdline.commands = commands;
+ _cmdline.num_commands = COMMAND_COUNT;
+
+ for (i = 0; i < COMMAND_COUNT; i++) {
+ if (!(cname = _find_command_name(commands[i].name)))
+ log_error(INTERNAL_ERROR "Failed to find command name %s.", commands[i].name);
+ commands[i].cname = cname;
+ commands[i].flags = cname->flags;
+ commands[i].functions = _find_command_function(commands[i].command_line_enum);
+ }
+
+ _cmdline.command_names = command_names;
+
+ for (i = 0; i < MAX_COMMAND_NAMES; i++) {
+ if (!command_names[i].name)
+ break;
+ _cmdline.num_command_names++;
}
- _cmdline.commands_size = size;
+ for (i = 0; i < _cmdline.num_command_names; i++)
+ _set_valid_args_for_command_name(i);
+}
+
+struct lv_props *get_lv_prop(int lvp_enum)
+{
+ if (!lvp_enum)
+ return NULL;
+ return &_lv_props[lvp_enum];
+}
+
+struct lv_types *get_lv_type(int lvt_enum)
+{
+ if (!lvt_enum)
+ return NULL;
+ return &_lv_types[lvt_enum];
}
-static void _alloc_command(void)
+/*
+ * Also see merge_synonym(). The command definitions
+ * are written using just one variation of the option
+ * name (opt below). This function checks if the user
+ * entered a synonym (arg_is_set).
+ */
+
+static int _opt_synonym_is_set(struct cmd_context *cmd, int opt_std)
{
- if (!_cmdline.commands_size)
- __alloc(32);
+ int opt_syn = _opt_standard_to_synonym(cmd->name, opt_std);
- if (_cmdline.commands_size <= _cmdline.num_commands)
- __alloc(2 * _cmdline.commands_size);
+ return opt_syn && arg_is_set(cmd, opt_syn);
}
-static void _create_new_command(const char *name, command_fn command,
- unsigned flags,
- const char *desc, const char *usagestr,
- int nargs, int *args)
+static int _command_ignore_opt_matches(struct cmd_context *cmd, int ci, int io)
{
- struct command *nc;
+ int opt_enum = commands[ci].ignore_opt_args[io].opt;
- _alloc_command();
+ if (val_bit_is_set(commands[ci].ignore_opt_args[io].def.val_bits, conststr_VAL)) {
+ if (!strcmp(commands[ci].ignore_opt_args[io].def.str, arg_str_value(cmd, opt_enum, "")))
+ return 1;
+ return 0;
+ }
- nc = _cmdline.commands + _cmdline.num_commands++;
+ if (val_bit_is_set(commands[ci].ignore_opt_args[io].def.val_bits, constnum_VAL)) {
+ if (commands[ci].ignore_opt_args[io].def.num == arg_int_value(cmd, opt_enum, 0))
+ return 1;
+ return 0;
+ }
- nc->name = name;
- nc->desc = desc;
- nc->usage = usagestr;
- nc->fn = command;
- nc->flags = flags;
- nc->num_args = nargs;
- nc->valid_args = args;
+ return 1;
}
-static void _register_command(const char *name, command_fn fn, const char *desc,
- unsigned flags, const char *usagestr, ...)
+static int _command_required_opt_matches(struct cmd_context *cmd, int ci, int ro)
{
- int nargs = 0, i;
- int *args;
- va_list ap;
+ int opt_enum = commands[ci].required_opt_args[ro].opt;
- /* count how many arguments we have */
- va_start(ap, usagestr);
- while (va_arg(ap, int) >= 0)
- nargs++;
- va_end(ap);
+ if (arg_is_set(cmd, opt_enum) || _opt_synonym_is_set(cmd, opt_enum))
+ goto check_val;
- /* allocate space for them */
- if (!(args = dm_malloc(sizeof(*args) * nargs))) {
- log_fatal("Out of memory.");
- exit(ECMD_FAILED);
+ /*
+ * For some commands, --size and --extents are interchangable,
+ * but command[] definitions use only --size.
+ */
+ if ((opt_enum == size_ARG) && arg_is_set(cmd, extents_ARG)) {
+ if (!strcmp(commands[ci].name, "lvcreate") ||
+ !strcmp(commands[ci].name, "lvresize") ||
+ !strcmp(commands[ci].name, "lvextend") ||
+ !strcmp(commands[ci].name, "lvreduce"))
+ goto check_val;
}
- /* fill them in */
- va_start(ap, usagestr);
- for (i = 0; i < nargs; i++)
- args[i] = va_arg(ap, int);
- va_end(ap);
+ return 0;
+
+ /*
+ * If the definition requires a literal string or number, check
+ * that the arg value matches.
+ */
- /* enter the command in the register */
- _create_new_command(name, fn, flags, desc, usagestr, nargs, args);
+check_val:
+ if (val_bit_is_set(commands[ci].required_opt_args[ro].def.val_bits, conststr_VAL)) {
+ if (!strcmp(commands[ci].required_opt_args[ro].def.str, arg_str_value(cmd, opt_enum, "")))
+ return 1;
+
+ /* Special case: "raid0" (any raid<N>), matches command def "raid" */
+ if (!strcmp(commands[ci].required_opt_args[ro].def.str, "raid") &&
+ !strncmp(arg_str_value(cmd, opt_enum, ""), "raid", 4))
+ return 1;
+
+ return 0;
+ }
+
+ if (val_bit_is_set(commands[ci].required_opt_args[ro].def.val_bits, constnum_VAL)) {
+ if (commands[ci].required_opt_args[ro].def.num == arg_int_value(cmd, opt_enum, 0))
+ return 1;
+ return 0;
+ }
+
+ return 1;
}
-void lvm_register_commands(void)
+static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp, char **argv)
{
-#define xx(a, b, c, d...) _register_command(# a, a, b, c, ## d, \
- driverloaded_ARG, \
- debug_ARG, help_ARG, help2_ARG, \
- version_ARG, verbose_ARG, \
- yes_ARG, \
- quiet_ARG, config_ARG, \
- commandprofile_ARG, \
- profile_ARG, -1);
-#include "commands.h"
-#undef xx
+ const char *name;
+
+ /*
+ * rp is the index in required_pos_args[] of the required positional arg.
+ * The pos values begin with 1, so the first positional arg has
+ * pos 1, rp 0.
+ */
+ if (argv[rp]) {
+ /* FIXME: can we match object type better than just checking something exists? */
+ /* Some cases could be validated by looking at defs.types and at the value. */
+ return 1;
+ }
+
+ /*
+ * If Select is specified as a pos arg, then that pos arg can be
+ * empty if --select is used.
+ */
+ if ((val_bit_is_set(commands[ci].required_pos_args[rp].def.val_bits, select_VAL)) &&
+ arg_is_set(cmd, select_ARG))
+ return 1;
+
+ /*
+ * For an lvcreate command with VG as the first required positional arg,
+ * the VG position is allowed to be empty if --name VG/LV is used, or if the
+ * LVM_VG_NAME env var is set.
+ *
+ * --thinpool VG/LV and --cachepool VG/LV can also function like --name
+ * to provide the VG name in place of the positional arg.
+ */
+ if (!strcmp(cmd->name, "lvcreate") &&
+ (rp == 0) &&
+ val_bit_is_set(commands[ci].required_pos_args[rp].def.val_bits, vg_VAL) &&
+ (arg_is_set(cmd, name_ARG) || arg_is_set(cmd, thinpool_ARG) || arg_is_set(cmd, cachepool_ARG))) {
+ if ((name = arg_str_value(cmd, name_ARG, NULL))) {
+ if (strstr(name, "/") || getenv("LVM_VG_NAME"))
+ return 1;
+ }
+
+ /* FIXME: does LVM_VG_NAME also work with --thinpool/--cachepool ? */
+
+ if ((name = arg_str_value(cmd, thinpool_ARG, NULL))) {
+ if (strstr(name, "/"))
+ return 1;
+ }
+
+ if ((name = arg_str_value(cmd, cachepool_ARG, NULL))) {
+ if (strstr(name, "/"))
+ return 1;
+ }
+ }
+
+ return 0;
}
-static struct command *_find_command(const char *name)
+
+#define HELP_LINE_SIZE 1024
+
+static void _print_usage(const char *usage, int only_required)
{
- int i;
- const char *base;
+ char buf[HELP_LINE_SIZE];
+ int optional_ui = 0;
+ int optional_pos_ui = 0;
+ int ui;
+ int bi;
- base = last_path_component(name);
+ if (!usage || !strlen(usage))
+ return;
- for (i = 0; i < _cmdline.num_commands; i++) {
- if (!strcmp(base, _cmdline.commands[i].name))
+ /*
+ * copy the required opt_args/pos_args
+ *
+ * The optional portions of the usage string are enclosed
+ * in [] and follow the required portions.
+ *
+ * The optional portion begins with [ followed by a space,
+ * i.e. "[ " to distinguish the option usage which may
+ * include [ in cases like --option Number[units].
+ */
+
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+
+ for (ui = 0; ui < strlen(usage); ui++) {
+ if (!bi && ((usage[ui] == ' ') || (usage[ui] == '\n')))
+ continue;
+
+ /* The first "[ " indicates the start of the optional opt_args. */
+ if ((usage[ui] == '[') && (usage[ui+1] == ' ')) {
+ optional_ui = ui;
+ break;
+ }
+
+ if (usage[ui] == '\0')
+ break;
+
+ if (usage[ui] == '(') {
+ buf[bi++] = '\n';
+ buf[bi++] = '\t';
+ }
+
+ buf[bi++] = usage[ui];
+
+ if (usage[ui] == ')') {
+ buf[bi++] = '\n';
+ buf[bi++] = '\t';
+ }
+
+ if (usage[ui] == ',') {
+ buf[bi++] = '\n';
+ buf[bi++] = '\t';
+ buf[bi++] = ' ';
+ }
+
+ if (bi == (HELP_LINE_SIZE - 1))
break;
}
- if (i >= _cmdline.num_commands)
- return 0;
+ /*
+ * print the required opt_args/pos_args
+ */
+
+ if (bi)
+ log_print("%s", buf);
+
+ if (only_required)
+ return;
+
+ /*
+ * copy the optional opt_args
+ */
+
+ if (!optional_ui)
+ goto out;
+
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+
+ for (ui = optional_ui; ui < strlen(usage); ui++) {
+
+ /* The second "[ " indicates the start of the optional pos_args. */
+ if ((ui > optional_ui) && (usage[ui] == '[') && (usage[ui+1] == ' ')) {
+ optional_pos_ui = ui;
+ break;
+ }
+
+ if (usage[ui] == '\0')
+ break;
+ if (usage[ui] == '\n')
+ break;
+
+ if (!bi)
+ buf[bi++] = '\t';
+
+ buf[bi++] = usage[ui];
+
+ if (usage[ui] == ',') {
+ buf[bi++] = '\n';
+ buf[bi++] = '\t';
+ buf[bi++] = ' ';
+ }
+
+ if (bi == (HELP_LINE_SIZE - 1))
+ break;
+ }
+
+ /*
+ * print the optional opt_args
+ */
+
+ if (bi)
+ log_print("%s", buf);
+
+ /*
+ * copy the optional pos_args
+ */
+
+ if (!optional_pos_ui)
+ goto out;
+
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+
+ for (ui = optional_pos_ui; ui < strlen(usage); ui++) {
+ if (usage[ui] == '\0')
+ break;
+ if (usage[ui] == '\n')
+ break;
- return _cmdline.commands + i;
+ if (!bi)
+ buf[bi++] = '\t';
+
+ buf[bi++] = usage[ui];
+
+ if (bi == (HELP_LINE_SIZE - 1))
+ break;
+ }
+
+ /*
+ * print the optional pos_args
+ */
+
+ if (bi)
+ log_print("%s", buf);
+ out:
+ return;
+}
+
+static void _print_description(int ci)
+{
+ const char *desc = _cmdline.commands[ci].desc;
+ char buf[HELP_LINE_SIZE] = {0};
+ int di = 0;
+ int bi = 0;
+
+ for (di = 0; di < strlen(desc); di++) {
+ if (!strncmp(&desc[di], "DESC:", 5)) {
+ if (bi) {
+ buf[bi] = '\0';
+ log_print("%s", buf);
+ memset(buf, 0, sizeof(buf));
+ bi = 0;
+ }
+ /* skip DESC: */
+ di += 5;
+ continue;
+ }
+
+ if (!bi && desc[di] == ' ')
+ continue;
+
+ buf[bi++] = desc[di];
+
+ if (bi == (HELP_LINE_SIZE - 1))
+ break;
+ }
+
+ if (bi) {
+ buf[bi] = '\0';
+ log_print("%s", buf);
+ }
+}
+
+/*
+ * Match what the user typed with a one specific command definition/prototype
+ * from commands[]. If nothing matches, it's not a valid command. The match
+ * is based on command name, required opt args and required pos args.
+ *
+ * Find an entry in the commands array that matches based the arg values.
+ *
+ * If the cmd has opt or pos args set that are not accepted by command,
+ * we can: silently ignore them, warn they are not being used, or fail.
+ * Default should probably be to warn and continue.
+ *
+ * For each command[i], check how many required opt/pos args cmd matches.
+ * Save the command[i] that matches the most.
+ *
+ * commands[i].cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT means
+ * any one item from commands[i].required_opt_args needs to be
+ * set to match.
+ *
+ * required_pos_args[0].types & select_VAL means
+ * argv[] in that pos can be NULL if arg_is_set(select_ARG)
+ */
+
+/* The max number of unused options we keep track of to warn about */
+#define MAX_UNUSED_COUNT 8
+
+static struct command *_find_command(struct cmd_context *cmd, const char *path, int *argc, char **argv)
+{
+ const char *name;
+ char buf[64];
+ int match_required, match_ro, match_rp, match_type, match_unused, mismatch_required;
+ int best_i = 0, best_required = 0, best_type = 0, best_unused = 0;
+ int close_i = 0, close_ro = 0, close_type;
+ int temp_unused_options[MAX_UNUSED_COUNT];
+ int temp_unused_count;
+ int best_unused_options[MAX_UNUSED_COUNT] = { 0 };
+ int best_unused_count = 0;
+ int opts_match_count, opts_unmatch_count;
+ int ro, rp;
+ int i, j;
+ int opt_enum, opt_i;
+ int accepted, count;
+
+ name = last_path_component(path);
+
+ for (i = 0; i < COMMAND_COUNT; i++) {
+ if (strcmp(name, commands[i].name))
+ continue;
+
+ /* For help and version just return the first entry with matching name. */
+ if (arg_is_set(cmd, help_ARG) || arg_is_set(cmd, help2_ARG) || arg_is_set(cmd, version_ARG))
+ return &commands[i];
+
+ match_required = 0; /* required parameters that match */
+ match_ro = 0; /* required opt_args that match */
+ match_rp = 0; /* required pos_args that match */
+ match_type = 0; /* type arg matches */
+ match_unused = 0; /* options set that are not accepted by command */
+ mismatch_required = 0; /* required parameters that do not match */
+ temp_unused_count = 0;
+ memset(&temp_unused_options, 0, sizeof(temp_unused_options));
+
+ /* if the command name alone is enough, then that's a match */
+
+ if (!commands[i].ro_count && !commands[i].rp_count)
+ match_required = 1;
+
+ /* match required_opt_args */
+
+ for (ro = 0; ro < commands[i].ro_count; ro++) {
+ if (_command_required_opt_matches(cmd, i, ro)) {
+ /* log_warn("match %d ro opt %d", i, commands[i].required_opt_args[ro].opt); */
+ match_required++;
+ match_ro++;
+
+ if (commands[i].required_opt_args[ro].opt == type_ARG)
+ match_type = 1;
+ } else {
+ /* cmd is missing a required opt arg */
+ /* log_warn("mismatch %d ro opt %d", i, commands[i].required_opt_args[ro].opt); */
+ mismatch_required++;
+ }
+ }
+
+ /*
+ * Special case where missing required_opt_arg's does not matter
+ * if one required_opt_arg did match.
+ */
+ if (commands[i].cmd_flags & CMD_FLAG_ONE_REQUIRED_OPT) {
+ if (match_ro) {
+ /* one or more of the required_opt_args is used */
+ mismatch_required = 0;
+ } else {
+ /* not even one of the required_opt_args is used */
+ mismatch_required = 1;
+ }
+ }
+
+ /* match required_pos_args */
+
+ for (rp = 0; rp < commands[i].rp_count; rp++) {
+ if (_command_required_pos_matches(cmd, i, rp, argv)) {
+ /* log_warn("match %d rp %d", i, commands[i].required_pos_args[rp].pos); */
+ match_required++;
+ match_rp++;
+ } else {
+ /* cmd is missing a required pos arg */
+ /* log_warn("mismatch %d rp %d", i, commands[i].required_pos_args[rp].pos); */
+ mismatch_required++;
+ }
+ }
+
+ /* if cmd is missing any required opt/pos args, it can't be this command. */
+
+ if (mismatch_required) {
+ /* save "closest" command that doesn't match */
+ if ((match_type && !close_type) ||
+ ((match_type == close_type) && (match_ro > close_ro))) {
+ close_i = i;
+ close_ro = match_ro;
+ close_type = match_type;
+ }
+ continue;
+ }
+
+ if (!match_required)
+ continue;
+
+ /* Count the command name as a match if all the required opt/pos args match. */
+
+ if ((commands[i].ro_count || commands[i].rp_count) && (match_ro || match_rp))
+ match_required++;
+
+ /* log_warn("command %d has match_required %d match_ro %d match_rp %d",
+ i, match_required, match_ro, match_rp); */
+
+ /* Count how many options cmd has set that are not accepted by commands[i]. */
+ /* FIXME: also count unused positional args? */
+
+ for (opt_i = 0; opt_i < ARG_COUNT; opt_i++) {
+ if (!arg_is_set(cmd, opt_i))
+ continue;
+
+ if (!(opt_enum = _opt_synonym_to_standard(cmd->name, opt_i)))
+ opt_enum = opt_i;
+
+ /* extents are not used in command definitions */
+ if (opt_enum == extents_ARG)
+ continue;
+
+ accepted = 0;
+
+ /* NB in some cases required_opt_args are optional */
+ for (j = 0; j < commands[i].ro_count; j++) {
+ if (commands[i].required_opt_args[j].opt == opt_enum) {
+ accepted = 1;
+ break;
+ }
+ }
+
+ if (accepted)
+ continue;
+
+ for (j = 0; j < commands[i].oo_count; j++) {
+ if (commands[i].optional_opt_args[j].opt == opt_enum) {
+ accepted = 1;
+ break;
+ }
+ }
+
+ for (j = 0; j < commands[i].io_count; j++) {
+ if ((commands[i].ignore_opt_args[j].opt == opt_enum) &&
+ _command_ignore_opt_matches(cmd, i, j)) {
+ accepted = 1;
+ break;
+ }
+ }
+
+ if (!accepted) {
+ match_unused++;
+ if (temp_unused_count < MAX_UNUSED_COUNT)
+ temp_unused_options[temp_unused_count++] = opt_enum;
+ }
+ }
+
+ /*
+ * Choose the best match, which in general is the command with
+ * the most matching required_{opt,pos}.
+ *
+ * A match is better if:
+ * . more required opt/pos args match
+ * . type arg matches when other doesn't
+ * . those being equal, less unused options
+ */
+
+ if (!best_required || (match_required > best_required) || (match_type > best_type) ||
+ ((match_required == best_required) && (match_type == best_type) && (match_unused < best_unused))) {
+ /* log_warn("best %d has match_required %d match_ro %d match_rp %d",
+ i, match_required, match_ro, match_rp); */
+ best_i = i;
+ best_required = match_required;
+ best_type = match_type;
+ best_unused = match_unused;
+ best_unused_count = temp_unused_count;
+ memcpy(&best_unused_options, &temp_unused_options, sizeof(best_unused_options));
+ }
+ }
+
+ if (!best_required) {
+ /* cmd did not have all the required opt/pos args of any command */
+ log_error("Failed to find a matching command definition.");
+ if (close_ro) {
+ log_warn("Closest command usage is:");
+ _print_usage(_cmdline.commands[close_i].usage, 1);
+ }
+ return NULL;
+ }
+
+ /*
+ * If the user passed an option that is not accepted by the matched
+ * command, then fail.
+ *
+ * FIXME: it might be nice to have a config setting that would turn
+ * these into warnings, and just ignore the unused options.
+ */
+
+ if (best_unused_count) {
+ for (i = 0; i < best_unused_count; i++) {
+ log_error("Invalid option for command (%s %d): %s.",
+ commands[best_i].command_line_id, best_i,
+ arg_long_option_name(best_unused_options[i]));
+ }
+ return NULL;
+ }
+
+ /*
+ * If the user provided a positional arg that is not accepted by
+ * the mached command, then fail.
+ *
+ * If the last required_pos_arg or the last optional_pos_arg may repeat,
+ * then there won't be unused positional args.
+ *
+ * FIXME: same question as above, should there be a config setting
+ * to just warn/ignore about unused positional args?
+ */
+
+ count = commands[best_i].rp_count;
+ if (count && (commands[best_i].required_pos_args[count - 1].def.flags & ARG_DEF_FLAG_MAY_REPEAT))
+ goto out;
+
+ count = commands[best_i].op_count;
+ if (count && (commands[best_i].optional_pos_args[count - 1].def.flags & ARG_DEF_FLAG_MAY_REPEAT))
+ goto out;
+
+ for (count = 0; ; count++) {
+ if (!argv[count])
+ break;
+
+ if (count >= (commands[best_i].rp_count + commands[best_i].op_count)) {
+ log_error("Invalid positional argument for command (%s %d): %s.",
+ commands[best_i].command_line_id, best_i, argv[count]);
+
+ /* FIXME: to warn/ignore, clear so it can't be used when processing. */
+ /*
+ argv[count] = NULL;
+ (*argc)--;
+ */
+ return NULL;
+ }
+ }
+
+out:
+ /*
+ * Check any rules related to option combinations.
+ * Other rules are checked after VG is read.
+ */
+
+ for (i = 0; i < commands[best_i].rule_count; i++) {
+ struct cmd_rule *rule;
+ rule = &commands[best_i].rules[i];
+
+ /*
+ * The rule wants to validate options (check_opts). That can be
+ * done here if the only qualification for the validation is
+ * other options (and not specific LV type or LV property which
+ * are not known here.)
+ */
+
+ if (rule->check_opts_count && !rule->lvt_bits && !rule->lvp_bits) {
+ /*
+ * When no opt is specified for applying the rule, then
+ * the rule is always applied, otherwise the rule is
+ * applied when the specific option is set.
+ */
+ if (rule->opts_count &&
+ !opt_in_list_is_set(cmd, rule->opts, rule->opts_count, NULL, NULL))
+ continue;
+
+ opt_in_list_is_set(cmd, rule->check_opts, rule->check_opts_count,
+ &opts_match_count, &opts_unmatch_count);
+
+ if (opts_match_count && (rule->rule == RULE_INVALID)) {
+ memset(buf, 0, sizeof(buf));
+ opt_array_to_str(cmd, rule->check_opts, rule->check_opts_count, buf, sizeof(buf));
+ log_error("Invalid options for command (%s %d): %s",
+ commands[best_i].command_line_id, best_i, buf);
+ return NULL;
+ }
+
+ if (opts_unmatch_count && (rule->rule == RULE_REQUIRE)) {
+ memset(buf, 0, sizeof(buf));
+ opt_array_to_str(cmd, rule->check_opts, rule->check_opts_count, buf, sizeof(buf));
+ log_error("Required options for command (%s %d): %s",
+ commands[best_i].command_line_id, best_i, buf);
+ return NULL;
+ }
+ }
+ }
+
+ log_debug("command line id: %s %d", commands[best_i].command_line_id, best_i);
+
+ return &commands[best_i];
}
static void _short_usage(const char *name)
@@ -822,110 +1773,234 @@ static void _short_usage(const char *name)
log_error("Run `%s --help' for more information.", name);
}
-static int _usage(const char *name)
+static int _usage(const char *name, int help_count)
{
- struct command *com = _find_command(name);
+ struct command_name *cname = _find_command_name(name);
+ const char *usage_common = NULL;
+ int i;
- if (!com) {
+ if (!cname) {
log_print("%s: no such command.", name);
return 0;
}
- log_print("%s: %s\n\n%s", com->name, com->desc, com->usage);
+ log_print("%s - %s\n", name, cname->desc);
+
+ for (i = 0; i < _cmdline.num_commands; i++) {
+ if (strcmp(_cmdline.commands[i].name, name))
+ continue;
+
+ if ((_cmdline.commands[i].cmd_flags & CMD_FLAG_SECONDARY_SYNTAX) && (help_count < 3))
+ continue;
+
+ if (strlen(_cmdline.commands[i].desc))
+ _print_description(i);
+
+ usage_common = _cmdline.commands[i].usage_common;
+
+ _print_usage(_cmdline.commands[i].usage, 0);
+ log_print(" "); /* for built-in \n */
+ }
+
+ /* Common options are printed once for all variants of a command name. */
+ if (usage_common) {
+ log_print("Common options:");
+ _print_usage(usage_common, 0);
+ log_print(" "); /* for built-in \n */
+ }
+
+ if (help_count > 1) {
+ /*
+ * Excluding commonly understood syntax style like the meanings of:
+ * [ ] for optional, ... for repeatable, | for one of the following,
+ * -- for an option name, lower case strings and digits for literals.
+ */
+ log_print("Usage notes:");
+ log_print(". Variable parameters are: Number, String, PV, VG, LV, Tag.");
+ log_print(". Select indicates that a required positional parameter can");
+ log_print(" be omitted if the --select option is used.");
+ log_print(". --size Number can be replaced with --extents NumberExtents.");
+ log_print(". When --name is omitted from lvcreate, a new LV name is");
+ log_print(" generated with the \"lvol\" prefix and a unique numeric suffix.");
+ log_print(". The required VG parameter in lvcreate may be omitted when");
+ log_print(" the VG name is included in another option, e.g. --name VG/LV.");
+ log_print(". For required options listed in parentheses, e.g. (--A, --B),");
+ log_print(" any one is required, after which the others are optional.");
+ log_print(". The _new suffix indicates the VG or LV must not yet exist.");
+ log_print(". LV followed by _<type> indicates that an LV of the given type");
+ log_print(" is required. (raid represents any raid<N> type.)");
+ log_print(". Input units are always treated as base two values, regardless of");
+ log_print(" unit capitalization, e.g. 'k' and 'K' both refer to 1024.");
+ log_print(". The default input unit is specified by letter, followed by |unit");
+ log_print(" which represents other possible input units: bBsSkKmMgGtTpPeE.");
+ log_print(". Output units can be specified with the --units option, for which");
+ log_print(" lower/upper case letters refer to base 2/10 values.");
+ log_print(". Use --help --help --help to print secondary command syntax");
+ log_print(" formats that are recognized, e.g. for compatibility.");
+ log_print(". See man pages for short option equivalents of long option names,");
+ log_print(" and for more detailed descriptions of variable parameters.");
+ }
+
return 1;
}
/*
+ * Sets up the arguments to pass to getopt_long().
+ *
+ * getopt_long() takes a string of short option characters
+ * where the char is followed by ":" if the option takes an arg,
+ * e.g. "abc:d:" This string is created in optstrp.
+ *
+ * getopt_long() also takes an array of struct option which
+ * has the name of the long option, if it takes an arg, etc,
+ * e.g.
+ *
+ * option long_options[] = {
+ * { "foo", required_argument, 0, 0 },
+ * { "bar", no_argument, 0, 'b' }
+ * };
+ *
+ * this array is created in longoptsp.
+ *
+ * Original comment:
* Sets up the short and long argument. If there
* is no short argument then the index of the
* argument in the the_args array is set as the
* long opt value. Yuck. Of course this means we
* can't have more than 'a' long arguments.
*/
-static void _add_getopt_arg(int arg, char **ptr, struct option **o)
+
+static void _add_getopt_arg(int arg_enum, char **optstrp, struct option **longoptsp)
{
- struct arg_props *a = _cmdline.arg_props + arg;
+ struct arg_props *a = _cmdline.arg_props + arg_enum;
if (a->short_arg) {
- *(*ptr)++ = a->short_arg;
+ *(*optstrp)++ = a->short_arg;
- if (a->fn)
- *(*ptr)++ = ':';
+ if (a->val_enum)
+ *(*optstrp)++ = ':';
}
#ifdef HAVE_GETOPTLONG
+ /* long_arg is "--foo", so +2 is the offset of the name after "--" */
+
if (*(a->long_arg + 2)) {
- (*o)->name = a->long_arg + 2;
- (*o)->has_arg = a->fn ? 1 : 0;
- (*o)->flag = NULL;
+ (*longoptsp)->name = a->long_arg + 2;
+ (*longoptsp)->has_arg = a->val_enum ? 1 : 0;
+ (*longoptsp)->flag = NULL;
+
+ /*
+ * When getopt_long() sees an option that has an associated
+ * single letter, it returns the ascii value of that letter.
+ * e.g. getopt_long() returns 100 for '-d' or '--debug'
+ * (100 is the ascii value of 'd').
+ *
+ * When getopt_long() sees an option that does not have an
+ * associated single letter, it returns the value of the
+ * the enum for that long option name plus 128.
+ * e.g. getopt_long() returns 139 for --cachepool
+ * (11 is the enum value for --cachepool, so 11+128)
+ */
+
if (a->short_arg)
- (*o)->val = a->short_arg;
+ (*longoptsp)->val = a->short_arg;
else
- (*o)->val = arg + 128;
- (*o)++;
+ (*longoptsp)->val = arg_enum + 128;
+ (*longoptsp)++;
}
#endif
}
-static int _find_arg(struct command *com, int opt)
+/*
+ * getopt_long() has returned goval which indicates which option it's found.
+ * We need to translate that goval to an enum value from the args array.
+ *
+ * For options with both long and short forms, goval is the character value
+ * of the short option. For options with only a long form, goval is the
+ * corresponding enum value plus 128.
+ *
+ * The trick with character values is that different long options share the
+ * same single-letter short form. So, we have to translate goval to an
+ * enum using only the set of valid options for the given command. And,
+ * a command name is not allowed to use two different long options that
+ * have the same single-letter short form.
+ */
+
+static int _find_arg(const char *cmd_name, int goval)
{
- struct arg_props *a;
- int i, arg;
+ struct command_name *cname;
+ int arg_enum;
+ int i;
- for (i = 0; i < com->num_args; i++) {
- arg = com->valid_args[i];
- a = _cmdline.arg_props + arg;
+ if (!(cname = _find_command_name(cmd_name)))
+ return -1;
- /*
- * opt should equal either the
- * short arg, or the index into
- * the_args.
- */
- if ((a->short_arg && (opt == a->short_arg)) ||
- (!a->short_arg && (opt == (arg + 128))))
- return arg;
+ for (i = 0; i < cname->num_args; i++) {
+ arg_enum = cname->valid_args[i];
+
+ /* assert arg_enum == _cmdline.arg_props[arg_enum].arg_enum */
+
+ /* the value returned by getopt matches the ascii value of single letter option */
+ if (_cmdline.arg_props[arg_enum].short_arg && (goval == _cmdline.arg_props[arg_enum].short_arg))
+ return arg_enum;
+
+ /* the value returned by getopt matches the enum value plus 128 */
+ if (!_cmdline.arg_props[arg_enum].short_arg && (goval == (arg_enum + 128)))
+ return arg_enum;
}
return -1;
}
-static int _process_command_line(struct cmd_context *cmd, int *argc,
- char ***argv)
+static int _process_command_line(struct cmd_context *cmd, int *argc, char ***argv)
{
- int i, opt, arg;
char str[((ARG_COUNT + 1) * 2) + 1], *ptr = str;
struct option opts[ARG_COUNT + 1], *o = opts;
struct arg_props *a;
struct arg_values *av;
struct arg_value_group_list *current_group = NULL;
+ struct command_name *cname;
+ int arg_enum; /* e.g. foo_ARG */
+ int goval; /* the number returned from getopt_long identifying what it found */
+ int i;
+
+ if (!(cname = _find_command_name(cmd->name)))
+ return_0;
- if (!(cmd->arg_values = dm_pool_zalloc(cmd->mem, sizeof(*cmd->arg_values) * ARG_COUNT))) {
+ if (!(cmd->opt_arg_values = dm_pool_zalloc(cmd->mem, sizeof(*cmd->opt_arg_values) * ARG_COUNT))) {
log_fatal("Unable to allocate memory for command line arguments.");
return 0;
}
- /* fill in the short and long opts */
- for (i = 0; i < cmd->command->num_args; i++)
- _add_getopt_arg(cmd->command->valid_args[i], &ptr, &o);
+ /*
+ * create the short-form character array (str) and the long-form option
+ * array (opts) to pass to the getopt_long() function. IOW we generate
+ * the arguments to pass to getopt_long() from the args.h/arg_props data.
+ */
+ for (i = 0; i < cname->num_args; i++)
+ _add_getopt_arg(cname->valid_args[i], &ptr, &o);
*ptr = '\0';
memset(o, 0, sizeof(*o));
- /* initialise getopt_long & scan for command line switches */
optarg = 0;
optind = OPTIND_INIT;
- while ((opt = GETOPTLONG_FN(*argc, *argv, str, opts, NULL)) >= 0) {
+ while ((goval = GETOPTLONG_FN(*argc, *argv, str, opts, NULL)) >= 0) {
- if (opt == '?')
+ if (goval == '?')
return 0;
- if ((arg = _find_arg(cmd->command, opt)) < 0) {
+ /*
+ * translate the option value used by getopt into the enum
+ * value (e.g. foo_ARG) from the args array.
+ */
+ if ((arg_enum = _find_arg(cmd->name, goval)) < 0) {
log_fatal("Unrecognised option.");
return 0;
}
- a = _cmdline.arg_props + arg;
+ a = _cmdline.arg_props + arg_enum;
- av = &cmd->arg_values[arg];
+ av = &cmd->opt_arg_values[arg_enum];
if (a->flags & ARG_GROUPABLE) {
/*
@@ -935,10 +2010,10 @@ static int _process_command_line(struct cmd_context *cmd, int *argc,
* - or if argument has higher priority than current group.
*/
if (!current_group ||
- (current_group->arg_values[arg].count && !(a->flags & ARG_COUNTABLE)) ||
+ (current_group->arg_values[arg_enum].count && !(a->flags & ARG_COUNTABLE)) ||
(current_group->prio < a->prio)) {
/* FIXME Reduce size including only groupable args */
- if (!(current_group = dm_pool_zalloc(cmd->mem, sizeof(struct arg_value_group_list) + sizeof(*cmd->arg_values) * ARG_COUNT))) {
+ if (!(current_group = dm_pool_zalloc(cmd->mem, sizeof(struct arg_value_group_list) + sizeof(*cmd->opt_arg_values) * ARG_COUNT))) {
log_fatal("Unable to allocate memory for command line arguments.");
return 0;
}
@@ -948,7 +2023,7 @@ static int _process_command_line(struct cmd_context *cmd, int *argc,
}
/* Maintain total argument count as well as count within each group */
av->count++;
- av = ¤t_group->arg_values[arg];
+ av = ¤t_group->arg_values[arg_enum];
}
if (av->count && !(a->flags & ARG_COUNTABLE)) {
@@ -960,7 +2035,7 @@ static int _process_command_line(struct cmd_context *cmd, int *argc,
return 0;
}
- if (a->fn) {
+ if (a->val_enum) {
if (!optarg) {
log_error("Option requires argument.");
return 0;
@@ -968,7 +2043,7 @@ static int _process_command_line(struct cmd_context *cmd, int *argc,
av->value = optarg;
- if (!a->fn(cmd, av)) {
+ if (!_val_props[a->val_enum].fn(cmd, av)) {
log_error("Invalid argument for %s: %s", a->long_arg, optarg);
return 0;
}
@@ -1010,12 +2085,12 @@ static int _merge_synonym(struct cmd_context *cmd, int oldarg, int newarg)
/* Not groupable? */
if (!(_cmdline.arg_props[oldarg].flags & ARG_GROUPABLE)) {
if (arg_is_set(cmd, oldarg))
- _copy_arg_values(cmd->arg_values, oldarg, newarg);
+ _copy_arg_values(cmd->opt_arg_values, oldarg, newarg);
return 1;
}
if (arg_is_set(cmd, oldarg))
- cmd->arg_values[newarg].count = cmd->arg_values[oldarg].count;
+ cmd->opt_arg_values[newarg].count = cmd->opt_arg_values[oldarg].count;
/* Groupable */
dm_list_iterate_items(current_group, &cmd->arg_value_groups) {
@@ -1052,15 +2127,10 @@ int version(struct cmd_context *cmd __attribute__((unused)),
return ECMD_PROCESSED;
}
-static int _get_settings(struct cmd_context *cmd)
+static void _get_output_settings(struct cmd_context *cmd)
{
- const char *activation_mode;
-
- cmd->current_settings = cmd->default_settings;
-
if (arg_is_set(cmd, debug_ARG))
- cmd->current_settings.debug = _LOG_FATAL +
- (arg_count(cmd, debug_ARG) - 1);
+ cmd->current_settings.debug = _LOG_FATAL + (arg_count(cmd, debug_ARG) - 1);
if (arg_is_set(cmd, verbose_ARG))
cmd->current_settings.verbose = arg_count(cmd, verbose_ARG);
@@ -1070,6 +2140,19 @@ static int _get_settings(struct cmd_context *cmd)
cmd->current_settings.verbose = 0;
cmd->current_settings.silent = (arg_count(cmd, quiet_ARG) > 1) ? 1 : 0;
}
+}
+
+static void _apply_output_settings(struct cmd_context *cmd)
+{
+ init_debug(cmd->current_settings.debug);
+ init_debug_classes_logged(cmd->default_settings.debug_classes);
+ init_verbose(cmd->current_settings.verbose + VERBOSE_BASE_LEVEL);
+ init_silent(cmd->current_settings.silent);
+}
+
+static int _get_settings(struct cmd_context *cmd)
+{
+ const char *activation_mode;
if (arg_is_set(cmd, test_ARG))
cmd->current_settings.test = arg_is_set(cmd, test_ARG);
@@ -1183,9 +2266,9 @@ static int _get_settings(struct cmd_context *cmd)
!_merge_synonym(cmd, raidwritebehind_ARG, writebehind_ARG))
return EINVALID_CMD_LINE;
- if ((!strncmp(cmd->command->name, "pv", 2) &&
+ if ((!strncmp(cmd->name, "pv", 2) &&
!_merge_synonym(cmd, metadatacopies_ARG, pvmetadatacopies_ARG)) ||
- (!strncmp(cmd->command->name, "vg", 2) &&
+ (!strncmp(cmd->name, "vg", 2) &&
!_merge_synonym(cmd, metadatacopies_ARG, vgmetadatacopies_ARG)))
return EINVALID_CMD_LINE;
@@ -1196,7 +2279,10 @@ static int _get_settings(struct cmd_context *cmd)
static int _process_common_commands(struct cmd_context *cmd)
{
if (arg_is_set(cmd, help_ARG) || arg_is_set(cmd, help2_ARG)) {
- _usage(cmd->command->name);
+ _usage(cmd->name, arg_count(cmd, help_ARG));
+
+ if (arg_count(cmd, help_ARG) < 2)
+ log_print("(Use --help --help for usage notes.)");
return ECMD_PROCESSED;
}
@@ -1216,10 +2302,10 @@ static void _display_help(void)
log_error("Use 'lvm help <command>' for more information");
log_error(" ");
- for (i = 0; i < _cmdline.num_commands; i++) {
- struct command *com = _cmdline.commands + i;
+ for (i = 0; i < _cmdline.num_command_names; i++) {
+ struct command_name *cname = _cmdline.command_names + i;
- log_error("%-16.16s%s", com->name, com->desc);
+ log_error("%-16.16s%s", cname->name, cname->desc);
}
}
@@ -1232,7 +2318,7 @@ int help(struct cmd_context *cmd __attribute__((unused)), int argc, char **argv)
else {
int i;
for (i = 0; i < argc; i++)
- if (!_usage(argv[i]))
+ if (!_usage(argv[i], 0))
ret = EINVALID_CMD_LINE;
}
@@ -1241,10 +2327,6 @@ int help(struct cmd_context *cmd __attribute__((unused)), int argc, char **argv)
static void _apply_settings(struct cmd_context *cmd)
{
- init_debug(cmd->current_settings.debug);
- init_debug_classes_logged(cmd->default_settings.debug_classes);
- init_verbose(cmd->current_settings.verbose + VERBOSE_BASE_LEVEL);
- init_silent(cmd->current_settings.silent);
init_test(cmd->current_settings.test);
init_full_scan_done(0);
init_mirror_in_sync(0);
@@ -1439,7 +2521,7 @@ static int _prepare_profiles(struct cmd_context *cmd)
log_debug(_setting_global_profile_msg, _command_profile_source_name, profile->name);
cmd->profile_params->global_command_profile = profile;
- if (!cmd->arg_values)
+ if (!cmd->opt_arg_values)
cmd->profile_params->shell_profile = profile;
}
@@ -1523,6 +2605,8 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
/* each command should start out with sigint flag cleared */
sigint_clear();
+ cmd->name = strdup(argv[0]);
+
/* eliminate '-' from all options starting with -- */
for (i = 1; i < argc; i++) {
@@ -1556,20 +2640,36 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
*arg_new = '\0';
}
+ /* The cmd_line string is only used for logging, not processing. */
if (!(cmd->cmd_line = _copy_command_line(cmd, argc, argv)))
return_ECMD_FAILED;
- log_debug("Parsing: %s", cmd->cmd_line);
-
- if (!(cmd->command = _find_command(argv[0])))
- return ENO_SUCH_CMD;
-
if (!_process_command_line(cmd, &argc, &argv)) {
log_error("Error during parsing of command line.");
return EINVALID_CMD_LINE;
}
- set_cmd_name(cmd->command->name);
+ /*
+ * log_debug() can be enabled now that we know the settings
+ * from the command. Previous calls to log_debug() will
+ * do nothing.
+ */
+ cmd->current_settings = cmd->default_settings;
+ _get_output_settings(cmd);
+ _apply_output_settings(cmd);
+
+ log_debug("Parsing: %s", cmd->cmd_line);
+
+ if (!(cmd->command = _find_command(cmd, cmd->name, &argc, argv)))
+ return EINVALID_CMD_LINE;
+
+ /*
+ * Remaining position args after command name and --options are removed.
+ */
+ cmd->position_argc = argc;
+ cmd->position_argv = argv;
+
+ set_cmd_name(cmd->name);
if (arg_is_set(cmd, backgroundfork_ARG)) {
if (!become_daemon(cmd, 1)) {
@@ -1725,10 +2825,12 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
}
}
- /*
- * FIXME Break up into multiple functions.
- */
- ret = cmd->command->fn(cmd, argc, argv);
+ if (cmd->command->functions)
+ /* A command-line--specific function is used */
+ ret = cmd->command->functions->fn(cmd, argc, argv);
+ else
+ /* The old style command-name function is used */
+ ret = cmd->command->fn(cmd, argc, argv);
lvmlockd_disconnect();
fin_locking();
@@ -2048,23 +3150,8 @@ struct cmd_context *init_lvm(unsigned set_connections, unsigned set_filters)
return cmd;
}
-static void _fin_commands(void)
-{
- int i;
-
- for (i = 0; i < _cmdline.num_commands; i++)
- dm_free(_cmdline.commands[i].valid_args);
-
- dm_free(_cmdline.commands);
-
- _cmdline.commands = NULL;
- _cmdline.num_commands = 0;
- _cmdline.commands_size = 0;
-}
-
void lvm_fin(struct cmd_context *cmd)
{
- _fin_commands();
destroy_toolcontext(cmd);
udev_fin_library_context();
}
@@ -2211,6 +3298,7 @@ int lvm2_main(int argc, char **argv)
return -1;
cmd->argv = argv;
+
lvm_register_commands();
if (_lvm1_fallback(cmd)) {
diff --git a/tools/toollib.c b/tools/toollib.c
index 5f3deb7..06d4066 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -800,10 +800,7 @@ int vgcreate_params_set_from_args(struct cmd_context *cmd,
return 0;
}
- if (arg_is_set(cmd, metadatacopies_ARG))
- vp_new->vgmetadatacopies = arg_int_value(cmd, metadatacopies_ARG,
- DEFAULT_VGMETADATACOPIES);
- else if (arg_is_set(cmd, vgmetadatacopies_ARG))
+ if (arg_is_set(cmd, vgmetadatacopies_ARG))
vp_new->vgmetadatacopies = arg_int_value(cmd, vgmetadatacopies_ARG,
DEFAULT_VGMETADATACOPIES);
else
@@ -2328,6 +2325,601 @@ static struct lv_segment _historical_lv_segment = {
.origin_list = DM_LIST_HEAD_INIT(_historical_lv_segment.origin_list),
};
+int opt_in_list_is_set(struct cmd_context *cmd, int *opts, int count,
+ int *match_count, int *unmatch_count)
+{
+ int match = 0;
+ int unmatch = 0;
+ int i;
+
+ for (i = 0; i < count; i++) {
+ if (arg_is_set(cmd, opts[i]))
+ match++;
+ else
+ unmatch++;
+ }
+
+ if (match_count)
+ *match_count = match;
+ if (unmatch_count)
+ *unmatch_count = unmatch;
+
+ return match ? 1 : 0;
+}
+
+void opt_array_to_str(struct cmd_context *cmd, int *opts, int count,
+ char *buf, int len)
+{
+ int pos = 0;
+ int ret;
+ int i;
+
+ for (i = 0; i < count; i++) {
+ ret = snprintf(buf + pos, len - pos, "%s ", arg_long_option_name(opts[i]));
+ if (ret >= len - pos)
+ break;
+ pos += ret;
+ }
+
+ buf[len - 1] = '\0';
+}
+
+static void lvp_bits_to_str(uint64_t bits, char *buf, int len)
+{
+ struct lv_props *prop;
+ int lvp_enum;
+ int pos = 0;
+ int ret;
+
+ for (lvp_enum = 0; lvp_enum < LVP_COUNT; lvp_enum++) {
+ if (!(prop = get_lv_prop(lvp_enum)))
+ continue;
+
+ if (lvp_bit_is_set(bits, lvp_enum)) {
+ ret = snprintf(buf + pos, len - pos, "%s ", prop->name);
+ if (ret >= len - pos)
+ break;
+ pos += ret;
+ }
+ }
+ buf[len - 1] = '\0';
+}
+
+static void lvt_bits_to_str(uint64_t bits, char *buf, int len)
+{
+ struct lv_types *type;
+ int lvt_enum;
+ int pos = 0;
+ int ret;
+
+ for (lvt_enum = 0; lvt_enum < LVT_COUNT; lvt_enum++) {
+ if (!(type = get_lv_type(lvt_enum)))
+ continue;
+
+ if (lvt_bit_is_set(bits, lvt_enum)) {
+ ret = snprintf(buf + pos, len - pos, "%s ", type->name);
+ if (ret >= len - pos)
+ break;
+ pos += ret;
+ }
+ }
+ buf[len - 1] = '\0';
+}
+
+/*
+ * This is the lv_prop function pointer used for lv_is_foo() #defines.
+ * Alternatively, lv_is_foo() could all be turned into functions.
+ */
+
+static int _lv_is_prop(struct cmd_context *cmd, struct logical_volume *lv, int lvp_enum)
+{
+ switch (lvp_enum) {
+ case is_locked_LVP:
+ return lv_is_locked(lv);
+ case is_partial_LVP:
+ return lv_is_partial(lv);
+ case is_virtual_LVP:
+ return lv_is_virtual(lv);
+ case is_merging_LVP:
+ return lv_is_merging(lv);
+ case is_merging_origin_LVP:
+ return lv_is_merging_origin(lv);
+ case is_converting_LVP:
+ return lv_is_converting(lv);
+ case is_external_origin_LVP:
+ return lv_is_external_origin(lv);
+ case is_virtual_origin_LVP:
+ return lv_is_virtual_origin(lv);
+ case is_not_synced_LVP:
+ return lv_is_not_synced(lv);
+ case is_pending_delete_LVP:
+ return lv_is_pending_delete(lv);
+ case is_error_when_full_LVP:
+ return lv_is_error_when_full(lv);
+ case is_pvmove_LVP:
+ return lv_is_pvmove(lv);
+ case is_removed_LVP:
+ return lv_is_removed(lv);
+ case is_vg_writable_LVP:
+ return (lv->vg->status & LVM_WRITE) ? 1 : 0;
+ case is_thinpool_data_LVP:
+ return lv_is_thin_pool_data(lv);
+ case is_thinpool_metadata_LVP:
+ return lv_is_thin_pool_metadata(lv);
+ case is_cachepool_data_LVP:
+ return lv_is_cache_pool_data(lv);
+ case is_cachepool_metadata_LVP:
+ return lv_is_cache_pool_metadata(lv);
+ case is_mirror_image_LVP:
+ return lv_is_mirror_image(lv);
+ case is_mirror_log_LVP:
+ return lv_is_mirror_log(lv);
+ case is_raid_image_LVP:
+ return lv_is_raid_image(lv);
+ case is_raid_metadata_LVP:
+ return lv_is_raid_metadata(lv);
+ case is_origin_LVP: /* use lv_is_thick_origin */
+ return lv_is_origin(lv);
+ case is_thick_origin_LVP:
+ return lv_is_thick_origin(lv);
+ case is_thick_snapshot_LVP:
+ return lv_is_thick_snapshot(lv);
+ case is_thin_origin_LVP:
+ return lv_is_thin_origin(lv, NULL);
+ case is_thin_snapshot_LVP:
+ return lv_is_thin_snapshot(lv);
+ case is_cache_origin_LVP:
+ return lv_is_cache_origin(lv);
+ case is_merging_cow_LVP:
+ return lv_is_merging_cow(lv);
+ case is_cow_covering_origin_LVP:
+ return lv_is_cow_covering_origin(lv);
+ case is_visible_LVP:
+ return lv_is_visible(lv);
+ case is_historical_LVP:
+ return lv_is_historical(lv);
+ case is_raid_with_tracking_LVP:
+ return lv_is_raid_with_tracking(lv);
+ default:
+ log_error(INTERNAL_ERROR "unknown lv property value lvp_enum %d", lvp_enum);
+ }
+
+ return 0;
+}
+
+/*
+ * Check if an LV matches a given LV type enum.
+ */
+
+static int _lv_is_type(struct cmd_context *cmd, struct logical_volume *lv, int lvt_enum)
+{
+ struct lv_segment *seg = first_seg(lv);
+
+ switch (lvt_enum) {
+ case striped_LVT:
+ return seg_is_striped(seg) && !lv_is_cow(lv);
+ case linear_LVT:
+ return seg_is_linear(seg) && !lv_is_cow(lv);
+ case snapshot_LVT:
+ return lv_is_cow(lv);
+ case thin_LVT:
+ return lv_is_thin_volume(lv);
+ case thinpool_LVT:
+ return lv_is_thin_pool(lv);
+ case cache_LVT:
+ return lv_is_cache(lv);
+ case cachepool_LVT:
+ return lv_is_cache_pool(lv);
+ case mirror_LVT:
+ return lv_is_mirror(lv);
+ case raid_LVT:
+ return lv_is_raid(lv);
+ case raid0_LVT:
+ return seg_is_raid0(seg);
+ case raid1_LVT:
+ return seg_is_raid1(seg);
+ case raid4_LVT:
+ return seg_is_raid4(seg);
+#if 0
+ case raid5_LVT:
+ return seg_is_raid5(seg);
+ case raid6_LVT:
+ return seg_is_raid6(seg);
+#endif
+ case raid10_LVT:
+ return seg_is_raid10(seg);
+ case error_LVT:
+ return !strcmp(seg->segtype->name, SEG_TYPE_NAME_ERROR);
+ case zero_LVT:
+ return !strcmp(seg->segtype->name, SEG_TYPE_NAME_ZERO);
+ default:
+ log_error(INTERNAL_ERROR "unknown lv type value lvt_enum %d", lvt_enum);
+ }
+
+ return 0;
+}
+
+static int _get_lvt_enum(struct logical_volume *lv)
+{
+ struct lv_segment *seg = first_seg(lv);
+
+ /*
+ * The order these are checked is important, because a snapshot LV has
+ * a linear seg type.
+ */
+
+ if (lv_is_cow(lv))
+ return snapshot_LVT;
+ if (seg_is_linear(seg))
+ return linear_LVT;
+ if (seg_is_striped(seg))
+ return striped_LVT;
+ if (lv_is_thin_volume(lv))
+ return thin_LVT;
+ if (lv_is_thin_pool(lv))
+ return thinpool_LVT;
+ if (lv_is_cache(lv))
+ return cache_LVT;
+ if (lv_is_cache_pool(lv))
+ return cachepool_LVT;
+ if (lv_is_mirror(lv))
+ return mirror_LVT;
+ if (lv_is_raid(lv))
+ return raid_LVT;
+ if (seg_is_raid0(seg))
+ return raid0_LVT;
+ if (seg_is_raid1(seg))
+ return raid1_LVT;
+ if (seg_is_raid4(seg))
+ return raid4_LVT;
+#if 0
+ if (seg_is_raid5(seg))
+ return raid5_LVT;
+ if (seg_is_raid6(seg))
+ return raid6_LVT;
+#endif
+ if (seg_is_raid10(seg))
+ return raid10_LVT;
+
+ if (!strcmp(seg->segtype->name, SEG_TYPE_NAME_ERROR))
+ return error_LVT;
+ if (!strcmp(seg->segtype->name, SEG_TYPE_NAME_ZERO))
+ return zero_LVT;
+
+ return 0;
+}
+
+/*
+ * Call lv_is_<type> for each <type>_LVT bit set in lvt_bits.
+ * If lv matches one of the specified lv types, then return 1.
+ */
+
+static int _lv_types_match(struct cmd_context *cmd, struct logical_volume *lv, uint64_t lvt_bits,
+ uint64_t *match_bits, uint64_t *unmatch_bits)
+{
+ struct lv_types *type;
+ int lvt_enum;
+ int found_a_match = 0;
+ int match;
+
+ if (match_bits)
+ *match_bits = 0;
+ if (unmatch_bits)
+ *unmatch_bits = 0;
+
+ for (lvt_enum = 1; lvt_enum < LVT_COUNT; lvt_enum++) {
+ if (!lvt_bit_is_set(lvt_bits, lvt_enum))
+ continue;
+
+ if (!(type = get_lv_type(lvt_enum)))
+ continue;
+
+ /*
+ * All types are currently handled by _lv_is_type()
+ * because lv_is_type() are #defines and not exposed
+ * in tools.h
+ */
+
+ if (!type->fn)
+ match = _lv_is_type(cmd, lv, lvt_enum);
+ else
+ match = type->fn(cmd, lv);
+
+ if (match)
+ found_a_match = 1;
+
+ if (match_bits && match)
+ *match_bits |= lvt_enum_to_bit(lvt_enum);
+
+ if (unmatch_bits && !match)
+ *unmatch_bits |= lvt_enum_to_bit(lvt_enum);
+ }
+
+ return found_a_match;
+}
+
+/*
+ * Call lv_is_<prop> for each <prop>_LVP bit set in lvp_bits.
+ * If lv matches all of the specified lv properties, then return 1.
+ */
+
+static int _lv_props_match(struct cmd_context *cmd, struct logical_volume *lv, uint64_t lvp_bits,
+ uint64_t *match_bits, uint64_t *unmatch_bits)
+{
+ struct lv_props *prop;
+ int lvp_enum;
+ int found_a_mismatch = 0;
+ int match;
+
+ if (match_bits)
+ *match_bits = 0;
+ if (unmatch_bits)
+ *unmatch_bits = 0;
+
+ for (lvp_enum = 1; lvp_enum < LVP_COUNT; lvp_enum++) {
+ if (!lvp_bit_is_set(lvp_bits, lvp_enum))
+ continue;
+
+ if (!(prop = get_lv_prop(lvp_enum)))
+ continue;
+
+ if (!prop->fn)
+ match = _lv_is_prop(cmd, lv, lvp_enum);
+ else
+ match = prop->fn(cmd, lv);
+
+ if (!match)
+ found_a_mismatch = 1;
+
+ if (match_bits && match)
+ *match_bits |= lvp_enum_to_bit(lvp_enum);
+
+ if (unmatch_bits && !match)
+ *unmatch_bits |= lvp_enum_to_bit(lvp_enum);
+ }
+
+ return !found_a_mismatch;
+}
+
+static int _check_lv_types(struct cmd_context *cmd, struct logical_volume *lv, int pos)
+{
+ int ret = 1;
+
+ if (!pos)
+ return 1;
+
+ if (!cmd->command->required_pos_args[pos-1].def.lvt_bits)
+ return 1;
+
+ if (!val_bit_is_set(cmd->command->required_pos_args[pos-1].def.val_bits, lv_VAL)) {
+ log_error(INTERNAL_ERROR "Command (%s %d) arg position %d does not permit an LV (%llx)",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ pos, (unsigned long long)cmd->command->required_pos_args[pos-1].def.val_bits);
+ return 0;
+ }
+
+ ret = _lv_types_match(cmd, lv, cmd->command->required_pos_args[pos-1].def.lvt_bits, NULL, NULL);
+ if (!ret) {
+ int lvt_enum = _get_lvt_enum(lv);
+ struct lv_types *type = get_lv_type(lvt_enum);
+ log_warn("Operation on LV %s which has invalid type %s.",
+ display_lvname(lv), type ? type->name : "unknown");
+ }
+
+ return ret;
+}
+
+/* Check if LV passes each rule specified in command definition. */
+
+static int _check_lv_rules(struct cmd_context *cmd, struct logical_volume *lv)
+{
+ char buf[64];
+ struct cmd_rule *rule;
+ struct lv_types *lvtype = NULL;
+ uint64_t lv_props_match_bits, lv_props_unmatch_bits;
+ uint64_t lv_types_match_bits, lv_types_unmatch_bits;
+ int opts_match_count, opts_unmatch_count;
+ int lvt_enum;
+ int ret = 1;
+ int i;
+
+ lvt_enum = _get_lvt_enum(lv);
+ if (lvt_enum)
+ lvtype = get_lv_type(lvt_enum);
+
+ for (i = 0; i < cmd->command->rule_count; i++) {
+ rule = &cmd->command->rules[i];
+
+ /*
+ * RULE: <conditions> INVALID|REQUIRE <checks>
+ *
+ * If all the conditions apply to the command+LV, then
+ * the checks are performed. If all conditions are zero
+ * (!opts_count, !lvt_bits, !lvp_bits), then the check
+ * is always performed.
+ *
+ * Conditions:
+ *
+ * 1. options (opts): if any of the specified options are set,
+ * then the checks may apply.
+ *
+ * 2. LV types (lvt_bits): if any of the specified LV types
+ * match the LV, then the checks may apply.
+ *
+ * 3. LV properties (lvp_bits): if all of the specified
+ * LV properties match the LV, then the checks may apply.
+ *
+ * If conditions 1, 2, 3 all pass, then the checks apply.
+ *
+ * Checks:
+ *
+ * 1. options (check_opts):
+ * INVALID: if any of the specified options are set,
+ * then the command fails.
+ * REQUIRE: if any of the specified options are not set,
+ * then the command fails.
+ *
+ * 2. LV types (check_lvt_bits):
+ * INVALID: if any of the specified LV types match the LV,
+ * then the command fails.
+ * REQUIRE: if none of the specified LV types match the LV,
+ * then the command fails.
+ *
+ * 3. LV properties (check_lvp_bits):
+ * INVALID: if any of the specified LV properties match
+ * the LV, then the command fails.
+ * REQUIRE: if any of the specified LV properties do not match
+ * the LV, then the command fails.
+ */
+
+ if (rule->opts_count && !opt_in_list_is_set(cmd, rule->opts, rule->opts_count, NULL, NULL))
+ continue;
+
+ /* If LV matches one type in lvt_bits, this returns 1. */
+ if (rule->lvt_bits && !_lv_types_match(cmd, lv, rule->lvt_bits, NULL, NULL))
+ continue;
+
+ /* If LV matches all properties in lvp_bits, this returns 1. */
+ if (rule->lvp_bits && !_lv_props_match(cmd, lv, rule->lvp_bits, NULL, NULL))
+ continue;
+
+ /*
+ * Check the options, LV types, LV properties.
+ */
+
+ if (rule->check_opts)
+ opt_in_list_is_set(cmd, rule->check_opts, rule->check_opts_count,
+ &opts_match_count, &opts_unmatch_count);
+
+ if (rule->check_lvt_bits)
+ _lv_types_match(cmd, lv, rule->check_lvt_bits,
+ &lv_types_match_bits, &lv_types_unmatch_bits);
+
+ if (rule->check_lvp_bits)
+ _lv_props_match(cmd, lv, rule->check_lvp_bits,
+ &lv_props_match_bits, &lv_props_unmatch_bits);
+
+ /*
+ * Evaluate if the check results pass based on the rule.
+ * The options are checked again here because the previous
+ * option validation (during command matching) does not cover
+ * cases where the option is combined with conditions of LV types
+ * or properties.
+ */
+
+ /* Fail if any invalid options are set. */
+
+ if (rule->check_opts && (rule->rule == RULE_INVALID) && opts_match_count) {
+ memset(buf, 0, sizeof(buf));
+ opt_array_to_str(cmd, rule->check_opts, rule->check_opts_count, buf, sizeof(buf));
+ log_warn("An invalid option is set: %s", buf);
+ ret = 0;
+ }
+
+ /* Fail if any required options are not set. */
+
+ if (rule->check_opts && (rule->rule == RULE_REQUIRE) && opts_unmatch_count) {
+ memset(buf, 0, sizeof(buf));
+ opt_array_to_str(cmd, rule->check_opts, rule->check_opts_count, buf, sizeof(buf));
+ log_warn("A required option is not set: %s", buf);
+ ret = 0;
+ }
+
+ /* Fail if the LV matches any of the invalid LV types. */
+
+ if (rule->check_lvt_bits && (rule->rule == RULE_INVALID) && lv_types_match_bits) {
+ log_warn("Command on LV %s with invalid type: %s",
+ display_lvname(lv), lvtype ? lvtype->name : "unknown");
+ ret = 0;
+ }
+
+ /* Fail if the LV does not match any of the required LV types. */
+
+ if (rule->check_lvt_bits && (rule->rule == RULE_REQUIRE) && !lv_types_match_bits) {
+ memset(buf, 0, sizeof(buf));
+ lvt_bits_to_str(rule->check_lvt_bits, buf, sizeof(buf));
+ log_warn("Command on LV %s with type %s does not match required type: %s",
+ display_lvname(lv), lvtype ? lvtype->name : "unknown", buf);
+ ret = 0;
+ }
+
+ /* Fail if the LV matches any of the invalid LV properties. */
+
+ if (rule->check_lvp_bits && (rule->rule == RULE_INVALID) && lv_props_match_bits) {
+ memset(buf, 0, sizeof(buf));
+ lvp_bits_to_str(lv_props_match_bits, buf, sizeof(buf));
+ log_warn("Command on LV %s with invalid properties: %s",
+ display_lvname(lv), buf);
+ ret = 0;
+ }
+
+ /* Fail if the LV does not match any of the required LV properties. */
+
+ if (rule->check_lvp_bits && (rule->rule == RULE_REQUIRE) && lv_props_unmatch_bits) {
+ memset(buf, 0, sizeof(buf));
+ lvp_bits_to_str(lv_props_unmatch_bits, buf, sizeof(buf));
+ log_warn("Command on LV %s requires properties: %s",
+ display_lvname(lv), buf);
+ ret = 0;
+ }
+ }
+
+ return ret;
+}
+
+/*
+ * Return which arg position the given LV is at,
+ * where 1 represents the first position arg.
+ * When the first position arg is repeatable,
+ * return 1 for all.
+ *
+ * Return 0 when the command has no required
+ * position args. (optional position args are
+ * not considered.)
+ */
+
+static int _find_lv_arg_position(struct cmd_context *cmd, struct logical_volume *lv)
+{
+ const char *sep, *lvname;
+ int i;
+
+ if (cmd->command->rp_count == 0)
+ return 0;
+
+ if (cmd->command->rp_count == 1)
+ return 1;
+
+ for (i = 0; i < cmd->position_argc; i++) {
+ if (i == cmd->command->rp_count)
+ break;
+
+ if (!val_bit_is_set(cmd->command->required_pos_args[i].def.val_bits, lv_VAL))
+ continue;
+
+ if ((sep = strstr(cmd->position_argv[i], "/")))
+ lvname = sep + 1;
+ else
+ lvname = cmd->position_argv[i];
+
+ if (!strcmp(lvname, lv->name))
+ return i + 1;
+ }
+
+ /*
+ * If the last position arg is an LV and this
+ * arg is beyond that position, then the last
+ * LV position arg is repeatable, so return
+ * that position.
+ */
+ if (i == cmd->command->rp_count) {
+ int last_pos = cmd->command->rp_count;
+ if (val_bit_is_set(cmd->command->required_pos_args[last_pos-1].def.val_bits, lv_VAL))
+ return last_pos;
+ }
+
+ return 0;
+}
+
int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
struct dm_list *arg_lvnames, const struct dm_list *tags_in,
int stop_on_error,
@@ -2345,10 +2937,13 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
unsigned process_all = 0;
unsigned tags_supplied = 0;
unsigned lvargs_supplied = 0;
+ int lv_is_named_arg;
+ int lv_arg_pos;
struct lv_list *lvl;
struct dm_str_list *sl;
struct dm_list final_lvs;
struct lv_list *final_lvl;
+ struct dm_list found_arg_lvnames;
struct glv_list *glvl, *tglvl;
int do_report_ret_code = 1;
@@ -2359,6 +2954,7 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
stack;
dm_list_init(&final_lvs);
+ dm_list_init(&found_arg_lvnames);
if (!vg_check_status(vg, EXPORTED_VG)) {
ret_max = ECMD_FAILED;
@@ -2452,6 +3048,7 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
if (lvargs_supplied && str_list_match_item(arg_lvnames, lvl->lv->name)) {
/* Remove LV from list of unprocessed LV names */
str_list_del(arg_lvnames, lvl->lv->name);
+ str_list_add(cmd->mem, &found_arg_lvnames, lvl->lv->name);
process_lv = 1;
}
@@ -2499,6 +3096,37 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
if (lv_is_removed(lvl->lv))
continue;
+ lv_is_named_arg = str_list_match_item(&found_arg_lvnames, lvl->lv->name);
+
+ lv_arg_pos = _find_lv_arg_position(cmd, lvl->lv);
+
+ /*
+ * The command definition may include restrictions on the
+ * types and properties of LVs that can be processed.
+ */
+
+ if (!_check_lv_types(cmd, lvl->lv, lv_arg_pos)) {
+ /* FIXME: include this result in report log? */
+ if (lv_is_named_arg) {
+ log_error("Operation not permitted (%s %d) on LV %s.",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ display_lvname(lvl->lv));
+ ret_max = ECMD_FAILED;
+ }
+ continue;
+ }
+
+ if (!_check_lv_rules(cmd, lvl->lv)) {
+ /* FIXME: include this result in report log? */
+ if (lv_is_named_arg) {
+ log_error("Operation not permitted (%s %d) on LV %s.",
+ cmd->command->command_line_id, cmd->command->command_line_enum,
+ display_lvname(lvl->lv));
+ ret_max = ECMD_FAILED;
+ }
+ continue;
+ }
+
log_very_verbose("Processing LV %s in VG %s.", lvl->lv->name, vg->name);
ret = process_single_lv(cmd, lvl->lv, handle);
@@ -3935,11 +4563,6 @@ int pvcreate_params_from_args(struct cmd_context *cmd, struct pvcreate_params *p
if (pp->pva.pvmetadatacopies < 0)
pp->pva.pvmetadatacopies = find_config_tree_int(cmd, metadata_pvmetadatacopies_CFG, NULL);
- if (pp->pva.pvmetadatacopies > 2) {
- log_error("Metadatacopies may only be 0, 1 or 2");
- return 0;
- }
-
pp->pva.ba_size = arg_uint64_value(cmd, bootloaderareasize_ARG, pp->pva.ba_size);
return 1;
diff --git a/tools/toollib.h b/tools/toollib.h
index 531f690..d44b825 100644
--- a/tools/toollib.h
+++ b/tools/toollib.h
@@ -159,6 +159,12 @@ const char *extract_vgname(struct cmd_context *cmd, const char *lv_name);
const char *skip_dev_dir(struct cmd_context *cmd, const char *vg_name,
unsigned *dev_dir_found);
+int opt_in_list_is_set(struct cmd_context *cmd, int *opts, int count,
+ int *match_count, int *unmatch_count);
+
+void opt_array_to_str(struct cmd_context *cmd, int *opts, int count,
+ char *buf, int len);
+
int pvcreate_params_from_args(struct cmd_context *cmd, struct pvcreate_params *pp);
int pvcreate_each_device(struct cmd_context *cmd, struct processing_handle *handle, struct pvcreate_params *pp);
diff --git a/tools/tools.h b/tools/tools.h
index 1419af9..dbf8a17 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -50,20 +50,41 @@
#define CMD_LEN 256
#define MAX_ARGS 64
-/* command functions */
-typedef int (*command_fn) (struct cmd_context * cmd, int argc, char **argv);
+/* define the enums for the values accepted by command line --options, foo_VAL */
+enum {
+#define val(a, b, c, d) a ,
+#include "vals.h"
+#undef val
+};
+
+/* define the enums for the command line --options, foo_ARG */
+enum {
+#define arg(a, b, c, d, e, f) a ,
+#include "args.h"
+#undef arg
+};
+/* command functions */
#define xx(a, b...) int a(struct cmd_context *cmd, int argc, char **argv);
#include "commands.h"
#undef xx
-/* define the enums for the command line switches */
+/* define enums for LV properties, foo_LVP */
enum {
-#define arg(a, b, c, d, e, f) a ,
-#include "args.h"
-#undef arg
+#define lvp(a, b, c) a ,
+#include "lv_props.h"
+#undef lvp
};
+/* define enums for LV types, foo_LVT */
+enum {
+#define lvt(a, b, c) a ,
+#include "lv_types.h"
+#undef lvt
+};
+
+#include "command.h"
+
#define ARG_COUNTABLE 0x00000001 /* E.g. -vvvv */
#define ARG_GROUPABLE 0x00000002 /* E.g. --addtag */
@@ -79,13 +100,13 @@ struct arg_values {
/* void *ptr; // Currently not used. */
};
-/* a global table of possible arguments */
+/* a global table of possible --option's */
struct arg_props {
+ int arg_enum; /* foo_ARG from args.h */
const char short_arg;
char _padding[7];
const char *long_arg;
-
- int (*fn) (struct cmd_context *cmd, struct arg_values *av);
+ int val_enum; /* foo_VAL from vals.h */
uint32_t flags;
uint32_t prio;
};
@@ -96,6 +117,29 @@ struct arg_value_group_list {
uint32_t prio;
};
+/* a global table of possible --option values */
+struct val_props {
+ int val_enum; /* foo_VAL from vals.h */
+ int (*fn) (struct cmd_context *cmd, struct arg_values *av);
+ const char *name;
+ const char *usage;
+};
+
+/* a global table of possible LV properties */
+struct lv_props {
+ int lvp_enum; /* is_foo_LVP from lv_props.h */
+ const char *name; /* "lv_is_foo" used in command-lines.in */
+ int (*fn) (struct cmd_context *cmd, struct logical_volume *lv); /* lv_is_foo() */
+};
+
+/* a global table of possible LV types */
+/* (as exposed externally in command line interface, not exactly as internal segtype is used) */
+struct lv_types {
+ int lvt_enum; /* is_foo_LVT from lv_types.h */
+ const char *name; /* "foo" used in command-lines.in, i.e. LV_foo */
+ int (*fn) (struct cmd_context *cmd, struct logical_volume *lv); /* lv_is_foo() */
+};
+
#define CACHE_VGMETADATA 0x00000001
#define PERMITTED_READ_ONLY 0x00000002
/* Process all VGs if none specified on the command line. */
@@ -118,19 +162,6 @@ struct arg_value_group_list {
#define ENABLE_DUPLICATE_DEVS 0x00000400
/* Command does not accept tags as args. */
#define DISALLOW_TAG_ARGS 0x00000800
-
-/* a register of the lvm commands */
-struct command {
- const char *name;
- const char *desc;
- const char *usage;
- command_fn fn;
-
- unsigned flags;
-
- int num_args;
- int *valid_args;
-};
void usage(const char *name);
@@ -158,7 +189,15 @@ int segtype_arg(struct cmd_context *cmd, struct arg_values *av);
int alloc_arg(struct cmd_context *cmd, struct arg_values *av);
int locktype_arg(struct cmd_context *cmd, struct arg_values *av);
int readahead_arg(struct cmd_context *cmd, struct arg_values *av);
+int vgmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
+int pvmetadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
int metadatacopies_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
+int polloperation_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
+int writemostly_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
+int syncaction_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
+int reportformat_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
+int configreport_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
+int configtype_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av);
/* we use the enums to access the switches */
unsigned arg_count(const struct cmd_context *cmd, int a);
@@ -200,4 +239,7 @@ int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg,
int vgchange_background_polling(struct cmd_context *cmd, struct volume_group *vg);
+struct lv_props *get_lv_prop(int lvp_enum);
+struct lv_types *get_lv_type(int lvt_enum);
+
#endif
diff --git a/tools/vals.h b/tools/vals.h
new file mode 100644
index 0000000..c8c998f
--- /dev/null
+++ b/tools/vals.h
@@ -0,0 +1,136 @@
+
+/*
+ * Define value types which describe values accepted
+ * by the --option's in args.h, and can also describe
+ * the values accepted as positional args.
+ *
+ * Previously, accepted values were only "described"
+ * by identifying the parsing function to use.
+ *
+ * Some standard val types are used by many options,
+ * e.g. many options (aa_ARG, bb_ARG, cc_ARG) all
+ * accept a number_VAL.
+ *
+ * Other special val types are used by only one option,
+ * e.g. only mirrorlog_ARG accepts a mirrorlog_VAL.
+ * This typically means that there are some specific
+ * words that are recognized after the option.
+ *
+ * Some options currently take a standard val type,
+ * (esp string_VAL), but they could be given their
+ * own custom val type. The advantage of using a
+ * custom val type is the possibility of validating
+ * the value when parsing it with a custom parsing
+ * function, and the possibility of displaying the
+ * actual accepted values in the command usage.
+ * Without a custom val type, the code must do ad hoc
+ * validation of the string values, and the usage
+ * output for the option will only say "String"
+ * rather than giving the accepted string values.
+ * Even without a custom parsing function, there is
+ * reason to define a custom x_VAL enum so that a
+ * more descriptive usage string can be specified
+ * as opposed to just "String".
+ *
+ * Most of the val types defined here are used after
+ * --option's, and are referenced in foo_ARG entries
+ * in args.h. But, some val types are only used to
+ * represent positional values in command definitions,
+ * e.g. vg_VAL.
+ *
+ * val(a, b, c, d)
+ *
+ * a: foo_VAL enums
+ * b: the function to parse and set the value
+ * c: the name used to reference this value in command defs
+ * d: what to display in usage output for this value
+ *
+ * command defintions will use --option NAME, where NAME
+ * is shown in val() field c. NAME will be translated to
+ * foo_VAL enum in field a, which is used in commands[]
+ * structs.
+ *
+ * option definitions (arg.h) will reference foo_VAL enum
+ * in field a.
+ *
+ * FIXME: for specialized val types, the set of recognized
+ * words is not defined or stored in a consistent way,
+ * but is just whatever the parsing function happens to look
+ * for, so adding a new accepted value for the val type is
+ * generally making the parsing function recognize a new
+ * word, and making the implementation code also recognize
+ * that word to do something different. This new word should
+ * then also be added to the usage string for the val type here.
+ * It would be nice if the accepted values could be defined in a
+ * more consistent way, and perhaps in a single place, perhaps in
+ * struct val_props.
+ *
+ * The usage text for an option is not always the full
+ * set of words accepted for an option, but may be a
+ * subset. i.e. an outdated word that no longer does
+ * anything may not be shown, but may still be recognized
+ * and ignored, or an option that shouldn't be used in
+ * general isn't shown to avoid suggesting it.
+ * e.g. for --activate we show the most common "y|n|ay"
+ * without showing the lvmlockd variations "ey|sy" which
+ * are not applicable in general.
+ *
+ * FIXME: are there some specialized or irrelevant
+ * options included in the usage text below that should
+ * be removed? Should "lvm1" be removed?
+ *
+ * For Number args that take optional units, a full usage
+ * could be "Number[bBsSkKmMgGtTpPeE]" (with implied |),
+ * but repeating this full specification produces cluttered
+ * output, and doesn't indicate which unit is the default.
+ * "Number[units]" would be cleaner, as would a subset of
+ * common units, e.g. "Number[kmg...]", but neither helps
+ * with default. "Number[k|unit]" and "Number[m|unit]" show
+ * the default, and "unit" indicates that other units
+ * are possible without listing them all. This also
+ * suggests using the preferred lower case letters, because
+ * --size and other option args treat upper/lower letters
+ * the same, all as 1024 SI base. For this reason, we
+ * should avoid suggesting the upper case letters.
+ */
+
+val(none_VAL, NULL, "None", "ERR") /* unused, for enum value 0 */
+val(conststr_VAL, NULL, "ConstString", "ERR") /* used only for command defs */
+val(constnum_VAL, NULL, "ConstNumber", "ERR") /* used only for command defs */
+val(bool_VAL, yes_no_arg, "Bool", "y|n")
+val(number_VAL, int_arg, "Number", NULL)
+val(string_VAL, string_arg, "String", NULL)
+val(vg_VAL, string_arg, "VG", NULL)
+val(lv_VAL, string_arg, "LV", NULL)
+val(pv_VAL, string_arg, "PV", NULL)
+val(tag_VAL, tag_arg, "Tag", NULL)
+val(select_VAL, NULL, "Select", NULL) /* used only for command defs */
+val(activationmode_VAL, string_arg, "ActivationMode", "partial|degraded|complete")
+val(activation_VAL, activation_arg, "Active", "y|n|ay")
+val(cachemode_VAL, cachemode_arg, "CacheMode", "writethrough|writeback")
+val(discards_VAL, discards_arg, "Discards", "passdown|nopassdown|ignore")
+val(mirrorlog_VAL, mirrorlog_arg, "MirrorLog", "core|disk")
+val(sizekb_VAL, size_kb_arg, "SizeKB", "Number[k|unit]")
+val(sizemb_VAL, size_mb_arg, "SizeMB", "Number[m|unit]")
+val(numsigned_VAL, int_arg_with_sign, "SNumber", "[+|-]Number")
+val(numsignedper_VAL, int_arg_with_sign_and_percent, "SNumberP", "[+|-]Number[%VG|%PVS|%FREE]")
+val(permission_VAL, permission_arg, "Permission", "rw|r")
+val(metadatatype_VAL, metadatatype_arg, "MetadataType", "lvm2|lvm1")
+val(units_VAL, string_arg, "Units", "hHbBsSkKmMgGtTpPeE")
+val(segtype_VAL, segtype_arg, "SegType", "linear|striped|snapshot|mirror|raid*|thin|cache|thin-pool|cache-pool")
+val(alloc_VAL, alloc_arg, "Alloc", "contiguous|cling|cling_by_tags|normal|anywhere|inherit")
+val(locktype_VAL, locktype_arg, "LockType", "sanlock|dlm|none")
+val(readahead_VAL, readahead_arg, "Readahead", "auto|none|NumberSectors")
+val(vgmetadatacopies_VAL, vgmetadatacopies_arg, "MetadataCopiesVG", "all|unmanaged|Number")
+val(pvmetadatacopies_VAL, pvmetadatacopies_arg, "MetadataCopiesPV", "0|1|2")
+val(metadatacopies_VAL, metadatacopies_arg, "unused", "unused")
+val(polloperation_VAL, polloperation_arg, "PollOp", "pvmove|convert|merge|merge_thin")
+val(writemostly_VAL, writemostly_arg, "WriteMostlyPV", "PV[:t|n|y]")
+val(syncaction_VAL, syncaction_arg, "SyncAction", "check|repair")
+val(reportformat_VAL, reportformat_arg, "ReportFmt", "basic|json")
+val(configreport_VAL, configreport_arg, "ConfigReport", "log|vg|lv|pv|pvseg|seg")
+val(configtype_VAL, configtype_arg, "ConfigType", "current|default|diff|full|list|missing|new|profilable|profilable-command|profilable-metadata")
+
+/* this should always be last */
+val(VAL_COUNT, NULL, NULL, NULL)
+
diff --git a/tools/vgchange.c b/tools/vgchange.c
index ca0f450..4cf8a3c 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -482,6 +482,9 @@ static int _vgchange_metadata_copies(struct cmd_context *cmd,
{
uint32_t mda_copies = arg_uint_value(cmd, vgmetadatacopies_ARG, DEFAULT_VGMETADATACOPIES);
+ log_warn("vgchange_metadata_copies new %u vg_mda_copies %u D %u",
+ mda_copies, vg_mda_copies(vg), DEFAULT_VGMETADATACOPIES);
+
if (mda_copies == vg_mda_copies(vg)) {
if (vg_mda_copies(vg) == VGMETADATACOPIES_UNMANAGED)
log_warn("Number of metadata copies for VG %s is already unmanaged.",
diff --git a/tools/vgconvert.c b/tools/vgconvert.c
index 2c0ac08..9f98048 100644
--- a/tools/vgconvert.c
+++ b/tools/vgconvert.c
@@ -157,24 +157,12 @@ int vgconvert(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE;
}
- if (arg_is_set(cmd, metadatacopies_ARG)) {
- log_error("Invalid option --metadatacopies, "
- "use --pvmetadatacopies instead.");
- return EINVALID_CMD_LINE;
- }
if (!(cmd->fmt->features & FMT_MDAS) &&
- (arg_is_set(cmd, pvmetadatacopies_ARG) ||
- arg_is_set(cmd, metadatasize_ARG))) {
+ arg_is_set(cmd, pvmetadatacopies_ARG)) {
log_error("Metadata parameters only apply to text format");
return EINVALID_CMD_LINE;
}
- if (arg_is_set(cmd, pvmetadatacopies_ARG) &&
- arg_int_value(cmd, pvmetadatacopies_ARG, -1) > 2) {
- log_error("Metadatacopies may only be 0, 1 or 2");
- return EINVALID_CMD_LINE;
- }
-
if (!(cmd->fmt->features & FMT_BAS) &&
arg_is_set(cmd, bootloaderareasize_ARG)) {
log_error("Bootloader area parameters only apply to text format");
diff --git a/tools/vgextend.c b/tools/vgextend.c
index e16316f..35168e9 100644
--- a/tools/vgextend.c
+++ b/tools/vgextend.c
@@ -136,12 +136,6 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE;
}
- if (arg_is_set(cmd, metadatacopies_ARG)) {
- log_error("Invalid option --metadatacopies, "
- "use --pvmetadatacopies instead.");
- return EINVALID_CMD_LINE;
- }
-
vg_name = skip_dev_dir(cmd, argv[0], NULL);
argc--;
argv++;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=19267fa6aa0709e3…
Commit: 19267fa6aa0709e3d0c962ad0904920f06102a5b
Parent: 2923d9e47deb11b28b8b753dd7862da186da051c
Author: David Teigland <teigland(a)redhat.com>
AuthorDate: Thu Dec 15 11:49:19 2016 -0600
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Mon Feb 13 08:20:10 2017 -0600
lvmlockd: test mode doesn't work
The --test option is not yet compatible with shared VGs
because changes are made in lvmlockd that cannot be
reversed or faked.
---
lib/metadata/metadata.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index b11d306..1b500ed 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -5629,6 +5629,11 @@ static int _access_vg_lock_type(struct cmd_context *cmd, struct volume_group *vg
}
}
+ if (test_mode()) {
+ log_error("Test mode is not yet supported with lock type %s.", vg->lock_type);
+ return 0;
+ }
+
return 1;
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2923d9e47deb11b2…
Commit: 2923d9e47deb11b28b8b753dd7862da186da051c
Parent: c3b1f1a07ac4931ee4b7b843741d8ec09d8eea5c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Feb 13 09:32:28 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 10:06:19 2017 +0100
tests: update
---
test/shell/thin-autoumount-dmeventd.sh | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/test/shell/thin-autoumount-dmeventd.sh b/test/shell/thin-autoumount-dmeventd.sh
index b2b20a5..5e1c2be 100644
--- a/test/shell/thin-autoumount-dmeventd.sh
+++ b/test/shell/thin-autoumount-dmeventd.sh
@@ -42,8 +42,6 @@ export MKE2FS_CONFIG="$TESTDIR/lib/mke2fs.conf"
aux have_thin 1 0 0 || skip
-aux lvmconf "dmeventd/thin_command = \"$PWD/testcmd.sh\""
-
# Simple implementation of umount when lvextend fails
cat <<- EOF >testcmd.sh
#!/bin/sh
@@ -54,26 +52,26 @@ echo "Metadata: \$DMEVENTD_THIN_POOL_METADATA"
$TESTDIR/lib/lvextend --use-policies \$1 || {
umount "$mntdir" || true
umount "$mntusedir" || true
- return 1
+ return 0
}
test \$($TESTDIR/lib/lvs -o selected -S "data_percent>95||metadata_percent>95" --noheadings \$1) -eq 0 || {
umount "$mntdir" || true
umount "$mntusedir" || true
- return 1
+ return 0
}
EOF
chmod +x testcmd.sh
# Show prepared script
cat testcmd.sh
-aux prepare_dmeventd
-
# Use autoextend percent 0 - so extension fails and triggers umount...
aux lvmconf "activation/thin_pool_autoextend_percent = 0" \
- "activation/thin_pool_autoextend_threshold = 70"
+ "activation/thin_pool_autoextend_threshold = 70" \
+ "dmeventd/thin_command = \"/$PWD/testcmd.sh\""
-aux prepare_vg 2
+aux prepare_dmeventd
+aux prepare_vg 2
lvcreate -L8M -V8M -n $lv1 -T $vg/pool
lvcreate -V8M -n $lv2 -T $vg/pool
@@ -85,8 +83,8 @@ lvchange --monitor y $vg/pool
mkdir "$mntdir" "$mntusedir"
trap 'cleanup_mounted_and_teardown' EXIT
-mount "$DM_DEV_DIR/mapper/$vg-$lv1" "$mntdir"
-mount "$DM_DEV_DIR/mapper/$vg-$lv2" "$mntusedir"
+mount "$DM_DEV_DIR/$vg/$lv1" "$mntdir"
+mount "$DM_DEV_DIR/$vg/$lv2" "$mntusedir"
# Check both LVs are opened (~mounted)
is_lv_opened_ "$vg/$lv1"
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c3b1f1a07ac4931e…
Commit: c3b1f1a07ac4931ee4b7b843741d8ec09d8eea5c
Parent: a3579aafc55bb7fb156f89bba38515846b0c26ee
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 22:28:40 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 10:06:19 2017 +0100
tests: fix dev path
Use proper device path for test devices.
Use mkfs.ext4 and drop 'echo y|' to it.
Use smaller device size to consume less memory and CPU time.
---
test/shell/lvconvert-raid-regionsize.sh | 21 +++++++-------
test/shell/lvconvert-raid-takeover.sh | 46 +++++++++++++++---------------
2 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/test/shell/lvconvert-raid-regionsize.sh b/test/shell/lvconvert-raid-regionsize.sh
index 4f0e90d..7a6c7f0 100644
--- a/test/shell/lvconvert-raid-regionsize.sh
+++ b/test/shell/lvconvert-raid-regionsize.sh
@@ -14,6 +14,7 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
+which mkfs.ext4 || skip
aux have_raid 1 9 0 || skip
aux prepare_vg 6
@@ -29,7 +30,7 @@ function _test_regionsize
lvconvert --type $type --yes -R $regionsize $vg/$lv
[ $? -ne 0 ] && return 1
check lv_field $vg/$lv regionsize "$regionsize_str"
- fsck -fn /dev/mapper/$vg-$lv
+ fsck -fn "$DM_DEV_DIR/$vg/$lv"
}
function _test_regionsizes
@@ -47,13 +48,13 @@ function _test_regionsizes
}
# Create 3-way raid1
-lvcreate --yes -aey --type raid1 -m 2 -R64K -L 64M -n $lv1 $vg
+lvcreate --yes -aey --type raid1 -m 2 -R64K -L8M -n $lv1 $vg
check lv_field $vg/$lv1 segtype "raid1"
check lv_field $vg/$lv1 stripes 3
check lv_field $vg/$lv1 regionsize "64.00k"
-echo y | mkfs -t ext4 /dev/mapper/$vg-$lv1
+mkfs.ext4 "$DM_DEV_DIR/$vg/$lv1"
aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
_test_regionsizes raid1
@@ -61,14 +62,14 @@ _test_regionsizes raid1
lvremove --yes $vg
# Create 5-way raid6
-lvcreate --yes -aey --type raid6 -i 3 --stripesize 128K -R 256K -L 64M -n $lv1 $vg
+lvcreate --yes -aey --type raid6 -i 3 --stripesize 128K -R 256K -L8M -n $lv1 $vg
check lv_field $vg/$lv1 segtype "raid6"
check lv_field $vg/$lv1 stripes 5
check lv_field $vg/$lv1 stripesize "128.00k"
check lv_field $vg/$lv1 regionsize "256.00k"
-echo y | mkfs -t ext4 /dev/mapper/$vg-$lv1
+mkfs.ext4 "$DM_DEV_DIR/$vg/$lv1"
aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
_test_regionsizes raid6
@@ -76,14 +77,14 @@ _test_regionsizes raid6
lvremove --yes $vg
# Create 6-way raid01
-lvcreate --yes -aey --type raid10 -i 3 -m 1 --stripesize 128K -R 256K -L 64M -n $lv1 $vg
+lvcreate --yes -aey --type raid10 -i 3 -m 1 --stripesize 128K -R 256K -L8M -n $lv1 $vg
check lv_field $vg/$lv1 segtype "raid10"
check lv_field $vg/$lv1 stripes 6
check lv_field $vg/$lv1 stripesize "128.00k"
check lv_field $vg/$lv1 regionsize "256.00k"
-echo y | mkfs -t ext4 /dev/mapper/$vg-$lv1
+mkfs.ext4 -t ext4 "$DM_DEV_DIR/$vg/$lv1"
aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
_test_regionsizes raid10
diff --git a/test/shell/lvconvert-raid-takeover.sh b/test/shell/lvconvert-raid-takeover.sh
index a219829..aa41dba 100644
--- a/test/shell/lvconvert-raid-takeover.sh
+++ b/test/shell/lvconvert-raid-takeover.sh
@@ -14,12 +14,13 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
+which mkfs.ext4 || skip
aux have_raid 1 9 0 || skip
correct_raid4_layout=0
aux have_raid 1 9 1 && correct_raid4_layout=1
-aux prepare_vg 8 80
+aux prepare_vg 8
function _lvcreate
{
@@ -33,8 +34,8 @@ function _lvcreate
lvcreate -y -aey --type $level -i $req_stripes -L $size -n $lv $vg
check lv_field $vg/$lv segtype "$level"
check lv_field $vg/$lv stripes $stripes
- echo y | mkfs -t ext4 /dev/mapper/$vg-$lv
- fsck -fn /dev/mapper/$vg-$lv
+ mkfs.ext4 "$DM_DEV_DIR/$vg/$lv"
+ fsck -fn "$DM_DEV_DIR/$vg/$lv"
}
function _lvconvert
@@ -52,17 +53,16 @@ function _lvconvert
[ "${level:0:7}" = "striped" ] && wait_and_check=0
[ "${level:0:5}" = "raid0" ] && wait_and_check=0
-
lvconvert -y --ty $req_level $R $vg/$lv
[ $? -ne 0 ] && return $?
check lv_field $vg/$lv segtype "$level"
check lv_field $vg/$lv stripes $stripes
if [ "$wait_and_check" -eq 1 ]
then
- fsck -fn /dev/mapper/$vg-$lv
+ fsck -fn "$DM_DEV_DIR/$vg/$lv"
aux wait_for_sync $vg $lv
fi
- fsck -fn /dev/mapper/$vg-$lv
+ fsck -fn "$DM_DEV_DIR/$vg/$lv"
}
function _invalid_raid5_conversions
@@ -90,28 +90,28 @@ function _invalid_raid5_conversions
# aux delay_dev "$dev1" 1
# Create 3-way mirror
-lvcreate --yes -aey --type mirror -R 64K -m 2 -L 64M -n $lv1 $vg
+lvcreate --yes -aey --type mirror -R 64K -m 2 -L8M -n $lv1 $vg
check lv_field $vg/$lv1 segtype "mirror"
check lv_field $vg/$lv1 stripes 3
check lv_field $vg/$lv1 regionsize "64.00k"
-echo y | mkfs -t ext4 /dev/mapper/$vg-$lv1
+mkfs.ext4 "$DM_DEV_DIR/$vg/$lv1"
aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
# Convert 3-way to 4-way mirror
lvconvert -m 3 $vg/$lv1
check lv_field $vg/$lv1 segtype "mirror"
check lv_field $vg/$lv1 stripes 4
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
# Takeover 4-way mirror to raid1
lvconvert --yes --type raid1 -R 64k $vg/$lv1
check lv_field $vg/$lv1 segtype "raid1"
check lv_field $vg/$lv1 stripes 4
check lv_field $vg/$lv1 regionsize "64.00k"
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
## Convert 4-way raid1 to 5-way
lvconvert -m 4 -R 128K $vg/$lv1
@@ -119,9 +119,9 @@ check lv_field $vg/$lv1 segtype "raid1"
check lv_field $vg/$lv1 stripes 5
# FIXME: once lv_raid_chanage_image_count() supports region_size changes
not check lv_field $vg/$lv1 regionsize "128.00k"
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
# FIXME: enable once lvconvert rejects early
## Try converting 4-way raid1 to 9-way
@@ -136,7 +136,7 @@ dmsetup status $vg-$lv1
dmsetup table $vg-$lv1
check lv_field $vg/$lv1 segtype "raid1"
check lv_field $vg/$lv1 stripes 2
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
# Convert 2-way raid1 to mirror
lvconvert --yes --type mirror -R 32K $vg/$lv1
@@ -144,7 +144,7 @@ check lv_field $vg/$lv1 segtype "mirror"
check lv_field $vg/$lv1 stripes 2
check lv_field $vg/$lv1 regionsize "32.00k"
aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+fsck -fn "$DM_DEV_DIR/$vg/$lv1"
aux wait_for_sync $vg $lv1
# Clean up
@@ -159,7 +159,7 @@ then
#
# Create 3-way striped raid4 (4 legs total)
-_lvcreate raid4 3 4 64M $vg $lv1
+_lvcreate raid4 3 4 8M $vg $lv1
aux wait_for_sync $vg $lv1
# Convert raid4 -> striped
@@ -272,7 +272,7 @@ _lvconvert striped striped 3 $vg $lv1
lvremove -y $vg
# Create + convert 4-way raid5 variations
-_lvcreate raid5 4 5 64M $vg $lv1
+_lvcreate raid5 4 5 8M $vg $lv1
aux wait_for_sync $vg $lv1
_invalid_raid5_conversions $vg $lv1
not _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
@@ -282,7 +282,7 @@ _lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
_lvconvert raid5_ls raid5_ls 5 $vg $lv1
lvremove -y $vg
-_lvcreate raid5_ls 4 5 64M $vg $lv1
+_lvcreate raid5_ls 4 5 8M $vg $lv1
aux wait_for_sync $vg $lv1
_invalid_raid5_conversions $vg $lv1
not _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
@@ -292,7 +292,7 @@ _lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
_lvconvert raid5_ls raid5_ls 5 $vg $lv1
lvremove -y $vg
-_lvcreate raid5_rs 4 5 64M $vg $lv1
+_lvcreate raid5_rs 4 5 8M $vg $lv1
aux wait_for_sync $vg $lv1
_invalid_raid5_conversions $vg $lv1
not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
@@ -302,7 +302,7 @@ _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
_lvconvert raid5_rs raid5_rs 5 $vg $lv1
lvremove -y $vg
-_lvcreate raid5_la 4 5 64M $vg $lv1
+_lvcreate raid5_la 4 5 8M $vg $lv1
aux wait_for_sync $vg $lv1
_invalid_raid5_conversions $vg $lv1
not _lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
@@ -312,7 +312,7 @@ _lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
_lvconvert raid5_la raid5_la 5 $vg $lv1
lvremove -y $vg
-_lvcreate raid5_ra 4 5 64M $vg $lv1
+_lvcreate raid5_ra 4 5 8M $vg $lv1
aux wait_for_sync $vg $lv1
_invalid_raid5_conversions $vg $lv1
not _lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
@@ -324,7 +324,7 @@ lvremove -y $vg
else
-not lvcreate -y -aey --type raid4 -i 3 -L 64M -n $lv4 $vg
+not lvcreate -y -aey --type raid4 -i 3 -L8M -n $lv4 $vg
not lvconvert -y --ty raid4 $vg/$lv1
not lvconvert -y --ty raid4 $vg/$lv2
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a3579aafc55bb7fb…
Commit: a3579aafc55bb7fb156f89bba38515846b0c26ee
Parent: 7cbee8f31ae64c023b294524008885e3a054e394
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 18:18:54 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 10:06:19 2017 +0100
cleanup: use matching signed number comparation
---
lib/metadata/metadata.c | 2 +-
libdm/libdm-report.c | 2 +-
libdm/libdm-stats.c | 6 +++---
tools/reporter.c | 2 +-
tools/toollib.c | 2 +-
tools/vgextend.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 0731108..b11d306 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -6383,7 +6383,7 @@ int vg_strip_outdated_historical_lvs(struct volume_group *vg) {
* Removal time in the future? Not likely,
* but skip this item in any case.
*/
- if ((current_time) < glvl->glv->historical->timestamp_removed)
+ if (current_time < (time_t) glvl->glv->historical->timestamp_removed)
continue;
if ((current_time - glvl->glv->historical->timestamp_removed) > threshold) {
diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index f9e261d..7caba98 100644
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -4209,7 +4209,7 @@ static void _recalculate_fields(struct dm_report *rh)
{
struct row *row;
struct dm_report_field *field;
- size_t len;
+ int len;
dm_list_iterate_items(row, &rh->rows) {
dm_list_iterate_items(field, &row->fields) {
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index b74a470..587c748 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -3294,7 +3294,7 @@ static void _sum_histogram_bins(const struct dm_stats *dms,
struct dm_stats_region *region;
struct dm_histogram_bin *bins;
struct dm_histogram *dmh_cur;
- uint64_t bin;
+ int bin;
region = &dms->regions[region_id];
dmh_cur = region->counters[area_id].histogram;
@@ -4003,7 +4003,7 @@ merge:
static void _stats_copy_histogram_bounds(struct dm_histogram *to,
struct dm_histogram *from)
{
- uint64_t i;
+ int i;
to->nr_bins = from->nr_bins;
@@ -4019,7 +4019,7 @@ static void _stats_copy_histogram_bounds(struct dm_histogram *to,
static int _stats_check_histogram_bounds(struct dm_histogram *h1,
struct dm_histogram *h2)
{
- uint64_t i;
+ int i;
if (!h1 || !h2)
return 0;
diff --git a/tools/reporter.c b/tools/reporter.c
index e70fa29..00606ed 100644
--- a/tools/reporter.c
+++ b/tools/reporter.c
@@ -707,7 +707,7 @@ int report_for_selection(struct cmd_context *cmd,
static void _check_pv_list(struct cmd_context *cmd, struct report_args *args, struct single_report_args *single_args)
{
- unsigned i;
+ int i;
int rescan_done = 0;
if (!args->argv)
diff --git a/tools/toollib.c b/tools/toollib.c
index 235e535..5f3deb7 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -4499,7 +4499,7 @@ int pvcreate_each_device(struct cmd_context *cmd,
int consistent = 0;
int must_use_all = (cmd->command->flags & MUST_USE_ALL_ARGS);
int found;
- int i;
+ unsigned i;
set_pv_notify(cmd);
diff --git a/tools/vgextend.c b/tools/vgextend.c
index 344dff0..e16316f 100644
--- a/tools/vgextend.c
+++ b/tools/vgextend.c
@@ -49,7 +49,7 @@ static int _vgextend_restoremissing(struct cmd_context *cmd __attribute__((unuse
struct vgextend_params *vp = (struct vgextend_params *) handle->custom_handle;
struct pvcreate_params *pp = &vp->pp;
int fixed = 0;
- int i;
+ unsigned i;
if (!archive(vg))
return_0;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7cbee8f31ae64c02…
Commit: 7cbee8f31ae64c023b294524008885e3a054e394
Parent: b6301aa977df675918f25f6ace11628fa846392c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 18:18:32 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 10:06:18 2017 +0100
cleanup: use matching const type
---
libdm/libdm-stats.c | 8 ++++----
libdm/libdm-string.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index 8589db3..b74a470 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -402,7 +402,7 @@ static int _stats_bound(const struct dm_stats *dms)
if (dms->bind_major > 0 || dms->bind_name || dms->bind_uuid)
return 1;
/* %p format specifier expects a void pointer. */
- log_debug("Stats handle at %p is not bound.", (void *) dms);
+ log_debug("Stats handle at %p is not bound.", dms);
return 0;
}
@@ -3857,9 +3857,9 @@ struct _extent {
*/
static int _extent_start_compare(const void *p1, const void *p2)
{
- struct _extent *r1, *r2;
- r1 = (struct _extent *) p1;
- r2 = (struct _extent *) p2;
+ const struct _extent *r1, *r2;
+ r1 = (const struct _extent *) p1;
+ r2 = (const struct _extent *) p2;
if (r1->start < r2->start)
return -1;
diff --git a/libdm/libdm-string.c b/libdm/libdm-string.c
index d24a474..2085aa8 100644
--- a/libdm/libdm-string.c
+++ b/libdm/libdm-string.c
@@ -626,7 +626,7 @@ uint64_t dm_units_to_factor(const char *units, char *unit_type,
uint64_t multiplier;
if (endptr)
- *endptr = (char *) units;
+ *endptr = units;
if (isdigit(*units)) {
custom_value = strtod(units, &ptr);
@@ -709,7 +709,7 @@ uint64_t dm_units_to_factor(const char *units, char *unit_type,
}
if (endptr)
- *endptr = (char *) units + 1;
+ *endptr = units + 1;
if (_close_enough(custom_value, 0.))
return v * multiplier; /* Use integer arithmetic */
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b6301aa977df6759…
Commit: b6301aa977df675918f25f6ace11628fa846392c
Parent: a39c828c01f747696a6e042df48da62ec0e1ba75
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 18:17:07 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 10:06:18 2017 +0100
cleanup: use fall through
gcc gets 'selective' on having commented fall through case.
---
lib/metadata/metadata.c | 2 +-
libdm/libdm-report.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 1289fec..0731108 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -1256,7 +1256,7 @@ uint32_t extents_from_percent_size(struct volume_group *vg, const struct dm_list
}
break;
}
- /* Fall back to use all PVs in VG like %FREE */
+ /* fall through to use all PVs in VG like %FREE */
case PERCENT_FREE:
if (!(extents = vg->free_count)) {
log_error("No free extents in Volume group %s.", vg->name);
diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index 93b8774..f9e261d 100644
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -3062,26 +3062,31 @@ static void _get_final_time(time_range_t range, struct tm *tm,
tm_up.tm_sec += 1;
break;
}
+ /* fall through */
case RANGE_MINUTE:
if (tm_up.tm_min < 59) {
tm_up.tm_min += 1;
break;
}
+ /* fall through */
case RANGE_HOUR:
if (tm_up.tm_hour < 23) {
tm_up.tm_hour += 1;
break;
}
+ /* fall through */
case RANGE_DAY:
if (tm_up.tm_mday < _get_days_in_month(tm_up.tm_mon, tm_up.tm_year)) {
tm_up.tm_mday += 1;
break;
}
+ /* fall through */
case RANGE_MONTH:
if (tm_up.tm_mon < 11) {
tm_up.tm_mon += 1;
break;
}
+ /* fall through */
case RANGE_YEAR:
tm_up.tm_year += 1;
break;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a39c828c01f74769…
Commit: a39c828c01f747696a6e042df48da62ec0e1ba75
Parent: 717d0c6b94c81730582eb3000d77f585eeca6569
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 17:47:35 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 10:06:18 2017 +0100
cleanup: fix warning about shadowed declaration
Avoid shadowing lv_size as lv_size() is already defined function in lv.h
---
lib/metadata/lv_manip.c | 5 +++--
lib/metadata/metadata-exported.h | 2 +-
lib/metadata/raid_manip.c | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index dfeb3ad..01ab96b 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -4089,6 +4089,7 @@ int lv_extend(struct logical_volume *lv,
uint32_t sub_lv_count;
uint32_t old_extents;
uint32_t new_extents; /* Total logical size after extension. */
+ uint64_t raid_size;
log_very_verbose("Adding segment of type %s to LV %s.", segtype->name, lv->name);
@@ -4111,7 +4112,7 @@ int lv_extend(struct logical_volume *lv,
/* FIXME log_count should be 1 for mirrors */
if (segtype_is_raid(segtype) && !segtype_is_any_raid0(segtype)) {
- uint64_t lv_size = ((uint64_t) lv->le_count + extents) * lv->vg->extent_size;
+ raid_size = ((uint64_t) lv->le_count + extents) * lv->vg->extent_size;
/*
* The MD bitmap is limited to being able to track 2^21 regions.
@@ -4119,7 +4120,7 @@ int lv_extend(struct logical_volume *lv,
* unless raid0/raid0_meta, which doesn't have a bitmap.
*/
- region_size = raid_ensure_min_region_size(lv, lv_size, region_size);
+ region_size = raid_ensure_min_region_size(lv, raid_size, region_size);
if (first_seg(lv))
first_seg(lv)->region_size = region_size;
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 05771d8..5fe169c 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -1222,7 +1222,7 @@ uint32_t raid_rmeta_extents_delta(struct cmd_context *cmd,
uint32_t region_size, uint32_t extent_size);
uint32_t raid_rimage_extents(const struct segment_type *segtype,
uint32_t extents, uint32_t stripes, uint32_t data_copies);
-uint32_t raid_ensure_min_region_size(const struct logical_volume *lv, uint64_t lv_size, uint32_t region_size);
+uint32_t raid_ensure_min_region_size(const struct logical_volume *lv, uint64_t raid_size, uint32_t region_size);
/* -- metadata/raid_manip.c */
/* ++ metadata/cache_manip.c */
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 0f0631f..eaafd65 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -55,9 +55,9 @@ static int _check_num_areas_in_lv_segments(struct logical_volume *lv, unsigned n
*
* Pass in @lv_size, because funcion can be called with an empty @lv.
*/
-uint32_t raid_ensure_min_region_size(const struct logical_volume *lv, uint64_t lv_size, uint32_t region_size)
+uint32_t raid_ensure_min_region_size(const struct logical_volume *lv, uint64_t raid_size, uint32_t region_size)
{
- uint32_t min_region_size = lv_size / (1 << 21);
+ uint32_t min_region_size = raid_size / (1 << 21);
uint32_t region_size_sav = region_size;
while (region_size < min_region_size)
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=717d0c6b94c81730…
Commit: 717d0c6b94c81730582eb3000d77f585eeca6569
Parent: b185a3e3334e72c3aae6791ec4cb8768d55e0b9b
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 17:43:52 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 10:06:18 2017 +0100
cleanup: use proper printf specifier
---
libdm/libdm-stats.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index 34e117e..8589db3 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -4557,7 +4557,7 @@ static int _stats_unmap_regions(struct dm_stats *dms, uint64_t group_id,
log_error("Could not finalize region extent table.");
goto out;
}
- log_very_verbose("Kept %ld of %ld old extents",
+ log_very_verbose("Kept " FMTi64 " of " FMTi64 " old extents",
nr_kept, nr_old);
log_very_verbose("Found " FMTu64 " new extents",
*count - nr_kept);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b185a3e3334e72c3…
Commit: b185a3e3334e72c3aae6791ec4cb8768d55e0b9b
Parent: aa0c735e2ccbea969bad846f3e89c91a81d88fbf
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Feb 13 09:58:46 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 10:06:07 2017 +0100
config: update doc
---
conf/example.conf.in | 1 +
lib/config/config_settings.h | 4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/conf/example.conf.in b/conf/example.conf.in
index 7cb6f4a..5e238e4 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -2054,6 +2054,7 @@ dmeventd {
# or metadata volume gets above 50%.
# Command which starts with 'lvm ' prefix is internal lvm command.
# You can write your own handler to customise behaviour in more details.
+ # User handler is specified with the full path starting with '/'.
# This configuration option has an automatic default value.
# thin_command = "lvm lvextend --use-policies"
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index 8f49b12..1d9603f 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -1863,7 +1863,9 @@ cfg(dmeventd_thin_command_CFG, "thin_command", dmeventd_CFG_SECTION, CFG_DEFAULT
"The plugin runs command with each 5% increment when thin-pool data volume\n"
"or metadata volume gets above 50%.\n"
"Command which starts with 'lvm ' prefix is internal lvm command.\n"
- "You can write your own handler to customise behaviour in more details.\n")
+ "You can write your own handler to customise behaviour in more details.\n"
+ "User handler is specified with the full path starting with '/'.\n")
+ /* TODO: systemd service handler */
cfg(dmeventd_executable_CFG, "executable", dmeventd_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_DMEVENTD_PATH, vsn(2, 2, 73), "@DMEVENTD_PATH@", 0, NULL,
"The full path to the dmeventd binary.\n")
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=aa0c735e2ccbea96…
Commit: aa0c735e2ccbea969bad846f3e89c91a81d88fbf
Parent: 416f9512830ff81e32852f2fce0ee7e36fcdb50f
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 12 22:07:23 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 13 09:43:53 2017 +0100
dmeventd: limit thin_command usage
Require usable command string to begining with '/'
So 'thin_command = "/some/path/command"' is the only supported variant
to internal 'lvm' command.
---
daemons/dmeventd/plugins/thin/dmeventd_thin.c | 47 +++++++++++++++---------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
index cf57d20..e447ba2 100644
--- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c
+++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
@@ -58,8 +58,8 @@ struct dso_state {
int restore_sigset;
sigset_t old_sigset;
pid_t pid;
- char **argv;
- char cmd_str[1024];
+ char *argv[3];
+ char *cmd_str;
};
DM_EVENT_LOG_FN("thin")
@@ -85,7 +85,7 @@ static int _run_command(struct dso_state *state)
} else {
/* For an error event it's for a user to check status and decide */
env[1] = NULL;
- log_debug("Error event processing");
+ log_debug("Error event processing.");
}
log_verbose("Executing command: %s", state->cmd_str);
@@ -115,7 +115,7 @@ static int _use_policy(struct dm_task *dmt, struct dso_state *state)
#if THIN_DEBUG
log_debug("dmeventd executes: %s.", state->cmd_str);
#endif
- if (state->argv)
+ if (state->argv[0])
return _run_command(state);
if (!dmeventd_lvm2_run_with_lock(state->cmd_str)) {
@@ -352,34 +352,43 @@ int register_device(const char *device,
void **user)
{
struct dso_state *state;
- int maxcmd;
char *str;
+ char cmd_str[PATH_MAX + 128 + 2]; /* cmd ' ' vg/lv \0 */
if (!dmeventd_lvm2_init_with_pool("thin_pool_state", state))
goto_bad;
- if (!dmeventd_lvm2_command(state->mem, state->cmd_str,
- sizeof(state->cmd_str),
+ if (!dmeventd_lvm2_command(state->mem, cmd_str, sizeof(cmd_str),
"_dmeventd_thin_command", device)) {
dmeventd_lvm2_exit_with_pool(state);
goto_bad;
}
- if (strncmp(state->cmd_str, "lvm ", 4)) {
- maxcmd = 2; /* space for last NULL element */
- for (str = state->cmd_str; *str; str++)
- if (*str == ' ')
- maxcmd++;
- if (!(str = dm_pool_strdup(state->mem, state->cmd_str)) ||
- !(state->argv = dm_pool_zalloc(state->mem, maxcmd * sizeof(char *)))) {
- log_error("Failed to allocate memory for command.");
+ if (strncmp(cmd_str, "lvm ", 4) == 0) {
+ if (!(state->cmd_str = dm_pool_strdup(state->mem, cmd_str + 4))) {
+ log_error("Failed to copy lvm command.");
+ goto bad;
+ }
+ } else if (cmd_str[0] == '/') {
+ if (!(state->cmd_str = dm_pool_strdup(state->mem, cmd_str))) {
+ log_error("Failed to copy thin command.");
goto bad;
}
- dm_split_words(str, maxcmd - 1, 0, state->argv);
+ /* Find last space before 'vg/lv' */
+ if (!(str = strrchr(state->cmd_str, ' ')))
+ goto inval;
+
+ if (!(state->argv[0] = dm_pool_strndup(state->mem, state->cmd_str,
+ str - state->cmd_str))) {
+ log_error("Failed to copy command.");
+ goto bad;
+ }
+
+ state->argv[1] = str + 1; /* 1 argument - vg/lv */
_init_thread_signals(state);
- } else
- memmove(state->cmd_str, state->cmd_str + 4, strlen(state->cmd_str + 4) + 1);
+ } else /* Unuspported command format */
+ goto inval;
state->pid = -1;
*user = state;
@@ -387,6 +396,8 @@ int register_device(const char *device,
log_info("Monitoring thin pool %s.", device);
return 1;
+inval:
+ log_error("Invalid command for monitoring: %s.", cmd_str);
bad:
log_error("Failed to monitor thin pool %s.", device);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=416f9512830ff81e…
Commit: 416f9512830ff81e32852f2fce0ee7e36fcdb50f
Parent: a7d2ee4bc2dd032cd15db028b3c118ce7138c854
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 11 21:20:12 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 12 17:28:44 2017 +0100
coverity: fix double free
Do not try to free hist_arg twice.
---
libdm/libdm-stats.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index 032be03..34e117e 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -4725,7 +4725,7 @@ static uint64_t *_stats_map_file_regions(struct dm_stats *dms, int fd,
dm_pool_free(extent_mem, extents);
dm_pool_destroy(extent_mem);
- dm_free(hist_arg);
+
return regions;
out_remove:
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a7d2ee4bc2dd032c…
Commit: a7d2ee4bc2dd032cd15db028b3c118ce7138c854
Parent: 0844b20f985177f60db48dc84bcde7170d17a77e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 11 21:17:41 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 12 17:28:13 2017 +0100
coverity: fix mem leak on error path in dm stats
Free allocated resouces on error path.
---
libdm/libdm-stats.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index f68874c..032be03 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -4842,7 +4842,7 @@ uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd,
if (!bounds) {
log_error("Could not allocate memory for group "
"histogram bounds.");
- return NULL;
+ goto out;
}
_stats_copy_histogram_bounds(bounds,
dms->regions[group_id].bounds);
@@ -4869,6 +4869,8 @@ uint64_t *dm_stats_update_regions_from_fd(struct dm_stats *dms, int fd,
bad:
_stats_cleanup_region_ids(dms, regions, count);
dm_free(bounds);
+ dm_free(regions);
+out:
dm_free((char *) alias);
return NULL;
}
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0844b20f985177f6…
Commit: 0844b20f985177f60db48dc84bcde7170d17a77e
Parent: 375e38709ca2842c97ee56899a8a3f34abc61a30
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 11 21:17:27 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sat Feb 11 21:17:27 2017 +0100
coverity: remove unneeded header files
---
daemons/dmeventd/plugins/thin/dmeventd_thin.c | 1 -
lib/metadata/raid_manip.c | 1 -
lib/misc/lvm-flock.c | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/daemons/dmeventd/plugins/thin/dmeventd_thin.c b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
index f551971..cf57d20 100644
--- a/daemons/dmeventd/plugins/thin/dmeventd_thin.c
+++ b/daemons/dmeventd/plugins/thin/dmeventd_thin.c
@@ -18,7 +18,6 @@
#include <sys/wait.h>
#include <stdarg.h>
-#include <pthread.h>
/* TODO - move this mountinfo code into library to be reusable */
#ifdef __linux__
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 25783a8..0f0631f 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -21,7 +21,6 @@
#include "activate.h"
#include "lv_alloc.h"
#include "lvm-string.h"
-#include "lvm-signal.h"
static int _check_restriping(uint32_t new_stripes, struct logical_volume *lv)
{
diff --git a/lib/misc/lvm-flock.c b/lib/misc/lvm-flock.c
index 0b90f8f..22eb128 100644
--- a/lib/misc/lvm-flock.c
+++ b/lib/misc/lvm-flock.c
@@ -15,7 +15,6 @@
#include "lib.h"
#include "config.h"
-#include "lvm-file.h"
#include "lvm-flock.h"
#include "lvm-signal.h"
#include "locking.h"
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=375e38709ca2842c…
Commit: 375e38709ca2842c97ee56899a8a3f34abc61a30
Parent: 2a9eda1229c9d5d7150acdd3d8dd4908fbc784a8
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 11 20:30:16 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sat Feb 11 20:30:16 2017 +0100
cleanup: drop double const specifier
Remove duplicated 'const' specifier.
Reindent.
---
daemons/lvmpolld/lvmpolld-cmd-utils.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/daemons/lvmpolld/lvmpolld-cmd-utils.c b/daemons/lvmpolld/lvmpolld-cmd-utils.c
index f70fd0d..601338f 100644
--- a/daemons/lvmpolld/lvmpolld-cmd-utils.c
+++ b/daemons/lvmpolld/lvmpolld-cmd-utils.c
@@ -19,10 +19,12 @@
#define MIN_ARGV_SIZE 8
-static const char *const const polling_ops[] = { [PVMOVE] = LVMPD_REQ_PVMOVE,
- [CONVERT] = LVMPD_REQ_CONVERT,
- [MERGE] = LVMPD_REQ_MERGE,
- [MERGE_THIN] = LVMPD_REQ_MERGE_THIN };
+static const char *const polling_ops[] = {
+ [PVMOVE] = LVMPD_REQ_PVMOVE,
+ [CONVERT] = LVMPD_REQ_CONVERT,
+ [MERGE] = LVMPD_REQ_MERGE,
+ [MERGE_THIN] = LVMPD_REQ_MERGE_THIN
+};
const char *polling_op(enum poll_type type)
{
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2a9eda1229c9d5d7…
Commit: 2a9eda1229c9d5d7150acdd3d8dd4908fbc784a8
Parent: 8296b99a89b849d7d7b5dcac6214582b3eaad639
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 11 18:14:00 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sat Feb 11 18:23:15 2017 +0100
mem: add extra mem pages for pthread stack
Some archs can use even 64K pages and then lvm2 runs into trouble if
the stack is 'too small' to fit extra page capturing stack overwrite.
So when lvm2 limits stack - add extra mem page - be it 4K or 64K.
Relates to ppc64le bug: https://bugzilla.redhat.com/1387279
---
WHATS_NEW | 1 +
WHATS_NEW_DM | 1 +
daemons/clvmd/clvmd.c | 2 +-
daemons/dmeventd/dmeventd.c | 2 +-
libdaemon/server/daemon-server.c | 2 +-
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index e5f1ba1..b497c7e 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Add extra memory page when limiting pthread stack size in clvmd.
Support striped/raid0* <-> raid10_near conversions
Support shrinking of RaidLvs
Support region size changes on existing RaidLVs
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 47f647a..f11b28c 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.138 -
=====================================
+ Add extra memory page when limiting pthread stack size in dmeventd.
Avoids immediate resume when preloaded device is smaller.
Do not suppress kernel key description in dmsetup table output.
Support configurable command executed from dmeventd thin plugin.
diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c
index a276c63..dcc986b 100644
--- a/daemons/clvmd/clvmd.c
+++ b/daemons/clvmd/clvmd.c
@@ -517,7 +517,7 @@ int main(int argc, char *argv[])
/* Initialise the LVM thread variables */
dm_list_init(&lvm_cmd_head);
if (pthread_attr_init(&stack_attr) ||
- pthread_attr_setstacksize(&stack_attr, STACK_SIZE)) {
+ pthread_attr_setstacksize(&stack_attr, STACK_SIZE + getpagesize())) {
log_sys_error("pthread_attr_init", "");
exit(1);
}
diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index 58922ac..a2883a1 100644
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -468,7 +468,7 @@ static int _pthread_create_smallstack(pthread_t *t, void *(*fun)(void *), void *
/*
* We use a smaller stack since it gets preallocated in its entirety
*/
- pthread_attr_setstacksize(&attr, THREAD_STACK_SIZE);
+ pthread_attr_setstacksize(&attr, THREAD_STACK_SIZE + getpagesize());
/*
* If no-one will be waiting, we need to detach.
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index 6af6de9..10cc8f7 100644
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -42,7 +42,7 @@ static int _pthread_create(pthread_t *t, void *(*fun)(void *), void *arg, int st
/*
* We use a smaller stack since it gets preallocated in its entirety
*/
- pthread_attr_setstacksize(&attr, stacksize);
+ pthread_attr_setstacksize(&attr, stacksize + getpagesize());
return pthread_create(t, &attr, fun, arg);
}
#endif
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8296b99a89b849d7…
Commit: 8296b99a89b849d7d7b5dcac6214582b3eaad639
Parent: 28ea66d46d46414d6ab1c452115ff5120f4a9525
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 10 23:43:56 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 10 23:44:27 2017 +0100
lvconvert: remove test code
Remove allocate_pvs from raid_manip.c:_region_size_change_request() API
and lv_extend() using it added for temporary test purpose.
Related: rhbz1366296
---
lib/metadata/raid_manip.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index dbb6128..25783a8 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -4122,8 +4122,7 @@ replaced:
* Change region size on raid @lv to @region_size if
* different from current region_size and adjusted region size
*/
-static int _region_size_change_requested(struct logical_volume *lv, int yes, const uint32_t region_size,
- struct dm_list *allocate_pvs)
+static int _region_size_change_requested(struct logical_volume *lv, int yes, const uint32_t region_size)
{
uint32_t old_region_size;
const char *seg_region_size_str;
@@ -4185,7 +4184,6 @@ static int _region_size_change_requested(struct logical_volume *lv, int yes, con
_raid_rmeta_extents(lv->vg->cmd, lv->le_count, seg->region_size, lv->vg->extent_size)) {
log_error("Region size %s on %s is too small for metadata LV size.",
seg_region_size_str, display_lvname(lv));
-if (!lv_extend(lv, seg->segtype, seg->area_count - seg->segtype->parity_devs, seg->stripe_size, 1, seg->region_size, 0, allocate_pvs, lv->vg->alloc, 0))
return 0;
}
@@ -4290,7 +4288,7 @@ int lv_raid_convert(struct logical_volume *lv,
if (new_segtype == seg->segtype &&
new_region_size != seg->region_size &&
seg_is_raid(seg) && !seg_is_any_raid0(seg))
- return _region_size_change_requested(lv, yes, new_region_size, allocate_pvs);
+ return _region_size_change_requested(lv, yes, new_region_size);
} else
region_size = seg->region_size ? : get_default_region_size(lv->vg->cmd);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=28ea66d46d46414d…
Commit: 28ea66d46d46414d6ab1c452115ff5120f4a9525
Parent: caa2094e33188806137a8fe6d8c6ecce779ecc59
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 10 23:35:53 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 10 23:37:08 2017 +0100
lvconvert: add region size checks
Add:
- region size checks to raid_manip.c types array and supporting functions
- tests to lvconvert-raid-takeover.sh to check bogus
"lvconvert --type --regionsize N " requests
Related: rhbz1366296
---
lib/metadata/raid_manip.c | 72 +++++++++++++++++++++------------
test/shell/lvconvert-raid-takeover.sh | 5 ++
2 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 3ed8ee3..dbb6128 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -2763,6 +2763,7 @@ static struct lv_segment *_convert_striped_to_raid0(struct logical_volume *lv,
#define ALLOW_NONE 0x0
#define ALLOW_STRIPES 0x2
#define ALLOW_STRIPE_SIZE 0x4
+#define ALLOW_REGION_SIZE 0x8
struct possible_takeover_reshape_type {
/* First 2 have to stay... */
@@ -2779,64 +2780,77 @@ struct possible_type {
};
static struct possible_takeover_reshape_type _possible_takeover_reshape_types[] = {
- /* striped -> */
+ /* striped -> raid1 */
{ .current_types = SEG_STRIPED_TARGET, /* linear, i.e. seg->area_count = 1 */
.possible_types = SEG_RAID1,
.current_areas = 1,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+ .options = ALLOW_REGION_SIZE },
+
{ .current_types = SEG_STRIPED_TARGET, /* linear, i.e. seg->area_count = 1 */
.possible_types = SEG_RAID0|SEG_RAID0_META,
.current_areas = 1,
.options = ALLOW_STRIPE_SIZE },
- /* raid0* -> */
+ /* raid0* -> raid1 */
{ .current_types = SEG_RAID0|SEG_RAID0_META, /* seg->area_count = 1 */
.possible_types = SEG_RAID1,
.current_areas = 1,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+ .options = ALLOW_REGION_SIZE },
+
+ /* striped,raid0* <-> striped,raid0* */
+ { .current_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META,
+ .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META,
+ .current_areas = ~0U,
+ .options = ALLOW_NONE },
- /* striped,raid0*,raid4,raid5_n,raid6_n_6 <-> striped,raid0*,raid4,raid5_n,raid6_n_6 */
- { .current_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6,
- .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6,
+ /* striped,raid0* -> raid4,raid5_n,raid6_n_6,raid10_near */
+ { .current_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META,
+ .possible_types = SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6|SEG_RAID10_NEAR,
.current_areas = ~0U,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+ .options = ALLOW_REGION_SIZE },
- /* striped,raid0* <-> raid10_near */
- { .current_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID10_NEAR,
- .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID10_NEAR,
+ /* raid4,raid5_n,raid6_n_6,raid10_near -> striped/raid0* */
+ { .current_types = SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6|SEG_RAID10_NEAR,
+ .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META,
.current_areas = ~0U,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+ .options = ALLOW_NONE },
+
+ /* raid4,raid5_n,raid6_n_6 <-> raid4,raid5_n,raid6_n_6 */
+ { .current_types = SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6,
+ .possible_types = SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6,
+ .current_areas = ~0U,
+ .options = ALLOW_REGION_SIZE },
+
/* raid5_ls <-> raid6_ls_6 */
{ .current_types = SEG_RAID5_LS|SEG_RAID6_LS_6,
.possible_types = SEG_RAID5_LS|SEG_RAID6_LS_6,
.current_areas = ~0U,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+ .options = ALLOW_REGION_SIZE },
/* raid5_rs -> raid6_rs_6 */
{ .current_types = SEG_RAID5_RS|SEG_RAID6_RS_6,
.possible_types = SEG_RAID5_RS|SEG_RAID6_RS_6,
.current_areas = ~0U,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+ .options = ALLOW_REGION_SIZE },
/* raid5_ls -> raid6_la_6 */
{ .current_types = SEG_RAID5_LA|SEG_RAID6_LA_6,
.possible_types = SEG_RAID5_LA|SEG_RAID6_LA_6,
.current_areas = ~0U,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+ .options = ALLOW_REGION_SIZE },
/* raid5_ls -> raid6_ra_6 */
{ .current_types = SEG_RAID5_RA|SEG_RAID6_RA_6,
.possible_types = SEG_RAID5_RA|SEG_RAID6_RA_6,
.current_areas = ~0U,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
-
+ .options = ALLOW_REGION_SIZE },
/* mirror <-> raid1 with arbitrary number of legs */
{ .current_types = SEG_MIRROR|SEG_RAID1,
.possible_types = SEG_MIRROR|SEG_RAID1,
.current_areas = ~0U,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+ .options = ALLOW_REGION_SIZE },
/* END */
{ .current_types = 0 }
@@ -4108,7 +4122,7 @@ replaced:
* Change region size on raid @lv to @region_size if
* different from current region_size and adjusted region size
*/
-static int _region_size_change_requested(struct logical_volume *lv, int yes, uint32_t region_size,
+static int _region_size_change_requested(struct logical_volume *lv, int yes, const uint32_t region_size,
struct dm_list *allocate_pvs)
{
uint32_t old_region_size;
@@ -4187,7 +4201,7 @@ if (!lv_extend(lv, seg->segtype, seg->area_count - seg->segtype->parity_devs, se
static int _conversion_options_allowed(const struct lv_segment *seg_from,
const struct segment_type **segtype_to,
uint32_t new_image_count,
- int new_data_copies, int region_size,
+ int new_data_copies, int new_region_size,
int stripes, unsigned new_stripe_size_supplied)
{
int r = 1;
@@ -4214,6 +4228,12 @@ static int _conversion_options_allowed(const struct lv_segment *seg_from,
r = 0;
}
+ if (new_region_size && !(opts & ALLOW_REGION_SIZE)) {
+ if (!_log_prohibited_option(seg_from, *segtype_to, "-R/--regionsize"))
+ stack;
+ r = 0;
+ }
+
return r;
}
@@ -4234,13 +4254,13 @@ int lv_raid_convert(struct logical_volume *lv,
const unsigned new_stripes,
const unsigned new_stripe_size_supplied,
const unsigned new_stripe_size,
- /* FIXME: workaround with volatile new_region_size until cli validation patches got merged */
- uint32_t new_region_size,
+ const uint32_t new_region_size,
struct dm_list *allocate_pvs)
{
struct lv_segment *seg = first_seg(lv);
uint32_t stripes, stripe_size;
uint32_t new_image_count = seg->area_count;
+ uint32_t region_size = new_region_size;
takeover_fn_t takeover_fn;
if (!new_segtype) {
@@ -4262,7 +4282,7 @@ int lv_raid_convert(struct logical_volume *lv,
/* Change RAID region size */
/*
- * FIXME: workaround with volatile new_region_size until the
+ * FIXME: workaround with new_region_size until the
* cli validation patches got merged when we'll change
* the API to have new_region_size_supplied to check for.
*/
@@ -4272,7 +4292,7 @@ int lv_raid_convert(struct logical_volume *lv,
seg_is_raid(seg) && !seg_is_any_raid0(seg))
return _region_size_change_requested(lv, yes, new_region_size, allocate_pvs);
} else
- new_region_size = seg->region_size ? : get_default_region_size(lv->vg->cmd);
+ region_size = seg->region_size ? : get_default_region_size(lv->vg->cmd);
/*
* Check acceptible options mirrors, region_size,
@@ -4287,7 +4307,7 @@ int lv_raid_convert(struct logical_volume *lv,
/* Exit without doing activation checks if the combination isn't possible */
if (_takeover_not_possible(takeover_fn))
return takeover_fn(lv, new_segtype, yes, force, new_image_count, 0, new_stripes, stripe_size,
- new_region_size, allocate_pvs);
+ region_size, allocate_pvs);
log_verbose("Converting %s from %s to %s.",
display_lvname(lv), lvseg_name(first_seg(lv)),
@@ -4318,7 +4338,7 @@ int lv_raid_convert(struct logical_volume *lv,
}
return takeover_fn(lv, new_segtype, yes, force, new_image_count, 0, new_stripes, stripe_size,
- new_region_size, allocate_pvs);
+ region_size, allocate_pvs);
}
static int _remove_partial_multi_segment_image(struct logical_volume *lv,
diff --git a/test/shell/lvconvert-raid-takeover.sh b/test/shell/lvconvert-raid-takeover.sh
index 257d169..a219829 100644
--- a/test/shell/lvconvert-raid-takeover.sh
+++ b/test/shell/lvconvert-raid-takeover.sh
@@ -163,6 +163,7 @@ _lvcreate raid4 3 4 64M $vg $lv1
aux wait_for_sync $vg $lv1
# Convert raid4 -> striped
+not _lvconvert striped striped 3 $vg $lv1 512k
_lvconvert striped striped 3 $vg $lv1
# Convert striped -> raid4
@@ -195,6 +196,7 @@ _lvconvert raid0_meta raid0_meta 3 $vg $lv1
_lvconvert raid5 raid5_n 4 $vg $lv1
# Convert raid4 -> raid0_meta
+not _lvconvert raid0_meta raid0_meta 3 $vg $lv1 256k
_lvconvert raid0_meta raid0_meta 3 $vg $lv1
# Convert raid0_meta -> raid4
@@ -243,12 +245,14 @@ _lvconvert raid0_meta raid0_meta 3 $vg $lv1
_lvconvert raid6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> striped
+not _lvconvert striped striped 3 $vg $lv1 128k
_lvconvert striped striped 3 $vg $lv1
# Convert striped -> raid10
_lvconvert raid10 raid10 6 $vg $lv1
# Convert raid10 -> raid0
+not _lvconvert raid0 raid0 3 $vg $lv1 64k
_lvconvert raid0 raid0 3 $vg $lv1
# Convert raid0 -> raid10
@@ -261,6 +265,7 @@ _lvconvert raid0_meta raid0_meta 3 $vg $lv1
_lvconvert raid10 raid10 6 $vg $lv1
# Convert raid10 -> striped
+not _lvconvert striped striped 3 $vg $lv1 256k
_lvconvert striped striped 3 $vg $lv1
# Clean up
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=caa2094e33188806…
Commit: caa2094e33188806137a8fe6d8c6ecce779ecc59
Parent: c908a8b131d0ae12cf87a271b10dfeaf65d4e0a7
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 10 21:19:03 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 10 21:22:38 2017 +0100
test: lvresize-raid.sh missing conditional
Test missed to check for raid0 present in the kernel.
Related: rhbz1366296
---
test/shell/lvresize-raid.sh | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/test/shell/lvresize-raid.sh b/test/shell/lvresize-raid.sh
index b4f6058..691946d 100644
--- a/test/shell/lvresize-raid.sh
+++ b/test/shell/lvresize-raid.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2012 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2012,2017 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
@@ -17,7 +17,8 @@ SKIP_WITH_LVMPOLLD=1
aux have_raid 1 3 0 || skip
levels="5 6 10"
-aux have_raid4 && levels="0 0_meta 4 $levels"
+aux have_raid4 && levels="4 $levels"
+aux have_raid 1 7 0 && levels="0 0_meta $levels"
aux prepare_pvs 6
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c908a8b131d0ae12…
Commit: c908a8b131d0ae12cf87a271b10dfeaf65d4e0a7
Parent: 035c614c195b08398df3403c4bbd3d986cca68c3
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Feb 10 19:57:04 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Feb 10 20:29:11 2017 +0100
libdm: avoid resume if preloaded device is smaller
When we preload device with smaller size, we avoid its resume,
so later suspend/resume of full device tree my process all
existing in flight bios.
Also update comment and avoid using confusing opposite meaning.
---
WHATS_NEW_DM | 1 +
libdm/libdm-deptree.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index ac2d420..47f647a 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.138 -
=====================================
+ Avoids immediate resume when preloaded device is smaller.
Do not suppress kernel key description in dmsetup table output.
Support configurable command executed from dmeventd thin plugin.
Support new R|r human readable units output format.
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 9570b8a..d658bf9 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -2874,8 +2874,8 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
else if (child->props.size_changed < 0)
dnode->props.size_changed = -1;
- /* Resume device immediately if it has parents and its size changed */
- if (!dm_tree_node_num_children(child, 1) || !child->props.size_changed)
+ /* No resume for a device without parents or with unchanged or smaller size */
+ if (!dm_tree_node_num_children(child, 1) || (child->props.size_changed <= 0))
continue;
if (!node_created && (dm_list_size(&child->props.segs) == 1)) {
1
0
10 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=035c614c195b0839…
Commit: 035c614c195b08398df3403c4bbd3d986cca68c3
Parent: baba3f8e2a1c6f6fcfcefaa06e87872ff63cac6d
Author: Ondrej Kozina <okozina(a)redhat.com>
AuthorDate: Fri Feb 10 13:19:22 2017 +0100
Committer: Ondrej Kozina <okozina(a)redhat.com>
CommitterDate: Fri Feb 10 19:18:49 2017 +0100
dmsetup: do not suppress kernel key descriptions in tables
Kernel 4.10 (dm-crypt v1.15.0) and later supports loading device
tables with crypt segment having key in kernel keyring retention
service.
dmsetup hid key section of tables output. With this patch dmsetup
no longer hides key section if it detects kernel key description
instead of hex byte representation of key itself.
---
WHATS_NEW_DM | 1 +
man/dmsetup.8.in | 6 ++-
test/shell/dmsetup-keyring.sh | 72 +++++++++++++++++++++++++++++++++++++++++
tools/dmsetup.c | 11 +++++-
4 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 4903de3..ac2d420 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
Version 1.02.138 -
=====================================
+ Do not suppress kernel key description in dmsetup table output.
Support configurable command executed from dmeventd thin plugin.
Support new R|r human readable units output format.
Thin dmeventd plugin reacts faster on lvextend failure path with umount.
diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in
index 8aa0ff7..36a6d74 100644
--- a/man/dmsetup.8.in
+++ b/man/dmsetup.8.in
@@ -820,8 +820,10 @@ Outputs the current table for the device in a format that can be fed
back in using the create or load commands.
With \fB\-\-target\fP, only information relating to the specified target type
is displayed.
-Encryption keys are suppressed in the table output for the crypt
-target unless the \fB\-\-showkeys\fP parameter is supplied.
+Real encryption keys are suppressed in the table output for the crypt
+target unless the \fB\-\-showkeys\fP parameter is supplied. Kernel key
+references prefixed with \fB:\fP are not affected by the parameter and get
+displayed always.
.
.HP
.CMD_TARGETS
diff --git a/test/shell/dmsetup-keyring.sh b/test/shell/dmsetup-keyring.sh
new file mode 100644
index 0000000..5ea654e
--- /dev/null
+++ b/test/shell/dmsetup-keyring.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+# unrelated to lvm2 daemons
+SKIP_WITH_LVMLOCKD=1
+SKIP_WITH_LVMPOLLD=1
+SKIP_WITH_CLVMD=1
+SKIP_WITH_LVMETAD=1
+
+. lib/inittest
+
+CIPHER=aes-xts-plain64
+HEXKEY_32=0102030405060708090a0102030405060102030405060708090a010203040506
+HIDENKEY_32=0000000000000000000000000000000000000000000000000000000000000000
+KEY_NAME="$PREFIX:keydesc"
+
+function _teardown() {
+ keyctl unlink %:$PREFIX-keyring
+ aux teardown_devs_prefixed $PREFIX
+}
+
+aux target_at_least dm-zero 1 0 0 || skip "missing dm-zero target"
+aux target_at_least dm-crypt 1 15 0 || skip "dm-crypt doesn't support keys in kernel keyring service"
+which keyctl || skip "test requires keyctl utility"
+
+keyctl newring $PREFIX-keyring @u
+keyctl timeout %:$PREFIX-keyring 60
+
+trap '_teardown' EXIT
+
+keyctl add logon $KEY_NAME ${HEXKEY_32:0:32} %:$PREFIX-keyring
+
+dmsetup create $PREFIX-zero --table "0 1 zero"
+# put key in kernel keyring for active table
+dmsetup create $PREFIX-crypt --table "0 1 crypt $CIPHER :32:logon:$KEY_NAME 0 $TESTDIR/dev$prefix/mapper/$PREFIX-zero 0"
+# put hexbyte key in dm-crypt directly in inactive table
+dmsetup load $PREFIX-crypt --table "0 1 crypt $CIPHER $HEXKEY_32 0 $TESTDIR/dev$prefix/mapper/$PREFIX-zero 0"
+
+# test dmsetup doesn't hide key descriptions...
+str=`dmsetup table $PREFIX-crypt | cut -d ' ' -f 5`
+test $str = :32:logon:$KEY_NAME || die
+str=`dmsetup table --showkeys $PREFIX-crypt | cut -d ' ' -f 5`
+test $str = :32:logon:$KEY_NAME || die
+
+# ...but it hides hexbyte representation of keys...
+str=`dmsetup table --inactive $PREFIX-crypt | cut -d ' ' -f 5`
+test $str = $HIDENKEY_32 || die
+#...unless --showkeys explictly requested
+str=`dmsetup table --showkeys --inactive $PREFIX-crypt | cut -d ' ' -f 5`
+test $str = $HEXKEY_32 || die
+
+# let's swap the tables
+dmsetup resume $PREFIX-crypt
+dmsetup load $PREFIX-crypt --table "0 1 crypt $CIPHER :32:logon:$KEY_NAME 0 $TESTDIR/dev$prefix/mapper/$PREFIX-zero 0"
+
+str=`dmsetup table --inactive $PREFIX-crypt | cut -d ' ' -f 5`
+test $str = :32:logon:$KEY_NAME || die
+str=`dmsetup table --showkeys --inactive $PREFIX-crypt | cut -d ' ' -f 5`
+test $str = :32:logon:$KEY_NAME || die
+
+str=`dmsetup table $PREFIX-crypt | cut -d ' ' -f 5`
+test $str = $HIDENKEY_32 || die
+str=`dmsetup table --showkeys $PREFIX-crypt | cut -d ' ' -f 5`
+test $str = $HEXKEY_32 || die
diff --git a/tools/dmsetup.c b/tools/dmsetup.c
index c9549c6..6464069 100644
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
@@ -2197,8 +2197,15 @@ static int _status(CMD_ARGS)
c++;
if (*c)
c++;
- while (*c && *c != ' ')
- *c++ = '0';
+ /*
+ * Do not suppress kernel key references prefixed
+ * with colon ':'. Displaying those references is
+ * harmless. crypt target supports kernel keys
+ * starting with v1.15.0 (merged in kernel 4.10)
+ */
+ if (*c != ':')
+ while (*c && *c != ' ')
+ *c++ = '0';
}
printf(FMTu64 " " FMTu64 " %s %s",
start, length, target_type, params);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=baba3f8e2a1c6f6f…
Commit: baba3f8e2a1c6f6fcfcefaa06e87872ff63cac6d
Parent: 68ec6940e6897192aec6480a14492a5adc6937d8
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 10 19:10:05 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 10 19:13:02 2017 +0100
lvconvert: add conversion from/to raid10
Add:
- conversion support from striped/raid0/raid0_meta to/from raid10;
raid10 goes by the near format (same as used in creation of
raid10 LVs), which groups data copies together with their original
blocks (e.g. 3-way striped, 2 data copies resulting in 112233 in the
first stripe followed by 445566 in the second etc.) and is limited
to even numbers of legs for now
- related tests to lvconvert-raid-takeover.sh
- typo
Related: rhbz1366296
---
WHATS_NEW | 1 +
lib/metadata/lv_manip.c | 2 +-
lib/metadata/raid_manip.c | 220 ++++++++++++++++++++++++++++++---
lib/metadata/segtype.h | 3 +-
lib/metadata/takeover_matrix.h | 2 +-
test/shell/lvconvert-raid-takeover.sh | 23 ++++-
test/shell/lvresize-raid.sh | 2 +-
7 files changed, 230 insertions(+), 23 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 7a32777..e5f1ba1 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Support striped/raid0* <-> raid10_near conversions
Support shrinking of RaidLvs
Support region size changes on existing RaidLVs
Avoid parallel usage of cpg_mcast_joined() in clvmd with corosync.
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 2e96740..dfeb3ad 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -5418,7 +5418,7 @@ int lv_resize(struct logical_volume *lv,
}
}
- /* Ensure stipe boundary extents! */
+ /* Ensure stripe boundary extents! */
if (!lp->percent && lv_is_raid(lv))
lp->extents =_round_to_stripe_boundary(lv->vg, lp->extents,
seg_is_raid1(seg) ? 0 : _raid_stripes_count(seg),
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 288802e..3ed8ee3 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -481,6 +481,161 @@ out:
return r;
}
+/* raid0* <-> raid10_near area reorder helper: swap 2 LV segment areas @a1 and @a2 */
+static void _swap_areas(struct lv_segment_area *a1, struct lv_segment_area *a2)
+{
+ struct lv_segment_area tmp;
+
+ tmp = *a1;
+ *a1 = *a2;
+ *a2 = tmp;
+}
+
+/*
+ * Reorder the areas in the first segment of @seg to suit raid10_{near,far}/raid0 layout.
+ *
+ * raid10_{near,far} can only be reordered to raid0 if !mod(#total_devs, #mirrors)
+ *
+ * Examples with 6 disks indexed 0..5 with 3 stripes:
+ * raid0 (012345) -> raid10_{near,far} (031425) order
+ * idx 024135
+ * raid10_{near,far} (012345) -> raid0 (024135/135024) order depending on mirror leg selection (TBD)
+ * idx 031425
+ * _or_ (variations possible)
+ * idx 304152
+ *
+ * Examples 3 stripes with 9 disks indexed 0..8 to create a 3 striped raid0 with 3 data_copies per leg:
+ * vvv
+ * raid0 (012345678) -> raid10 (034156278) order
+ * v v v
+ * raid10 (012345678) -> raid0 (036124578) order depending on mirror leg selection (TBD)
+ *
+ */
+enum raid0_raid10_conversion { reorder_to_raid10_near, reorder_from_raid10_near };
+static int _reorder_raid10_near_seg_areas(struct lv_segment *seg, enum raid0_raid10_conversion conv)
+{
+ unsigned dc, idx1, idx1_sav, idx2, s, ss, str, xchg;
+ uint32_t data_copies = 2; /* seg->data_copies */
+ uint32_t *idx, stripes = seg->area_count;
+ unsigned i = 0;
+
+ /* Internal sanity checks... */
+ if (!(conv == reorder_to_raid10_near || conv == reorder_from_raid10_near))
+ return_0;
+ if ((conv == reorder_to_raid10_near && !(seg_is_striped(seg) || seg_is_any_raid0(seg))) ||
+ (conv == reorder_from_raid10_near && !seg_is_raid10_near(seg)))
+ return_0;
+
+ /* FIXME: once more data copies supported with raid10 */
+ if (seg_is_raid10_near(seg) && (stripes % data_copies)) {
+ log_error("Can't convert %s LV %s with number of stripes not divisable by number of data copies",
+ lvseg_name(seg), display_lvname(seg->lv));
+ return 0;
+ }
+
+ /* FIXME: once more data copies supported with raid10 */
+ stripes /= data_copies;
+
+ if (!(idx = dm_pool_zalloc(seg_lv(seg, 0)->vg->vgmem, seg->area_count * sizeof(*idx))))
+ return 0;
+
+ /* Set up positional index array */
+ switch (conv) {
+ case reorder_to_raid10_near:
+ /*
+ * raid0 (012 345) with 3 stripes/2 data copies -> raid10 (031425)
+ *
+ * _reorder_raid10_near_seg_areas 2137 idx[0]=0
+ * _reorder_raid10_near_seg_areas 2137 idx[1]=2
+ * _reorder_raid10_near_seg_areas 2137 idx[2]=4
+ * _reorder_raid10_near_seg_areas 2137 idx[3]=1
+ * _reorder_raid10_near_seg_areas 2137 idx[4]=3
+ * _reorder_raid10_near_seg_areas 2137 idx[5]=5
+ *
+ * raid0 (012 345 678) with 3 stripes/3 data copies -> raid10 (036147258)
+ *
+ * _reorder_raid10_near_seg_areas 2137 idx[0]=0
+ * _reorder_raid10_near_seg_areas 2137 idx[1]=3
+ * _reorder_raid10_near_seg_areas 2137 idx[2]=6
+ *
+ * _reorder_raid10_near_seg_areas 2137 idx[3]=1
+ * _reorder_raid10_near_seg_areas 2137 idx[4]=4
+ * _reorder_raid10_near_seg_areas 2137 idx[5]=7
+ * _reorder_raid10_near_seg_areas 2137 idx[6]=2
+ * _reorder_raid10_near_seg_areas 2137 idx[7]=5
+ * _reorder_raid10_near_seg_areas 2137 idx[8]=8
+ */
+ /* idx[from] = to */
+ for (s = ss = 0; s < seg->area_count; s++)
+ if (s < stripes)
+ idx[s] = s * data_copies;
+
+ else {
+ uint32_t factor = s % stripes;
+
+ if (!factor)
+ ss++;
+
+ idx[s] = ss + factor * data_copies;
+ }
+
+ break;
+
+ case reorder_from_raid10_near:
+ /*
+ * Order depending on mirror leg selection (TBD)
+ *
+ * raid10 (012345) with 3 stripes/2 data copies -> raid0 (024135/135024)
+ * raid10 (012345678) with 3 stripes/3 data copies -> raid0 (036147258/147036258/...)
+ */
+ /* idx[from] = to */
+ for (s = 0; s < seg->area_count; s++)
+ idx[s] = -1; /* = unused */
+
+ idx1 = 0;
+ idx2 = stripes;
+ for (str = 0; str < stripes; str++) {
+ idx1_sav = idx1;
+ for (dc = 0; dc < data_copies; dc++) {
+ struct logical_volume *slv;
+ s = str * data_copies + dc;
+ slv = seg_lv(seg, s);
+ idx[s] = ((slv->status & PARTIAL_LV) || idx1 != idx1_sav) ? idx2++ : idx1++;
+ }
+
+ if (idx1 == idx1_sav) {
+ log_error("Failed to find a valid mirror in stripe %u!", str);
+ return 0;
+ }
+ }
+
+ break;
+
+ default:
+ return 0;
+ }
+
+ /* Sort areas */
+ do {
+ xchg = seg->area_count;
+
+ for (s = 0; s < seg->area_count ; s++)
+ if (idx[s] == s)
+ xchg--;
+
+ else {
+ _swap_areas(seg->areas + s, seg->areas + idx[s]);
+ _swap_areas(seg->meta_areas + s, seg->meta_areas + idx[s]);
+ ss = idx[idx[s]];
+ idx[idx[s]] = idx[s];
+ idx[s] = ss;
+ }
+ i++;
+ } while (xchg);
+
+ return 1;
+}
+
/*
* _shift_and_rename_image_components
* @seg: Top-level RAID segment
@@ -2646,6 +2801,12 @@ static struct possible_takeover_reshape_type _possible_takeover_reshape_types[]
.current_areas = ~0U,
.options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+ /* striped,raid0* <-> raid10_near */
+ { .current_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID10_NEAR,
+ .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID10_NEAR,
+ .current_areas = ~0U,
+ .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+
/* raid5_ls <-> raid6_ls_6 */
{ .current_types = SEG_RAID5_LS|SEG_RAID6_LS_6,
.possible_types = SEG_RAID5_LS|SEG_RAID6_LS_6,
@@ -3151,7 +3312,7 @@ static int _shift_parity_dev(struct lv_segment *seg)
/* raid456 -> raid0* / striped */
static int _raid45_to_raid54_wrapper(TAKEOVER_FN_ARGS);
-static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
+static int _raid45610_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
{
int rename_sublvs = 0;
struct lv_segment *seg = first_seg(lv);
@@ -3196,6 +3357,10 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
log_error("Failed to rename %s LV %s MetaLVs.", lvseg_name(seg), display_lvname(lv));
return 0;
}
+ } else if (seg_is_raid10_near(seg)) {
+ log_debug_metadata("Reordering areas for raid10 -> raid0 takeover");
+ if (!_reorder_raid10_near_seg_areas(seg, reorder_from_raid10_near))
+ return 0;
}
/* Remove meta and data LVs requested */
@@ -3348,9 +3513,6 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
dm_list_init(&removal_lvs);
- if (seg_is_raid10(seg))
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
-
if (new_data_copies > new_image_count) {
log_error("N number of data_copies \"--mirrors N-1\" may not be larger than number of stripes.");
return 0;
@@ -3409,6 +3571,10 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
!_rename_area_lvs(lv, "_"))) {
log_error("Can't convert %s to %s.", display_lvname(lv), new_segtype->name);
return 0;
+ } else if (segtype_is_raid10_near(new_segtype)) {
+ log_debug_metadata("Reordering areas for raid0 -> raid10 takeover");
+ if (!_reorder_raid10_near_seg_areas(seg, reorder_to_raid10_near))
+ return 0;
}
seg->segtype = new_segtype;
@@ -3514,7 +3680,9 @@ static int _takeover_from_raid0_to_raid1(TAKEOVER_FN_ARGS)
static int _takeover_from_raid0_to_raid10(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count * 2 /* new_image_count */,
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_to_raid45(TAKEOVER_FN_ARGS)
@@ -3564,7 +3732,9 @@ static int _takeover_from_raid0_meta_to_raid1(TAKEOVER_FN_ARGS)
static int _takeover_from_raid0_meta_to_raid10(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count * 2 /* new_image_count */,
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_meta_to_raid45(TAKEOVER_FN_ARGS)
@@ -3641,12 +3811,12 @@ static int _takeover_from_raid45_to_mirrored(TAKEOVER_FN_ARGS)
static int _takeover_from_raid45_to_raid0(TAKEOVER_FN_ARGS)
{
- return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1, 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1, 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid45_to_raid0_meta(TAKEOVER_FN_ARGS)
{
- return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1, 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1, 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid45_to_raid1(TAKEOVER_FN_ARGS)
@@ -3677,30 +3847,30 @@ static int _takeover_from_raid45_to_raid6(TAKEOVER_FN_ARGS)
static int _takeover_from_raid45_to_striped(TAKEOVER_FN_ARGS)
{
- return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1, 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1, 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_raid0(TAKEOVER_FN_ARGS)
{
- return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
+ return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_raid0_meta(TAKEOVER_FN_ARGS)
{
- return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
+ return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_raid45(TAKEOVER_FN_ARGS)
{
- return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1,
+ return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1,
2 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_striped(TAKEOVER_FN_ARGS)
{
- return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
+ return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
2 /* data_copies */, 0, 0, 0, allocate_pvs);
}
@@ -3727,7 +3897,9 @@ static int _takeover_from_striped_to_raid0_meta(TAKEOVER_FN_ARGS)
static int _takeover_from_striped_to_raid10(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count * 2 /* new_image_count */,
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_striped_to_raid45(TAKEOVER_FN_ARGS)
@@ -3744,6 +3916,8 @@ static int _takeover_from_striped_to_raid6(TAKEOVER_FN_ARGS)
}
/*
+ * Only if we decide to support raid01 at all.
+
static int _takeover_from_raid01_to_raid01(TAKEOVER_FN_ARGS)
{
return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
@@ -3758,6 +3932,7 @@ static int _takeover_from_raid01_to_striped(TAKEOVER_FN_ARGS)
{
return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
}
+*/
static int _takeover_from_raid10_to_linear(TAKEOVER_FN_ARGS)
{
@@ -3771,17 +3946,22 @@ static int _takeover_from_raid10_to_mirrored(TAKEOVER_FN_ARGS)
static int _takeover_from_raid10_to_raid0(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count / 2,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
+/*
+ * Only if we decide to support raid01 at all.
static int _takeover_from_raid10_to_raid01(TAKEOVER_FN_ARGS)
{
return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
}
+*/
static int _takeover_from_raid10_to_raid0_meta(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count / 2,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid10_to_raid1(TAKEOVER_FN_ARGS)
@@ -3789,16 +3969,20 @@ static int _takeover_from_raid10_to_raid1(TAKEOVER_FN_ARGS)
return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
}
+/*
+ * This'd be a reshape, not a takeover.
+ *
static int _takeover_from_raid10_to_raid10(TAKEOVER_FN_ARGS)
{
return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
}
+*/
static int _takeover_from_raid10_to_striped(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _raid45610_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count / 2,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
-*/
/*
* Import takeover matrix.
diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h
index e8fd26f..9212824 100644
--- a/lib/metadata/segtype.h
+++ b/lib/metadata/segtype.h
@@ -50,7 +50,8 @@ struct dev_manager;
#define SEG_RAID0 0x0000000000040000ULL
#define SEG_RAID0_META 0x0000000000080000ULL
#define SEG_RAID1 0x0000000000100000ULL
-#define SEG_RAID10 0x0000000000200000ULL
+#define SEG_RAID10_NEAR 0x0000000000200000ULL
+#define SEG_RAID10 SEG_RAID10_NEAR
#define SEG_RAID4 0x0000000000400000ULL
#define SEG_RAID5_N 0x0000000000800000ULL
#define SEG_RAID5_LA 0x0000000001000000ULL
diff --git a/lib/metadata/takeover_matrix.h b/lib/metadata/takeover_matrix.h
index 0736643..bb3e6cb 100644
--- a/lib/metadata/takeover_matrix.h
+++ b/lib/metadata/takeover_matrix.h
@@ -112,7 +112,7 @@ static takeover_fn_t _takeover_fns[][11] = {
/* raid1 */ { r1__lin, r1__str, r1__mir, r1__r0, r1__r0m, r1__r1, r1__r45, X , r1__r10, X , X },
/* raid4/5 */ { r45_lin, r45_str, r45_mir, r45_r0, r45_r0m, r45_r1, r45_r54, r45_r6, X , X , X },
/* raid6 */ { X , r6__str, X , r6__r0, r6__r0m, X , r6__r45, X , X , X , X },
- /* raid10 */ // { r10_lin, r10_str, r10_mir, r10_r0, r10_r0m, r10_r1, X , X , r10_r10, r10_r01, X },
+ /* raid10 */ { r10_lin, r10_str, r10_mir, r10_r0, r10_r0m, r10_r1, X , X , X , X , X },
/* raid01 */ // { X , r01_str, X , X , X , X , X , X , r01_r10, r01_r01, X },
/* other */ { X , X , X , X , X , X , X , X , X , X , X },
};
diff --git a/test/shell/lvconvert-raid-takeover.sh b/test/shell/lvconvert-raid-takeover.sh
index c7b569a..257d169 100644
--- a/test/shell/lvconvert-raid-takeover.sh
+++ b/test/shell/lvconvert-raid-takeover.sh
@@ -19,7 +19,7 @@ aux have_raid 1 9 0 || skip
correct_raid4_layout=0
aux have_raid 1 9 1 && correct_raid4_layout=1
-aux prepare_vg 6 80
+aux prepare_vg 8 80
function _lvcreate
{
@@ -242,6 +242,27 @@ _lvconvert raid0_meta raid0_meta 3 $vg $lv1
# Convert raid0_meta -> raid6_n_6
_lvconvert raid6 raid6_n_6 5 $vg $lv1
+# Convert raid6_n_6 -> striped
+_lvconvert striped striped 3 $vg $lv1
+
+# Convert striped -> raid10
+_lvconvert raid10 raid10 6 $vg $lv1
+
+# Convert raid10 -> raid0
+_lvconvert raid0 raid0 3 $vg $lv1
+
+# Convert raid0 -> raid10
+_lvconvert raid10 raid10 6 $vg $lv1
+
+# Convert raid10 -> raid0
+_lvconvert raid0_meta raid0_meta 3 $vg $lv1
+
+# Convert raid0_meta -> raid10
+_lvconvert raid10 raid10 6 $vg $lv1
+
+# Convert raid10 -> striped
+_lvconvert striped striped 3 $vg $lv1
+
# Clean up
lvremove -y $vg
diff --git a/test/shell/lvresize-raid.sh b/test/shell/lvresize-raid.sh
index 4f22740..b4f6058 100644
--- a/test/shell/lvresize-raid.sh
+++ b/test/shell/lvresize-raid.sh
@@ -19,7 +19,7 @@ aux have_raid 1 3 0 || skip
levels="5 6 10"
aux have_raid4 && levels="0 0_meta 4 $levels"
-aux prepare_pvs 6 80
+aux prepare_pvs 6
vgcreate -s 256K $vg $(cat DEVICES)
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=68ec6940e6897192…
Commit: 68ec6940e6897192aec6480a14492a5adc6937d8
Parent: 55eaabd1183042b8e03b3a969eadf624623c4b62
Author: Bryn M. Reeves <bmr(a)redhat.com>
AuthorDate: Fri Feb 10 17:07:39 2017 +0000
Committer: Bryn M. Reeves <bmr(a)redhat.com>
CommitterDate: Fri Feb 10 17:09:17 2017 +0000
man: mention dmstats in lvmsar and lvmsadc man pages
---
man/lvmsadc.8.in | 5 ++++-
man/lvmsar.8.in | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/man/lvmsadc.8.in b/man/lvmsadc.8.in
index e156de2..81d2b66 100644
--- a/man/lvmsadc.8.in
+++ b/man/lvmsadc.8.in
@@ -7,7 +7,10 @@ lvmsadc \(em LVM system activity data collector
.B lvmsadc
.SH "DESCRIPTION"
-lvmsadc is not currently supported under LVM2.
+lvmsadc is not currently supported under LVM2: the device-mapper statistics
+facility provides similar performance metrics using the \fBdmstats(8)\fP
+command.
.SH "SEE ALSO"
+.BR dmstats (8)
.BR lvm (8)
diff --git a/man/lvmsar.8.in b/man/lvmsar.8.in
index a9a6132..fca111f 100644
--- a/man/lvmsar.8.in
+++ b/man/lvmsar.8.in
@@ -7,7 +7,10 @@ lvmsar \(em LVM system activity reporter
.B lvmsar
.SH "DESCRIPTION"
-lvmsar is not currently supported under LVM2.
+lvmsar is not currently supported under LVM2: the device-mapper statistics
+facility provides similar performance metrics using the \fBdmstats(8)\fP
+command.
.SH "SEE ALSO"
+.BR dmstats (8)
.BR lvm (8)
1
0
master - lvreduce/lvresize: add ability to reduce the size of a RaidLV
by Heinz Mauelshagen 09 Feb '17
by Heinz Mauelshagen 09 Feb '17
09 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=55eaabd1183042b8…
Commit: 55eaabd1183042b8e03b3a969eadf624623c4b62
Parent: 79f31008fa10cc4893b6f98ad3e0de188aa5e7b0
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Thu Feb 9 22:41:28 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Thu Feb 9 22:42:03 2017 +0100
lvreduce/lvresize: add ability to reduce the size of a RaidLV
- support shrinking of raid0/1/4/5/6/10 LVs
- enhance lvresize-raid.sh tests: add raid0* and raid10
- fix have_raid4 in aux.sh to allow lv_resize-raid.sh
and other scripts to test raid4
Resolves: rhbz1394048
---
WHATS_NEW | 1 +
lib/metadata/lv_manip.c | 148 +++++++++++++++++++++++++----------
lib/metadata/metadata-exported.h | 6 ++
lib/metadata/raid_manip.c | 109 +++++++++++++++++++-------
test/lib/aux.sh | 6 +-
test/shell/lvconvert-repair-raid.sh | 2 +-
test/shell/lvresize-raid.sh | 9 ++-
7 files changed, 204 insertions(+), 77 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index c6994ca..7a32777 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Support shrinking of RaidLvs
Support region size changes on existing RaidLVs
Avoid parallel usage of cpg_mcast_joined() in clvmd with corosync.
Support raid6_{ls,rs,la,ra}_6 segment types and conversions from/to it.
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 3feec20..2e96740 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -891,8 +891,9 @@ static uint32_t _round_to_stripe_boundary(struct volume_group *vg, uint32_t exte
/* Round up extents to stripe divisible amount */
if ((size_rest = extents % stripes)) {
new_extents += extend ? stripes - size_rest : -size_rest;
- log_print_unless_silent("Rounding size %s (%u extents) up to stripe boundary size %s (%u extents).",
+ log_print_unless_silent("Rounding size %s (%u extents) %s to stripe boundary size %s(%u extents).",
display_size(vg->cmd, (uint64_t) extents * vg->extent_size), extents,
+ new_extents < extents ? "down" : "up",
display_size(vg->cmd, (uint64_t) new_extents * vg->extent_size), new_extents);
}
@@ -967,6 +968,37 @@ struct lv_segment *alloc_lv_segment(const struct segment_type *segtype,
return seg;
}
+/*
+ * Temporary helper to return number of data copies for
+ * RAID segment @seg until seg->data_copies got added
+ */
+static uint32_t _raid_data_copies(struct lv_segment *seg)
+{
+ /*
+ * FIXME: needs to change once more than 2 are supported.
+ * I.e. use seg->data_copies then
+ */
+ if (seg_is_raid10(seg))
+ return 2;
+ else if (seg_is_raid1(seg))
+ return seg->area_count;
+
+ return seg->segtype->parity_devs + 1;
+}
+
+/* Data image count for RAID segment @seg */
+static uint32_t _raid_stripes_count(struct lv_segment *seg)
+{
+ /*
+ * FIXME: raid10 needs to change once more than
+ * 2 data_copies and odd # of legs supported.
+ */
+ if (seg_is_raid10(seg))
+ return seg->area_count / _raid_data_copies(seg);
+
+ return seg->area_count - seg->segtype->parity_devs;
+}
+
static int _release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t s,
uint32_t area_reduction, int with_discard)
{
@@ -1007,33 +1039,41 @@ static int _release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t
}
if (lv_is_raid_image(lv)) {
- /*
- * FIXME: Use lv_reduce not lv_remove
- * We use lv_remove for now, because I haven't figured out
- * why lv_reduce won't remove the LV.
- lv_reduce(lv, area_reduction);
- */
- if (area_reduction != seg->area_len) {
- log_error("Unable to reduce RAID LV - operation not implemented.");
+ /* Calculate the amount of extents to reduce per rmate/rimage LV */
+ uint32_t rimage_extents;
+
+ /* FIXME: avoid extra seg_is_*() conditonals */
+ area_reduction =_round_to_stripe_boundary(lv->vg, area_reduction,
+ (seg_is_raid1(seg) || seg_is_any_raid0(seg)) ? 0 : _raid_stripes_count(seg), 0);
+ rimage_extents = raid_rimage_extents(seg->segtype, area_reduction, seg_is_any_raid0(seg) ? 0 : _raid_stripes_count(seg),
+ seg_is_raid10(seg) ? 1 :_raid_data_copies(seg));
+ if (!rimage_extents)
return 0;
- } else {
- if (!lv_remove(lv)) {
- log_error("Failed to remove RAID image %s.",
- display_lvname(lv));
- return 0;
- }
- }
- /* Remove metadata area if image has been removed */
- if (seg->meta_areas && seg_metalv(seg, s) && (area_reduction == seg->area_len)) {
- if (!lv_reduce(seg_metalv(seg, s),
- seg_metalv(seg, s)->le_count)) {
- log_error("Failed to remove RAID meta-device %s.",
- display_lvname(seg_metalv(seg, s)));
+ if (seg->meta_areas) {
+ uint32_t meta_area_reduction;
+ struct logical_volume *mlv;
+ struct volume_group *vg = lv->vg;
+
+ if (seg_metatype(seg, s) != AREA_LV ||
+ !(mlv = seg_metalv(seg, s)))
return 0;
- }
+
+ meta_area_reduction = raid_rmeta_extents_delta(vg->cmd, lv->le_count, lv->le_count - rimage_extents,
+ seg->region_size, vg->extent_size);
+ /* Limit for raid0_meta not having region size set */
+ if (meta_area_reduction > mlv->le_count ||
+ !(lv->le_count - rimage_extents))
+ meta_area_reduction = mlv->le_count;
+
+ if (meta_area_reduction &&
+ !lv_reduce(mlv, meta_area_reduction))
+ return_0; /* FIXME: any upper level reporting */
}
+ if (!lv_reduce(lv, rimage_extents))
+ return_0; /* FIXME: any upper level reporting */
+
return 1;
}
@@ -1439,6 +1479,13 @@ int lv_refresh_suspend_resume(const struct logical_volume *lv)
*/
int lv_reduce(struct logical_volume *lv, uint32_t extents)
{
+ struct lv_segment *seg = first_seg(lv);
+
+ /* Ensure stipe boundary extents on RAID LVs */
+ if (lv_is_raid(lv) && extents != lv->le_count)
+ extents =_round_to_stripe_boundary(lv->vg, extents,
+ seg_is_raid1(seg) ? 0 : _raid_stripes_count(seg), 0);
+
return _lv_reduce(lv, extents, 1);
}
@@ -3302,19 +3349,24 @@ static struct alloc_handle *_alloc_init(struct cmd_context *cmd,
if (segtype_is_raid(segtype)) {
if (metadata_area_count) {
+ uint32_t cur_rimage_extents, new_rimage_extents;
+
if (metadata_area_count != area_count)
log_error(INTERNAL_ERROR
"Bad metadata_area_count");
- ah->metadata_area_count = area_count;
- ah->alloc_and_split_meta = 1;
-
- ah->log_len = RAID_METADATA_AREA_LEN;
+ /* Calculate log_len (i.e. length of each rmeta device) for RAID */
+ cur_rimage_extents = raid_rimage_extents(segtype, existing_extents, stripes, mirrors);
+ new_rimage_extents = raid_rimage_extents(segtype, existing_extents + new_extents, stripes, mirrors),
+ ah->log_len = raid_rmeta_extents_delta(cmd, cur_rimage_extents, new_rimage_extents,
+ region_size, extent_size);
+ ah->metadata_area_count = metadata_area_count;
+ ah->alloc_and_split_meta = !!ah->log_len;
/*
* We need 'log_len' extents for each
* RAID device's metadata_area
*/
- total_extents += (ah->log_len * ah->area_multiple);
+ total_extents += ah->log_len * (segtype_is_raid1(segtype) ? 1 : ah->area_multiple);
} else {
ah->log_area_count = 0;
ah->log_len = 0;
@@ -4011,19 +4063,6 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah,
if (!_setup_lv_size(lv, lv->le_count + extents))
return_0;
- /*
- * The MD bitmap is limited to being able to track 2^21 regions.
- * The region_size must be adjusted to meet that criteria
- * unless raid0/raid0_meta, which doesn't have a bitmap.
- */
- if (seg_is_raid(seg) && !seg_is_any_raid0(seg))
- while (seg->region_size < (lv->size / (1 << 21))) {
- seg->region_size *= 2;
- log_very_verbose("Adjusting RAID region_size from %uS to %uS"
- " to support large LV size",
- seg->region_size/2, seg->region_size);
- }
-
return 1;
}
@@ -4071,6 +4110,22 @@ int lv_extend(struct logical_volume *lv,
}
/* FIXME log_count should be 1 for mirrors */
+ if (segtype_is_raid(segtype) && !segtype_is_any_raid0(segtype)) {
+ uint64_t lv_size = ((uint64_t) lv->le_count + extents) * lv->vg->extent_size;
+
+ /*
+ * The MD bitmap is limited to being able to track 2^21 regions.
+ * The region_size must be adjusted to meet that criteria
+ * unless raid0/raid0_meta, which doesn't have a bitmap.
+ */
+
+ region_size = raid_ensure_min_region_size(lv, lv_size, region_size);
+
+ if (first_seg(lv))
+ first_seg(lv)->region_size = region_size;
+
+ }
+
if (!(ah = allocate_extents(lv->vg, lv, segtype, stripes, mirrors,
log_count, region_size, extents,
allocatable_pvs, alloc, approx_alloc, NULL)))
@@ -4651,6 +4706,11 @@ static uint32_t lvseg_get_stripes(struct lv_segment *seg, uint32_t *stripesize)
return seg->area_count;
}
+ if (seg_is_raid(seg)) {
+ *stripesize = seg->stripe_size;
+ return _raid_stripes_count(seg);
+ }
+
*stripesize = 0;
return 0;
}
@@ -5316,6 +5376,7 @@ int lv_resize(struct logical_volume *lv,
struct logical_volume *lock_lv = (struct logical_volume*) lv_lock_holder(lv);
struct logical_volume *aux_lv = NULL; /* Note: aux_lv never resizes fs */
struct lvresize_params aux_lp;
+ struct lv_segment *seg = first_seg(lv);
int activated = 0;
int ret = 0;
int status;
@@ -5357,6 +5418,11 @@ int lv_resize(struct logical_volume *lv,
}
}
+ /* Ensure stipe boundary extents! */
+ if (!lp->percent && lv_is_raid(lv))
+ lp->extents =_round_to_stripe_boundary(lv->vg, lp->extents,
+ seg_is_raid1(seg) ? 0 : _raid_stripes_count(seg),
+ lp->resize == LV_REDUCE ? 0 : 1);
if (aux_lv && !_lvresize_prepare(&aux_lv, &aux_lp, pvh))
return_0;
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 4e05885..05771d8 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -1217,6 +1217,12 @@ int lv_raid_replace(struct logical_volume *lv, int force,
struct dm_list *remove_pvs, struct dm_list *allocate_pvs);
int lv_raid_remove_missing(struct logical_volume *lv);
int partial_raid_lv_supports_degraded_activation(const struct logical_volume *lv);
+uint32_t raid_rmeta_extents_delta(struct cmd_context *cmd,
+ uint32_t rimage_extents_cur, uint32_t rimage_extents_new,
+ uint32_t region_size, uint32_t extent_size);
+uint32_t raid_rimage_extents(const struct segment_type *segtype,
+ uint32_t extents, uint32_t stripes, uint32_t data_copies);
+uint32_t raid_ensure_min_region_size(const struct logical_volume *lv, uint64_t lv_size, uint32_t region_size);
/* -- metadata/raid_manip.c */
/* ++ metadata/cache_manip.c */
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index ae779fe..288802e 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -50,24 +50,26 @@ static int _check_num_areas_in_lv_segments(struct logical_volume *lv, unsigned n
return 1;
}
-/* Ensure region size exceeds the minimum for lv */
-static void _ensure_min_region_size(const struct logical_volume *lv)
+/*
+ * Ensure region size exceeds the minimum for @lv because
+ * MD's bitmap is limited to tracking 2^21 regions.
+ *
+ * Pass in @lv_size, because funcion can be called with an empty @lv.
+ */
+uint32_t raid_ensure_min_region_size(const struct logical_volume *lv, uint64_t lv_size, uint32_t region_size)
{
- struct lv_segment *seg = first_seg(lv);
- uint32_t min_region_size, region_size;
-
- /* MD's bitmap is limited to tracking 2^21 regions */
- min_region_size = lv->size / (1 << 21);
- region_size = seg->region_size;
+ uint32_t min_region_size = lv_size / (1 << 21);
+ uint32_t region_size_sav = region_size;
while (region_size < min_region_size)
region_size *= 2;
- if (seg->region_size != region_size) {
- log_very_verbose("Setting region_size to %u for %s.",
- seg->region_size, display_lvname(lv));
- seg->region_size = region_size;
- }
+ if (region_size != region_size_sav)
+ log_very_verbose("Adjusting region_size from %s to %s for %s.",
+ display_size(lv->vg->cmd, region_size_sav),
+ display_size(lv->vg->cmd, region_size),
+ display_lvname(lv));
+ return region_size;
}
/*
@@ -106,8 +108,7 @@ static void _check_and_adjust_region_size(const struct logical_volume *lv)
struct lv_segment *seg = first_seg(lv);
seg->region_size = seg->region_size ? : get_default_region_size(lv->vg->cmd);
-
- return _ensure_min_region_size(lv);
+ seg->region_size = raid_ensure_min_region_size(lv, lv->size, seg->region_size);
}
/* Strip any raid suffix off LV name */
@@ -672,7 +673,7 @@ static int _alloc_image_components(struct logical_volume *lv,
return_0;
if (seg_is_linear(seg))
- region_size = get_default_region_size(lv->vg->cmd);
+ region_size = seg->region_size ? : get_default_region_size(lv->vg->cmd);
else
region_size = seg->region_size;
@@ -757,7 +758,7 @@ static uint32_t _raid_rmeta_extents(struct cmd_context *cmd, uint32_t rimage_ext
uint64_t bytes, regions, sectors;
region_size = region_size ?: get_default_region_size(cmd);
- regions = (uint64_t) rimage_extents * extent_size / region_size;
+ regions = ((uint64_t) rimage_extents) * extent_size / region_size;
/* raid and bitmap superblocks + region bytes */
bytes = 2 * 4096 + dm_div_up(regions, 8);
@@ -767,6 +768,53 @@ static uint32_t _raid_rmeta_extents(struct cmd_context *cmd, uint32_t rimage_ext
}
/*
+ * Returns raid metadata device size _change_ in extents, algorithm from dm-raid ("raid" target) kernel code.
+ */
+uint32_t raid_rmeta_extents_delta(struct cmd_context *cmd,
+ uint32_t rimage_extents_cur, uint32_t rimage_extents_new,
+ uint32_t region_size, uint32_t extent_size)
+{
+ uint32_t rmeta_extents_cur = _raid_rmeta_extents(cmd, rimage_extents_cur, region_size, extent_size);
+ uint32_t rmeta_extents_new = _raid_rmeta_extents(cmd, rimage_extents_new, region_size, extent_size);
+
+ /* Need minimum size on LV creation */
+ if (!rimage_extents_cur)
+ return rmeta_extents_new;
+
+ /* Need current size on LV deletion */
+ if (!rimage_extents_new)
+ return rmeta_extents_cur;
+
+ if (rmeta_extents_new == rmeta_extents_cur)
+ return 0;
+
+ /* Extending/reducing... */
+ return rmeta_extents_new > rmeta_extents_cur ?
+ rmeta_extents_new - rmeta_extents_cur :
+ rmeta_extents_cur - rmeta_extents_new;
+}
+
+/* Calculate raid rimage extents required based on total @extents for @segtype, @stripes and @data_copies */
+uint32_t raid_rimage_extents(const struct segment_type *segtype,
+ uint32_t extents, uint32_t stripes, uint32_t data_copies)
+{
+ uint64_t r;
+
+ if (!extents ||
+ segtype_is_mirror(segtype) ||
+ segtype_is_raid1(segtype))
+ return extents;
+
+ r = extents;
+ if (segtype_is_any_raid10(segtype))
+ r *= (data_copies ?: 1); /* Caller should ensure data_copies > 0 */
+
+ r = dm_div_up(r, stripes ?: 1); /* Caller should ensure stripes > 0 */
+
+ return r > UINT_MAX ? 0 : (uint32_t) r;
+}
+
+/*
* _alloc_rmeta_for_lv
* @lv
*
@@ -806,7 +854,8 @@ static int _alloc_rmeta_for_lv(struct logical_volume *data_lv,
if (!(ah = allocate_extents(data_lv->vg, NULL, seg->segtype, 0, 1, 0,
seg->region_size,
- 1 /*RAID_METADATA_AREA_LEN*/,
+ raid_rmeta_extents_delta(data_lv->vg->cmd, 0, data_lv->le_count,
+ seg->region_size, data_lv->vg->extent_size),
allocate_pvs, data_lv->alloc, 0, NULL)))
return_0;
@@ -866,6 +915,11 @@ static int _raid_add_images_without_commit(struct logical_volume *lv,
/* A complete resync will be done, no need to mark each sub-lv */
status_mask = ~(LV_REBUILD);
+ /* FIXME: allow setting region size on upconvert from linear */
+ seg->region_size = get_default_region_size(lv->vg->cmd);
+ /* MD's bitmap is limited to tracking 2^21 regions */
+ seg->region_size = raid_ensure_min_region_size(lv, lv->size, seg->region_size);
+
if (!(lvl = dm_pool_alloc(lv->vg->vgmem, sizeof(*lvl)))) {
log_error("Memory allocation failed.");
return 0;
@@ -912,7 +966,9 @@ static int _raid_add_images_without_commit(struct logical_volume *lv,
goto fail;
if (seg_is_linear(seg)) {
- first_seg(lv)->status |= RAID_IMAGE;
+ uint32_t region_size = seg->region_size;
+
+ seg->status |= RAID_IMAGE;
if (!insert_layer_for_lv(lv->vg->cmd, lv,
RAID | LVM_READ | LVM_WRITE,
"_rimage_0"))
@@ -920,15 +976,8 @@ static int _raid_add_images_without_commit(struct logical_volume *lv,
lv->status |= RAID;
seg = first_seg(lv);
+ seg->region_size = region_size;
seg_lv(seg, 0)->status |= RAID_IMAGE | LVM_READ | LVM_WRITE;
- seg->region_size = get_default_region_size(lv->vg->cmd);
-
- /* MD's bitmap is limited to tracking 2^21 regions */
- while (seg->region_size < (lv->size / (1 << 21))) {
- seg->region_size *= 2;
- log_very_verbose("Setting RAID1 region_size to %uS.",
- seg->region_size);
- }
if (!(seg->segtype = get_segtype_from_string(lv->vg->cmd, SEG_TYPE_NAME_RAID1)))
return_0;
}
@@ -3875,7 +3924,8 @@ replaced:
* Change region size on raid @lv to @region_size if
* different from current region_size and adjusted region size
*/
-static int _region_size_change_requested(struct logical_volume *lv, int yes, uint32_t region_size)
+static int _region_size_change_requested(struct logical_volume *lv, int yes, uint32_t region_size,
+ struct dm_list *allocate_pvs)
{
uint32_t old_region_size;
const char *seg_region_size_str;
@@ -3937,6 +3987,7 @@ static int _region_size_change_requested(struct logical_volume *lv, int yes, uin
_raid_rmeta_extents(lv->vg->cmd, lv->le_count, seg->region_size, lv->vg->extent_size)) {
log_error("Region size %s on %s is too small for metadata LV size.",
seg_region_size_str, display_lvname(lv));
+if (!lv_extend(lv, seg->segtype, seg->area_count - seg->segtype->parity_devs, seg->stripe_size, 1, seg->region_size, 0, allocate_pvs, lv->vg->alloc, 0))
return 0;
}
@@ -4035,7 +4086,7 @@ int lv_raid_convert(struct logical_volume *lv,
if (new_segtype == seg->segtype &&
new_region_size != seg->region_size &&
seg_is_raid(seg) && !seg_is_any_raid0(seg))
- return _region_size_change_requested(lv, yes, new_region_size);
+ return _region_size_change_requested(lv, yes, new_region_size, allocate_pvs);
} else
new_region_size = seg->region_size ? : get_default_region_size(lv->vg->cmd);
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 027e3f4..7c3daa5 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -1413,10 +1413,10 @@ have_raid() {
}
have_raid4 () {
- local r=1
+ local r=0
- have_raid 1 8 0 && r=0
- have_raid 1 9 1 && r=1
+ have_raid 1 8 0 && r=1
+ have_raid 1 9 1 && r=0
return $r
}
diff --git a/test/shell/lvconvert-repair-raid.sh b/test/shell/lvconvert-repair-raid.sh
index 26bca3d..3052f5c 100644
--- a/test/shell/lvconvert-repair-raid.sh
+++ b/test/shell/lvconvert-repair-raid.sh
@@ -20,7 +20,7 @@ aux raid456_replace_works || skip
aux lvmconf 'allocation/maximise_cling = 0' \
'allocation/mirror_logs_require_separate_pvs = 1'
-aux prepare_vg 8
+aux prepare_vg 8 80
function delay
{
diff --git a/test/shell/lvresize-raid.sh b/test/shell/lvresize-raid.sh
index 4eabe4c..4f22740 100644
--- a/test/shell/lvresize-raid.sh
+++ b/test/shell/lvresize-raid.sh
@@ -16,8 +16,8 @@ SKIP_WITH_LVMPOLLD=1
aux have_raid 1 3 0 || skip
-levels="5 6"
-aux have_raid4 && levels="4 5 6"
+levels="5 6 10"
+aux have_raid4 && levels="0 0_meta 4 $levels"
aux prepare_pvs 6 80
@@ -39,9 +39,10 @@ for deactivate in true false; do
#check raid_images_contiguous $vg $lv1
-# Extend and reduce 3-striped RAID 4/5/6
+# Extend and reduce 3-striped RAID 4/5/6/10
for i in $levels ; do
lvcreate --type raid$i -i 3 -l 3 -n $lv2 $vg
+ check lv_field $vg/$lv2 "seg_size" "768.00k"
test $deactivate && {
aux wait_for_sync $vg $lv2
@@ -49,10 +50,12 @@ for deactivate in true false; do
}
lvresize -l +3 $vg/$lv2
+ check lv_field $vg/$lv2 "seg_size" "1.50m"
#check raid_images_contiguous $vg $lv1
should lvresize -y -l -3 $vg/$lv2
+ should check lv_field $vg/$lv2 "seg_size" "768.00k"
#check raid_images_contiguous $vg $lv1
1
0
07 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=79f31008fa10cc48…
Commit: 79f31008fa10cc4893b6f98ad3e0de188aa5e7b0
Parent: 69fe8729f3d60b0c9b9a0b2db6b36e38c00b9127
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Tue Feb 7 19:01:02 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Tue Feb 7 19:05:01 2017 +0100
lvconvert: add support to change RAID region size (fixup)
Commit cfb6ef654d3d1f1dd02569a1d5bd2fc252ae2494 introduced
support to change RAID region size.
Fix:
- don't change region_size until after prompting the user
- use log_print_unless_silent() instead of log_warn()
- avoid superfluous sigint() calls which are already
covered in yes_no_prompt()
- typo
Related: rhbz1392947
---
lib/metadata/raid_manip.c | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index f55d3d8..ae779fe 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -2913,8 +2913,6 @@ static int _raid1_to_mirrored_wrapper(TAKEOVER_FN_ARGS)
display_lvname(lv), SEG_TYPE_NAME_MIRROR);
return 0;
}
- if (sigint_caught())
- return_0;
/* Archive metadata */
if (!archive(lv->vg))
@@ -3128,8 +3126,6 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
display_lvname(lv), new_segtype->name);
return 0;
}
- if (sigint_caught())
- return_0;
/* Archive metadata */
if (!archive(lv->vg))
@@ -3889,14 +3885,14 @@ static int _region_size_change_requested(struct logical_volume *lv, int yes, uin
if (!region_size)
return_0;
- /* CLI validation prvides the check but be caucious... */
+ /* CLI validation provides the check but be caucious... */
if (seg_is_any_raid0(seg))
return_0;
if (region_size == seg->region_size) {
- log_warn("Region size wouldn't change on %s LV %s.",
- lvseg_name(seg), display_lvname(lv));
- return 0;
+ log_print_unless_silent("Region size wouldn't change on %s LV %s.",
+ lvseg_name(seg), display_lvname(lv));
+ return 1;
}
if (region_size * 8 > lv->size) {
@@ -3906,7 +3902,7 @@ static int _region_size_change_requested(struct logical_volume *lv, int yes, uin
}
if (region_size < seg->stripe_size) {
- log_error("Region size for LV %s is smaller than stripe size.",
+ log_error("Requested region size for LV %s is smaller than stripe size.",
display_lvname(lv));
return 0;
}
@@ -3918,8 +3914,16 @@ static int _region_size_change_requested(struct logical_volume *lv, int yes, uin
}
old_region_size = seg->region_size;
+ seg_region_size_str = display_size(lv->vg->cmd, region_size);
+
+ if (!yes && yes_no_prompt("Do you really want to change the region_size %s of LV %s to %s? [y/n]: ",
+ display_size(lv->vg->cmd, old_region_size),
+ display_lvname(lv), seg_region_size_str) == 'n') {
+ log_error("Logical volume %s NOT converted", display_lvname(lv));
+ return 0;
+ }
+
seg->region_size = region_size;
- seg_region_size_str = display_size(lv->vg->cmd, seg->region_size);
_check_and_adjust_region_size(lv);
if (seg->region_size == old_region_size) {
@@ -3928,15 +3932,6 @@ static int _region_size_change_requested(struct logical_volume *lv, int yes, uin
return 1;
}
- if (!yes && yes_no_prompt("Do you really want to change the region_size %s of LV %s to %s? [y/n]: ",
- display_size(lv->vg->cmd, old_region_size),
- display_lvname(lv), seg_region_size_str) == 'n') {
- log_error("Logical volume %s NOT converted", display_lvname(lv));
- return 0;
- }
- if (sigint_caught())
- return_0;
-
/* Check for new region size causing bitmap to still fit metadata image LV */
if (seg->meta_areas && seg_metatype(seg, 0) == AREA_LV && seg_metalv(seg, 0)->le_count <
_raid_rmeta_extents(lv->vg->cmd, lv->le_count, seg->region_size, lv->vg->extent_size)) {
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=69fe8729f3d60b0c…
Commit: 69fe8729f3d60b0c9b9a0b2db6b36e38c00b9127
Parent: 46a772fbc4e121f8e9e65d3be022bbace79be1f2
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Tue Feb 7 17:48:17 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Tue Feb 7 17:48:17 2017 +0100
lvconvert: avoid setting segment flag
Fix:
- don't set SEG_RAID in _convert_mirror_to_raid1() errounously
Related: rhbz1366296
---
lib/metadata/raid_manip.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 6efbc5c..f55d3d8 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -2196,7 +2196,6 @@ static int _convert_mirror_to_raid1(struct logical_volume *lv,
lv->status &= ~MIRROR;
lv->status &= ~MIRRORED;
lv->status |= RAID;
- seg->status |= SEG_RAID;
if (!lv_update_and_reload(lv))
return_0;
1
0
07 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=46a772fbc4e121f8…
Commit: 46a772fbc4e121f8e9e65d3be022bbace79be1f2
Parent: 91c4bd14d0a6d07366375e86e6cdff0da2e2bdc4
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Tue Feb 7 16:52:04 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Tue Feb 7 16:52:04 2017 +0100
lvconvert: add support to change RAID region size (fixup)
Commit cfb6ef654d3d1f1dd02569a1d5bd2fc252ae2494 introduced
support to change RAID region size.
Add:
- missing conditions to support any types to function with
it in lv_raid_convert(); temporary workaround used until
cli validation patches get merged
- tests requesting "-R " to lvconvert-raid-takeover.sh
involving a cleanup of the script
Related: rhbz1392947
---
lib/metadata/raid_manip.c | 24 ++++++++--
test/shell/lvconvert-raid-takeover.sh | 78 +++++++++++++++++++-------------
tools/lvconvert.c | 12 ++++-
3 files changed, 75 insertions(+), 39 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 0c541fb..6efbc5c 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -3180,7 +3180,7 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
} else
seg->segtype = new_segtype;
- seg->region_size = region_size;
+ seg->region_size = new_region_size ?: region_size;
if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, &removal_lvs))
return_0;
@@ -3430,6 +3430,8 @@ static int _takeover_from_mirrored_to_raid0_meta(TAKEOVER_FN_ARGS)
static int _takeover_from_mirrored_to_raid1(TAKEOVER_FN_ARGS)
{
+ first_seg(lv)->region_size = new_region_size;
+
return _convert_mirror_to_raid1(lv, new_segtype);
}
@@ -3610,7 +3612,8 @@ static int _takeover_from_raid45_to_raid1(TAKEOVER_FN_ARGS)
static int _takeover_from_raid45_to_raid54(TAKEOVER_FN_ARGS)
{
- return _raid45_to_raid54_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count, 2 /* data_copies */, 0, 0, 0, allocate_pvs);
+ return _raid45_to_raid54_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count,
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid45_to_raid6(TAKEOVER_FN_ARGS)
@@ -4002,7 +4005,8 @@ int lv_raid_convert(struct logical_volume *lv,
const unsigned new_stripes,
const unsigned new_stripe_size_supplied,
const unsigned new_stripe_size,
- const uint32_t new_region_size,
+ /* FIXME: workaround with volatile new_region_size until cli validation patches got merged */
+ uint32_t new_region_size,
struct dm_list *allocate_pvs)
{
struct lv_segment *seg = first_seg(lv);
@@ -4028,8 +4032,18 @@ int lv_raid_convert(struct logical_volume *lv,
return_0;
/* Change RAID region size */
- if (new_region_size && new_region_size != seg->region_size)
- return _region_size_change_requested(lv, yes, new_region_size);
+ /*
+ * FIXME: workaround with volatile new_region_size until the
+ * cli validation patches got merged when we'll change
+ * the API to have new_region_size_supplied to check for.
+ */
+ if (new_region_size) {
+ if (new_segtype == seg->segtype &&
+ new_region_size != seg->region_size &&
+ seg_is_raid(seg) && !seg_is_any_raid0(seg))
+ return _region_size_change_requested(lv, yes, new_region_size);
+ } else
+ new_region_size = seg->region_size ? : get_default_region_size(lv->vg->cmd);
/*
* Check acceptible options mirrors, region_size,
diff --git a/test/shell/lvconvert-raid-takeover.sh b/test/shell/lvconvert-raid-takeover.sh
index 4565cc8..c7b569a 100644
--- a/test/shell/lvconvert-raid-takeover.sh
+++ b/test/shell/lvconvert-raid-takeover.sh
@@ -7,7 +7,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA
SKIP_WITH_LVMLOCKD=1
SKIP_WITH_LVMPOLLD=1
@@ -44,13 +44,20 @@ function _lvconvert
local stripes=$3
local vg=$4
local lv=$5
- local dont_wait=$6
+ local region_size=$6
+ local wait_and_check=1
+ local R=""
- lvconvert -y --ty $req_level $vg/$lv
+ [ -n "$region_size" ] && R="-R $region_size"
+ [ "${level:0:7}" = "striped" ] && wait_and_check=0
+ [ "${level:0:5}" = "raid0" ] && wait_and_check=0
+
+
+ lvconvert -y --ty $req_level $R $vg/$lv
[ $? -ne 0 ] && return $?
check lv_field $vg/$lv segtype "$level"
check lv_field $vg/$lv stripes $stripes
- if [ -z "$dont_wait" ]
+ if [ "$wait_and_check" -eq 1 ]
then
fsck -fn /dev/mapper/$vg-$lv
aux wait_for_sync $vg $lv
@@ -60,8 +67,8 @@ function _lvconvert
function _invalid_raid5_conversions
{
- local lv=$1
- local vg=$2
+ local vg=$1
+ local lv=$2
not _lvconvert striped 4 $vg $lv1
not _lvconvert raid0 raid0 4 $vg $lv1
@@ -78,14 +85,15 @@ function _invalid_raid5_conversions
not _lvconvert raid6 raid6_n_6 6 $vg $lv1
}
-# Delay 1st leg so that rebuilding status characters
+# Delayst leg so that rebuilding status characters
# can be read before resync finished too quick.
-# aux delay_dev "$dev1" 0 1
+# aux delay_dev "$dev1" 1
# Create 3-way mirror
-lvcreate --yes -aey --type mirror -m 2 -L 64M -n $lv1 $vg
+lvcreate --yes -aey --type mirror -R 64K -m 2 -L 64M -n $lv1 $vg
check lv_field $vg/$lv1 segtype "mirror"
check lv_field $vg/$lv1 stripes 3
+check lv_field $vg/$lv1 regionsize "64.00k"
echo y | mkfs -t ext4 /dev/mapper/$vg-$lv1
aux wait_for_sync $vg $lv1
fsck -fn /dev/mapper/$vg-$lv1
@@ -99,15 +107,18 @@ aux wait_for_sync $vg $lv1
fsck -fn /dev/mapper/$vg-$lv1
# Takeover 4-way mirror to raid1
-lvconvert --yes --type raid1 $vg/$lv1
+lvconvert --yes --type raid1 -R 64k $vg/$lv1
check lv_field $vg/$lv1 segtype "raid1"
check lv_field $vg/$lv1 stripes 4
+check lv_field $vg/$lv1 regionsize "64.00k"
fsck -fn /dev/mapper/$vg-$lv1
## Convert 4-way raid1 to 5-way
-lvconvert -m 4 $vg/$lv1
+lvconvert -m 4 -R 128K $vg/$lv1
check lv_field $vg/$lv1 segtype "raid1"
check lv_field $vg/$lv1 stripes 5
+# FIXME: once lv_raid_chanage_image_count() supports region_size changes
+not check lv_field $vg/$lv1 regionsize "128.00k"
fsck -fn /dev/mapper/$vg-$lv1
aux wait_for_sync $vg $lv1
fsck -fn /dev/mapper/$vg-$lv1
@@ -128,9 +139,10 @@ check lv_field $vg/$lv1 stripes 2
fsck -fn /dev/mapper/$vg-$lv1
# Convert 2-way raid1 to mirror
-lvconvert --yes --type mirror $vg/$lv1
+lvconvert --yes --type mirror -R 32K $vg/$lv1
check lv_field $vg/$lv1 segtype "mirror"
check lv_field $vg/$lv1 stripes 2
+check lv_field $vg/$lv1 regionsize "32.00k"
aux wait_for_sync $vg $lv1
fsck -fn /dev/mapper/$vg-$lv1
aux wait_for_sync $vg $lv1
@@ -151,79 +163,81 @@ _lvcreate raid4 3 4 64M $vg $lv1
aux wait_for_sync $vg $lv1
# Convert raid4 -> striped
-_lvconvert striped striped 3 $vg $lv1 1
+_lvconvert striped striped 3 $vg $lv1
# Convert striped -> raid4
-_lvconvert raid4 raid4 4 $vg $lv1
+_lvconvert raid4 raid4 4 $vg $lv1 64k
+check lv_field $vg/$lv1 regionsize "64.00k"
# Convert raid4 -> raid5_n
-_lvconvert raid5 raid5_n 4 $vg $lv1 1
+_lvconvert raid5 raid5_n 4 $vg $lv1 128k
+check lv_field $vg/$lv1 regionsize "128.00k"
# Convert raid5_n -> striped
-_lvconvert striped striped 3 $vg $lv1 1
+_lvconvert striped striped 3 $vg $lv1
# Convert striped -> raid5_n
_lvconvert raid5_n raid5_n 4 $vg $lv1
# Convert raid5_n -> raid4
-_lvconvert raid4 raid4 4 $vg $lv1 1
+_lvconvert raid4 raid4 4 $vg $lv1
# Convert raid4 -> raid0
-_lvconvert raid0 raid0 3 $vg $lv1 1
+_lvconvert raid0 raid0 3 $vg $lv1
# Convert raid0 -> raid5_n
_lvconvert raid5_n raid5_n 4 $vg $lv1
# Convert raid5_n -> raid0_meta
-_lvconvert raid0_meta raid0_meta 3 $vg $lv1 1
+_lvconvert raid0_meta raid0_meta 3 $vg $lv1
# Convert raid0_meta -> raid5_n
_lvconvert raid5 raid5_n 4 $vg $lv1
# Convert raid4 -> raid0_meta
-_lvconvert raid0_meta raid0_meta 3 $vg $lv1 1
+_lvconvert raid0_meta raid0_meta 3 $vg $lv1
# Convert raid0_meta -> raid4
_lvconvert raid4 raid4 4 $vg $lv1
# Convert raid4 -> raid0
-_lvconvert raid0 raid0 3 $vg $lv1 1
+_lvconvert raid0 raid0 3 $vg $lv1
# Convert raid0 -> raid4
_lvconvert raid4 raid4 4 $vg $lv1
# Convert raid4 -> striped
-_lvconvert striped striped 3 $vg $lv1 1
+_lvconvert striped striped 3 $vg $lv1
# Convert striped -> raid6_n_6
_lvconvert raid6_n_6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> striped
-_lvconvert striped striped 3 $vg $lv1 1
+_lvconvert striped striped 3 $vg $lv1
# Convert striped -> raid6_n_6
_lvconvert raid6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> raid5_n
-_lvconvert raid5_n raid5_n 4 $vg $lv1 1
+_lvconvert raid5_n raid5_n 4 $vg $lv1
# Convert raid5_n -> raid6_n_6
_lvconvert raid6_n_6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> raid4
-_lvconvert raid4 raid4 4 $vg $lv1 1
+_lvconvert raid4 raid4 4 $vg $lv1
# Convert raid4 -> raid6_n_6
_lvconvert raid6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> raid0
-_lvconvert raid0 raid0 3 $vg $lv1 1
+_lvconvert raid0 raid0 3 $vg $lv1
# Convert raid0 -> raid6_n_6
_lvconvert raid6_n_6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> raid0_meta
-_lvconvert raid0_meta raid0_meta 3 $vg $lv1 1
+_lvconvert raid0_meta raid0_meta 3 $vg $lv1
# Convert raid0_meta -> raid6_n_6
_lvconvert raid6 raid6_n_6 5 $vg $lv1
@@ -239,7 +253,7 @@ not _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
not _lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
_lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
-_lvconvert raid5_ls raid5_ls 5 $vg $lv1 1
+_lvconvert raid5_ls raid5_ls 5 $vg $lv1
lvremove -y $vg
_lvcreate raid5_ls 4 5 64M $vg $lv1
@@ -249,7 +263,7 @@ not _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
not _lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
_lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
-_lvconvert raid5_ls raid5_ls 5 $vg $lv1 1
+_lvconvert raid5_ls raid5_ls 5 $vg $lv1
lvremove -y $vg
_lvcreate raid5_rs 4 5 64M $vg $lv1
@@ -259,7 +273,7 @@ not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
not _lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
_lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
-_lvconvert raid5_rs raid5_rs 5 $vg $lv1 1
+_lvconvert raid5_rs raid5_rs 5 $vg $lv1
lvremove -y $vg
_lvcreate raid5_la 4 5 64M $vg $lv1
@@ -269,7 +283,7 @@ not _lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
not _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
_lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
-_lvconvert raid5_la raid5_la 5 $vg $lv1 1
+_lvconvert raid5_la raid5_la 5 $vg $lv1
lvremove -y $vg
_lvcreate raid5_ra 4 5 64M $vg $lv1
@@ -279,7 +293,7 @@ not _lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
not _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
not _lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
_lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
-_lvconvert raid5_ra raid5_ra 5 $vg $lv1 1
+_lvconvert raid5_ra raid5_ra 5 $vg $lv1
lvremove -y $vg
else
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 32e04d6..382f170 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -2040,8 +2040,12 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
if (!arg_is_set(cmd, stripes_long_ARG))
lp->stripes = 0;
+ /*
+ * FIXME: arg_is_set() workaround for region size until the cli validation patches got merged;
+ * i needs "--type raid*", because lp->region_size isn't set w/o it
+ */
if (!lv_raid_convert(lv, lp->segtype, lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size,
- lp->region_size, lp->pvh))
+ arg_is_set(cmd, regionsize_ARG) ? lp->region_size : 0, lp->pvh))
return_0;
log_print_unless_silent("Logical volume %s successfully converted.",
@@ -2108,8 +2112,12 @@ try_new_takeover_or_reshape:
if (lp->type_str && lp->type_str[0] && lp->segtype != seg->segtype &&
((seg_is_raid4(seg) && seg_is_striped(lp) && lp->stripes > 1) ||
(seg_is_striped(seg) && seg->area_count > 1 && seg_is_raid4(lp)))) {
+ /*
+ * FIXME: arg_is_set() workaround for region size until the cli validation patches got merged;
+ * i needs "--type raid*", because lp->region_size isn't set w/o it
+ */
if (!lv_raid_convert(lv, lp->segtype, lp->yes, lp->force, lp->stripes, lp->stripe_size_supplied, lp->stripe_size,
- lp->region_size, lp->pvh))
+ arg_is_set(cmd, regionsize_ARG) ? lp->region_size : 0, lp->pvh))
return_0;
log_print_unless_silent("Logical volume %s successfully converted.",
1
0
master - lvconvert: add segtype raid5_n and conversions to/from it (cleanup)
by Heinz Mauelshagen 07 Feb '17
by Heinz Mauelshagen 07 Feb '17
07 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=91c4bd14d0a6d073…
Commit: 91c4bd14d0a6d07366375e86e6cdff0da2e2bdc4
Parent: cfb6ef654d3d1f1dd02569a1d5bd2fc252ae2494
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Tue Feb 7 12:25:26 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Tue Feb 7 12:25:26 2017 +0100
lvconvert: add segtype raid5_n and conversions to/from it (cleanup)
Cleanups as of Jons review:
- enhance comment about mandatory raid4 <-> raid5_n activation w/o metadata SubLVs
- remove bogus segment flag setting
- fix to sync related comments on conversions to raid0/striped and amongst raid4/5
- add missing error message for non-synced conversion to raid0/striped
Related: rhbz1366296
---
lib/metadata/merge.c | 9 ++++++++-
lib/metadata/raid_manip.c | 11 +++++++----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c
index dbd91db..6311818 100644
--- a/lib/metadata/merge.c
+++ b/lib/metadata/merge.c
@@ -148,7 +148,14 @@ static void _check_raid1_seg(struct lv_segment *seg, int *error_count)
static void _check_raid45610_seg(struct lv_segment *seg, int *error_count)
{
/* Checks applying to any raid4/5/6/10 */
- /* Allow raid4 + raid5_n to get activated w/o metadata (mandatory during conversion between them) */
+ /*
+ * Allow raid4 + raid5_n to get activated w/o metadata.
+ *
+ * This is mandatory during conversion between them,
+ * because switching the dedicated parity SubLVs
+ * beginning <-> end changes the roles of all SubLVs
+ * which the kernel would reject.
+ */
if (!(seg_is_raid4(seg) || seg_is_raid5_n(seg)) && !seg->meta_areas)
raid_seg_error("no meta areas");
if (!seg->stripe_size)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 9b9f5f3..0c541fb 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -2196,7 +2196,7 @@ static int _convert_mirror_to_raid1(struct logical_volume *lv,
lv->status &= ~MIRROR;
lv->status &= ~MIRRORED;
lv->status |= RAID;
- seg->status |= RAID;
+ seg->status |= SEG_RAID;
if (!lv_update_and_reload(lv))
return_0;
@@ -3114,9 +3114,12 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
dm_list_init(&removal_lvs);
- /* Necessary when convering to raid0/striped w/o redundancy? */
- if (!_raid_in_sync(lv))
+ /* Necessary when converting to raid0/striped w/o redundancy. */
+ if (!_raid_in_sync(lv)) {
+ log_error("Unable to convert %s while it is not in-sync.",
+ display_lvname(lv));
return 0;
+ }
if (!yes && yes_no_prompt("Are you sure you want to convert \"%s\" LV %s to \"%s\" "
"type losing %s resilience? [y/n]: ",
@@ -3224,7 +3227,7 @@ static int _raid45_to_raid54_wrapper(TAKEOVER_FN_ARGS)
}
- /* Necessary when convering to raid0/striped w/o redundancy? */
+ /* Necessary when convering to raid0/striped w/o redundancy. */
if (!_raid_in_sync(lv)) {
log_error("Unable to convert %s while it is not in-sync.",
display_lvname(lv));
1
0
06 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cfb6ef654d3d1f1d…
Commit: cfb6ef654d3d1f1dd02569a1d5bd2fc252ae2494
Parent: 51d03acb1c910a65ff05a0a339ed6a4ff957c0db
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Mon Feb 6 22:09:26 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Tue Feb 7 01:01:19 2017 +0100
lvconvert: add support to change RAID region size
Add:
- support to change region size of existing RaidLVs
(all RAID LV types but raid0/raid0_meta)
- lvconvert-raid-regionsize.sh with test variations
for different RAID types and region sizes
Resolves: rhbz1392947
---
WHATS_NEW | 1 +
lib/metadata/raid_manip.c | 105 +++++++++++++++++++++++++++++++
test/shell/lvconvert-raid-regionsize.sh | 90 ++++++++++++++++++++++++++
tools/lvconvert.c | 4 +-
4 files changed, 198 insertions(+), 2 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index cbe6c05..c6994ca 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Support region size changes on existing RaidLVs
Avoid parallel usage of cpg_mcast_joined() in clvmd with corosync.
Support raid6_{ls,rs,la,ra}_6 segment types and conversions from/to it.
Support raid6_n_6 segment type and conversions from/to it.
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 736e2ee..9b9f5f3 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -746,6 +746,27 @@ static int _alloc_image_components(struct logical_volume *lv,
}
/*
+ * HM Helper:
+ *
+ * Calculate absolute amount of metadata device extents based
+ * on @rimage_extents, @region_size and @extent_size.
+ */
+static uint32_t _raid_rmeta_extents(struct cmd_context *cmd, uint32_t rimage_extents,
+ uint32_t region_size, uint32_t extent_size)
+{
+ uint64_t bytes, regions, sectors;
+
+ region_size = region_size ?: get_default_region_size(cmd);
+ regions = (uint64_t) rimage_extents * extent_size / region_size;
+
+ /* raid and bitmap superblocks + region bytes */
+ bytes = 2 * 4096 + dm_div_up(regions, 8);
+ sectors = dm_div_up(bytes, 512);
+
+ return dm_div_up(sectors, extent_size);
+}
+
+/*
* _alloc_rmeta_for_lv
* @lv
*
@@ -3847,6 +3868,86 @@ replaced:
return 1;
}
+/*
+ * HM Helper:
+ *
+ * Change region size on raid @lv to @region_size if
+ * different from current region_size and adjusted region size
+ */
+static int _region_size_change_requested(struct logical_volume *lv, int yes, uint32_t region_size)
+{
+ uint32_t old_region_size;
+ const char *seg_region_size_str;
+ struct lv_segment *seg = first_seg(lv);
+
+ /* Caller should ensure this */
+ if (!region_size)
+ return_0;
+
+ /* CLI validation prvides the check but be caucious... */
+ if (seg_is_any_raid0(seg))
+ return_0;
+
+ if (region_size == seg->region_size) {
+ log_warn("Region size wouldn't change on %s LV %s.",
+ lvseg_name(seg), display_lvname(lv));
+ return 0;
+ }
+
+ if (region_size * 8 > lv->size) {
+ log_error("Requested region size too large for LV %s size %s.",
+ display_lvname(lv), display_size(lv->vg->cmd, lv->size));
+ return 0;
+ }
+
+ if (region_size < seg->stripe_size) {
+ log_error("Region size for LV %s is smaller than stripe size.",
+ display_lvname(lv));
+ return 0;
+ }
+
+ if (!_raid_in_sync(lv)) {
+ log_error("Unable to change region size on %s LV %s while it is not in-sync.",
+ lvseg_name(seg), display_lvname(lv));
+ return 0;
+ }
+
+ old_region_size = seg->region_size;
+ seg->region_size = region_size;
+ seg_region_size_str = display_size(lv->vg->cmd, seg->region_size);
+ _check_and_adjust_region_size(lv);
+
+ if (seg->region_size == old_region_size) {
+ log_warn("Region size on %s did not change due to adjustment.",
+ display_lvname(lv));
+ return 1;
+ }
+
+ if (!yes && yes_no_prompt("Do you really want to change the region_size %s of LV %s to %s? [y/n]: ",
+ display_size(lv->vg->cmd, old_region_size),
+ display_lvname(lv), seg_region_size_str) == 'n') {
+ log_error("Logical volume %s NOT converted", display_lvname(lv));
+ return 0;
+ }
+ if (sigint_caught())
+ return_0;
+
+ /* Check for new region size causing bitmap to still fit metadata image LV */
+ if (seg->meta_areas && seg_metatype(seg, 0) == AREA_LV && seg_metalv(seg, 0)->le_count <
+ _raid_rmeta_extents(lv->vg->cmd, lv->le_count, seg->region_size, lv->vg->extent_size)) {
+ log_error("Region size %s on %s is too small for metadata LV size.",
+ seg_region_size_str, display_lvname(lv));
+ return 0;
+ }
+
+ if (!lv_update_and_reload_origin(lv))
+ return_0;
+
+ log_warn("Changed region size on RAID LV %s to %s.",
+ display_lvname(lv), seg_region_size_str);
+ return 1;
+}
+
/* Check allowed conversion from seg_from to *segtype_to */
static int _conversion_options_allowed(const struct lv_segment *seg_from,
const struct segment_type **segtype_to,
@@ -3923,6 +4024,10 @@ int lv_raid_convert(struct logical_volume *lv,
if (segtype_is_raid(new_segtype) && !_check_max_raid_devices(new_image_count))
return_0;
+ /* Change RAID region size */
+ if (new_region_size && new_region_size != seg->region_size)
+ return _region_size_change_requested(lv, yes, new_region_size);
+
/*
* Check acceptible options mirrors, region_size,
* stripes and/or stripe_size have been provided.
diff --git a/test/shell/lvconvert-raid-regionsize.sh b/test/shell/lvconvert-raid-regionsize.sh
new file mode 100644
index 0000000..4f0e90d
--- /dev/null
+++ b/test/shell/lvconvert-raid-regionsize.sh
@@ -0,0 +1,90 @@
+#!/bin/sh
+# Copyright (C) 2017 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+SKIP_WITH_LVMLOCKD=1
+SKIP_WITH_LVMPOLLD=1
+
+. lib/inittest
+
+aux have_raid 1 9 0 || skip
+
+aux prepare_vg 6
+
+function _test_regionsize
+{
+ local type=$1
+ local regionsize=$2
+ local regionsize_str=$3
+ local vg=$4
+ local lv=$5
+
+ lvconvert --type $type --yes -R $regionsize $vg/$lv
+ [ $? -ne 0 ] && return 1
+ check lv_field $vg/$lv regionsize "$regionsize_str"
+ fsck -fn /dev/mapper/$vg-$lv
+}
+
+function _test_regionsizes
+{
+ # FIXME: have to provide raid type or region size ain't set until cli validation merged
+ local type=$1
+
+ # Test RAID regionsize changes
+ _test_regionsize $type 128K "128.00k" $vg $lv1
+ _test_regionsize $type 256K "256.00k" $vg $lv1
+ not _test_regionsize $type 1K "1.00k" $vg $lv1
+ _test_regionsize $type 1m "1.00m" $vg $lv1
+ not _test_regionsize $type 1G "1.00g" $vg $lv1
+ not _test_regionsize $type 16K "16.00k" $vg $lv1
+}
+
+# Create 3-way raid1
+lvcreate --yes -aey --type raid1 -m 2 -R64K -L 64M -n $lv1 $vg
+check lv_field $vg/$lv1 segtype "raid1"
+check lv_field $vg/$lv1 stripes 3
+check lv_field $vg/$lv1 regionsize "64.00k"
+echo y | mkfs -t ext4 /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+_test_regionsizes raid1
+
+# Clean up
+lvremove --yes $vg
+
+# Create 5-way raid6
+lvcreate --yes -aey --type raid6 -i 3 --stripesize 128K -R 256K -L 64M -n $lv1 $vg
+check lv_field $vg/$lv1 segtype "raid6"
+check lv_field $vg/$lv1 stripes 5
+check lv_field $vg/$lv1 stripesize "128.00k"
+check lv_field $vg/$lv1 regionsize "256.00k"
+echo y | mkfs -t ext4 /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+_test_regionsizes raid6
+
+# Clean up
+lvremove --yes $vg
+
+# Create 6-way raid01
+lvcreate --yes -aey --type raid10 -i 3 -m 1 --stripesize 128K -R 256K -L 64M -n $lv1 $vg
+check lv_field $vg/$lv1 segtype "raid10"
+check lv_field $vg/$lv1 stripes 6
+check lv_field $vg/$lv1 stripesize "128.00k"
+check lv_field $vg/$lv1 regionsize "256.00k"
+echo y | mkfs -t ext4 /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+_test_regionsizes raid10
+
+vgremove -ff $vg
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index ba8396f..32e04d6 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -2012,13 +2012,13 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
return 1;
}
goto try_new_takeover_or_reshape;
- } else if (!lp->repair && !lp->replace && (!*lp->type_str || seg->segtype == lp->segtype)) {
+ } else if (!lp->repair && !lp->replace && !arg_is_set(cmd, regionsize_ARG) && (!*lp->type_str || seg->segtype == lp->segtype)) {
log_error("Conversion operation not yet supported.");
return 0;
}
if ((seg_is_linear(seg) || seg_is_striped(seg) || seg_is_mirrored(seg) || lv_is_raid(lv)) &&
- (lp->type_str && lp->type_str[0])) {
+ ((lp->type_str && lp->type_str[0]) || arg_is_set(cmd, regionsize_ARG))) {
/* Activation is required later which precludes existing supported raid0 segment */
if ((seg_is_any_raid0(seg) || segtype_is_any_raid0(lp->segtype)) &&
!(lp->target_attr & RAID_FEATURE_RAID0)) {
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=51d03acb1c910a65…
Commit: 51d03acb1c910a65ff05a0a339ed6a4ff957c0db
Parent: 48abbdf4524f316aa93b2d8b857b59803095ace3
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Feb 6 13:15:39 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 6 13:15:39 2017 +0100
tests: drop zeroing
Well waiting for zeroing may take enough time to finish 'raid' sync.
So make the test running faster without zeroing and better avoid race
to have chance to happen (i.e. lvcreate is finished after array
gets already in sync).
---
test/shell/lvcreate-raid-nosync.sh | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/test/shell/lvcreate-raid-nosync.sh b/test/shell/lvcreate-raid-nosync.sh
index 40baa17..1f01f47 100644
--- a/test/shell/lvcreate-raid-nosync.sh
+++ b/test/shell/lvcreate-raid-nosync.sh
@@ -16,8 +16,8 @@ SKIP_WITH_LVMPOLLD=1
aux have_raid 1 7 0 || skip
-segtypes=raid5
-aux have_raid4 && segtypes="raid4 raid5"
+segtypes="raid5"
+aux have_raid4 && segtypes="raid4 $segtypes"
aux prepare_vg 6
@@ -40,49 +40,49 @@ aux delay_dev "$dev1" 0 90 $(get first_extent_sector "$dev1")
# raid0/raid0_meta don't support resynchronization
for r in raid0 raid0_meta
do
- lvcreate --type $r -i 3 -l 1 -n $lv1 $vg
+ lvcreate --type $r -Zn -i 3 -l 1 -n $lv1 $vg
check raid_leg_status $vg $lv1 "AAA"
lvremove --yes $vg/$lv1
done
# raid1 supports resynchronization
-lvcreate --type raid1 -m 2 -l 4 -n $lv1 $vg
+lvcreate --type raid1 -m 2 -Zn -l 4 -n $lv1 $vg
check raid_leg_status $vg $lv1 "aaa"
_sync "AAA"
# raid1 supports --nosync
-lvcreate --type raid1 --nosync -m 2 -l 1 -n $lv1 $vg
+lvcreate --type raid1 --nosync -Zn -m 2 -l 1 -n $lv1 $vg
check raid_leg_status $vg $lv1 "AAA"
lvremove --yes $vg/$lv1
for r in $segtypes
do
# raid4/5 support resynchronization
- lvcreate --type $r -i 3 -l 4 -n $lv1 $vg
+ lvcreate --type $r -Zn -i 3 -l 4 -n $lv1 $vg
check raid_leg_status $vg $lv1 "aaaa"
_sync "AAAA"
# raid4/5 support --nosync
- lvcreate --type $r --nosync -i 3 -l 1 -n $lv2 $vg
+ lvcreate --type $r -Zn --nosync -i 3 -l 1 -n $lv2 $vg
check raid_leg_status $vg $lv2 "AAAA"
lvremove --yes $vg
done
# raid6 supports resynchronization
-lvcreate --type raid6 -i 3 -l 4 -n $lv1 $vg
+lvcreate --type raid6 -Zn -i 3 -l 4 -n $lv1 $vg
check raid_leg_status $vg $lv1 "aaaaa"
_sync "AAAAA"
# raid6 rejects --nosync; it has to initialize P- and Q-Syndromes
-not lvcreate --type raid6 --nosync -i 3 -l 1 -n $lv1 $vg
+not lvcreate --type raid6 --nosync -Zn -i 3 -l 1 -n $lv1 $vg
# raid10 supports resynchronization
-lvcreate --type raid10 -m 1 -i 3 -l 4 -n $lv1 $vg
+lvcreate --type raid10 -m 1 -Zn -i 3 -l 4 -n $lv1 $vg
check raid_leg_status $vg $lv1 "aaaaaa"
_sync "AAAAAA"
# raid10 supports --nosync
-lvcreate --type raid10 --nosync -m 1 -i 3 -l 1 -n $lv1 $vg
+lvcreate --type raid10 --nosync -m 1 -Zn -i 3 -l 1 -n $lv1 $vg
check raid_leg_status $vg $lv1 "AAAAAA"
vgremove -ff $vg
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=48abbdf4524f316a…
Commit: 48abbdf4524f316aa93b2d8b857b59803095ace3
Parent: 811d137d3f93da892365f9c9a4772033a891c687
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Feb 6 09:48:19 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 6 11:43:07 2017 +0100
tests: drop /tmp polution
Drop forgotten extra metadata debug.
---
test/shell/lvchange-cache-mode.sh | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/test/shell/lvchange-cache-mode.sh b/test/shell/lvchange-cache-mode.sh
index 947034b..f7b1081 100644
--- a/test/shell/lvchange-cache-mode.sh
+++ b/test/shell/lvchange-cache-mode.sh
@@ -38,8 +38,6 @@ done
lvs -o+cache_dirty_blocks,cache_read_hits,cache_read_misses,cache_write_hits,cache_write_misses $vg/$lv1
-vgcfgbackup -f /tmp/ooo $vg
-
#
# Drop later, code loading dm tables directly without lvm
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=811d137d3f93da89…
Commit: 811d137d3f93da892365f9c9a4772033a891c687
Parent: 9fe8c2da36a42a9cf08ef44ede172e1341033a24
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Mon Feb 6 11:41:22 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Mon Feb 6 11:43:07 2017 +0100
cleanup: hide gcc warning
Gcc is not clever enough to see these vars are actually initialize in
given code path so let's just make sure it has a value.
---
libdm/libdm-stats.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index f0342a0..f68874c 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -4584,7 +4584,7 @@ static uint64_t *_stats_map_file_regions(struct dm_stats *dms, int fd,
int precise, uint64_t group_id,
uint64_t *count, int *regroup)
{
- struct _extent *extents = NULL, *old_extents;
+ struct _extent *extents = NULL, *old_extents = NULL;
uint64_t *regions = NULL, fail_region;
struct dm_stats_group *group = NULL;
struct dm_pool *extent_mem = NULL;
@@ -4592,7 +4592,7 @@ static uint64_t *_stats_map_file_regions(struct dm_stats *dms, int fd,
char *hist_arg = NULL;
int update, num_bits;
struct statfs fsbuf;
- int64_t nr_kept, i;
+ int64_t nr_kept = 0, i;
struct stat buf;
update = _stats_group_id_present(dms, group_id);
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9fe8c2da36a42a9c…
Commit: 9fe8c2da36a42a9cf08ef44ede172e1341033a24
Parent: 12bbfbe89de5201f89ebad372ddd5f393142b13a
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sun Feb 5 17:30:23 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 5 17:55:37 2017 +0100
debug: add space before uuid
With commit 88534625282e8d533ae439ed308a285da10e3ef0 we added
uuid right after device name. Add space between them.
(Also fix some indenting)
---
libdm/ioctl/libdm-iface.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 390daa1..cb3e8dc 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -1851,10 +1851,10 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command,
dmi->flags &= ~DM_EXISTS_FLAG; /* FIXME */
else {
if (_log_suppress || dmt->ioctl_errno == EINTR)
- log_verbose("device-mapper: %s ioctl on %s%s%s%.0d%s%.0d%s%s "
+ log_verbose("device-mapper: %s ioctl on %s %s%s%.0d%s%.0d%s%s "
"failed: %s",
- _cmd_data_v4[dmt->type].name,
- dmi->name, dmi->uuid,
+ _cmd_data_v4[dmt->type].name,
+ dmi->name, dmi->uuid,
dmt->major > 0 ? "(" : "",
dmt->major > 0 ? dmt->major : 0,
dmt->major > 0 ? ":" : "",
@@ -1863,10 +1863,10 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command,
dmt->major > 0 ? ")" : "",
strerror(dmt->ioctl_errno));
else
- log_error("device-mapper: %s ioctl on %s%s%s%.0d%s%.0d%s%s "
+ log_error("device-mapper: %s ioctl on %s %s%s%.0d%s%.0d%s%s "
"failed: %s",
_cmd_data_v4[dmt->type].name,
- dmi->name, dmi->uuid,
+ dmi->name, dmi->uuid,
dmt->major > 0 ? "(" : "",
dmt->major > 0 ? dmt->major : 0,
dmt->major > 0 ? ":" : "",
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=12bbfbe89de5201f…
Commit: 12bbfbe89de5201f89ebad372ddd5f393142b13a
Parent: fb3f4ed72d6be15e99fdfe490049264eecc07997
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 4 15:44:25 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 5 17:55:37 2017 +0100
comment: update
Fix can -> cannot.
---
lib/activate/dev_manager.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index d36f113..cde026e 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -3075,7 +3075,7 @@ static int _tree_action(struct dev_manager *dm, const struct logical_volume *lv,
(laopts->origin_only) ? " origin-only" : "",
display_lvname(lv));
- /* Some LV can be used for top level tree */
+ /* Some LV cannot be used for top level tree */
/* TODO: add more.... */
if (lv_is_cache_pool(lv) && !dm_list_empty(&lv->segs_using_this_lv)) {
log_error(INTERNAL_ERROR "Cannot create tree for %s.",
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fb3f4ed72d6be15e…
Commit: fb3f4ed72d6be15e99fdfe490049264eecc07997
Parent: dae4f53acb269219e876c229c8f034fcdaf3ff5a
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 4 15:02:34 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 5 17:55:37 2017 +0100
cleanup: rename to use track_ prefix
Since we use 'track_' prefix for other deps tracking,
convert skip_external_lv to use same logical meaning.
(just converts 1->0 0->1)
---
lib/activate/dev_manager.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 6df254a..d36f113 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -61,7 +61,7 @@ struct dev_manager {
int flush_required;
int activation; /* building activation tree */
int suspend; /* building suspend tree */
- int skip_external_lv;
+ unsigned track_external_lv_deps;
struct dm_list pending_delete; /* str_list of dlid(s) with pending delete */
unsigned track_pending_delete;
unsigned track_pvmove_deps;
@@ -2039,16 +2039,16 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
#endif
}
- if (origin_only && dm->activation && !dm->skip_external_lv &&
+ if (origin_only && dm->activation && dm->track_external_lv_deps &&
lv_is_external_origin(lv)) {
/* Find possible users of external origin lv */
- dm->skip_external_lv = 1; /* avoid recursion */
+ dm->track_external_lv_deps = 0; /* avoid recursion */
dm_list_iterate_items(sl, &lv->segs_using_this_lv)
/* Match only external_lv users */
if ((sl->seg->external_lv == lv) &&
!_add_lv_to_dtree(dm, dtree, sl->seg->lv, 1))
return_0;
- dm->skip_external_lv = 0;
+ dm->track_external_lv_deps = 1;
}
if (lv_is_thin_pool(lv)) {
@@ -2148,7 +2148,7 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
/* Add any LVs used by segments in this LV */
dm_list_iterate_items(seg, &lv->segments) {
- if (seg->external_lv && !dm->skip_external_lv &&
+ if (seg->external_lv && dm->track_external_lv_deps &&
!_add_lv_to_dtree(dm, dtree, seg->external_lv, 1)) /* stack */
return_0;
if (seg->log_lv &&
@@ -2158,7 +2158,7 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
!_add_lv_to_dtree(dm, dtree, seg->metadata_lv, 0))
return_0;
if (seg->pool_lv &&
- (lv_is_cache_pool(seg->pool_lv) || !dm->skip_external_lv) &&
+ (lv_is_cache_pool(seg->pool_lv) || dm->track_external_lv_deps) &&
/* When activating and not origin_only detect linear 'overlay' over pool */
!_add_lv_to_dtree(dm, dtree, seg->pool_lv, dm->activation ? origin_only : 1))
return_0;
@@ -2575,7 +2575,7 @@ static int _add_new_external_lv_to_dtree(struct dev_manager *dm,
struct seg_list *sl;
/* Do not want to recursively add externals again */
- if (dm->skip_external_lv)
+ if (!dm->track_external_lv_deps)
return 1;
/*
@@ -2583,7 +2583,7 @@ static int _add_new_external_lv_to_dtree(struct dev_manager *dm,
* process all LVs related to this LV, and we want to
* skip repeated invocation of external lv processing
*/
- dm->skip_external_lv = 1;
+ dm->track_external_lv_deps = 0;
log_debug_activation("Adding external origin LV %s and all active users.",
display_lvname(external_lv));
@@ -2609,7 +2609,7 @@ static int _add_new_external_lv_to_dtree(struct dev_manager *dm,
log_debug_activation("Finished adding external origin LV %s and all active users.",
display_lvname(external_lv));
- dm->skip_external_lv = 0;
+ dm->track_external_lv_deps = 1;
return 1;
}
@@ -3085,6 +3085,7 @@ static int _tree_action(struct dev_manager *dm, const struct logical_volume *lv,
/* Some targets may build bigger tree for activation */
dm->activation = ((action == PRELOAD) || (action == ACTIVATE));
dm->suspend = (action == SUSPEND_WITH_LOCKFS) || (action == SUSPEND);
+ dm->track_external_lv_deps = 1;
if (!(dtree = _create_partial_dtree(dm, lv, laopts->origin_only)))
return_0;
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=dae4f53acb269219…
Commit: dae4f53acb269219e876c229c8f034fcdaf3ff5a
Parent: a4bbaa3b894f03e4ac21c979ec4e5201120703ad
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Sat Feb 4 14:47:27 2017 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Sun Feb 5 17:55:37 2017 +0100
clvmd: add mutex protection for cpg_ call
The library for corosync multicasting is not supporting multithread
usage - add local mutex to avoid parallel call of cpg_mcast_joined().
---
WHATS_NEW | 1 +
daemons/clvmd/clvmd-corosync.c | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 1c0ef6d..cbe6c05 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Avoid parallel usage of cpg_mcast_joined() in clvmd with corosync.
Support raid6_{ls,rs,la,ra}_6 segment types and conversions from/to it.
Support raid6_n_6 segment type and conversions from/to it.
Support raid5_n segment type and conversions from/to it.
diff --git a/daemons/clvmd/clvmd-corosync.c b/daemons/clvmd/clvmd-corosync.c
index 05c9882..2227cbf 100644
--- a/daemons/clvmd/clvmd-corosync.c
+++ b/daemons/clvmd/clvmd-corosync.c
@@ -532,6 +532,7 @@ static int _cluster_fd_callback(struct local_client *fd, char *buf, int len,
static int _cluster_send_message(const void *buf, int msglen, const char *csid,
const char *errtext)
{
+ static pthread_mutex_t _mutex = PTHREAD_MUTEX_INITIALIZER;
struct iovec iov[2];
cs_error_t err;
int target_node;
@@ -546,7 +547,10 @@ static int _cluster_send_message(const void *buf, int msglen, const char *csid,
iov[1].iov_base = (char *)buf;
iov[1].iov_len = msglen;
+ pthread_mutex_lock(&_mutex);
err = cpg_mcast_joined(cpg_handle, CPG_TYPE_AGREED, iov, 2);
+ pthread_mutex_unlock(&_mutex);
+
return cs_to_errno(err);
}
1
0
master - lvconvert: add segtypes raid6_{ls, rs, la, ra}_6 and conversions to/from it
by Heinz Mauelshagen 04 Feb '17
by Heinz Mauelshagen 04 Feb '17
04 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a4bbaa3b894f03e4…
Commit: a4bbaa3b894f03e4ac21c979ec4e5201120703ad
Parent: d8568552e460afe477f1baa7c46da81039f85b15
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Sun Feb 5 00:53:36 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Sun Feb 5 00:56:27 2017 +0100
lvconvert: add segtypes raid6_{ls,rs,la,ra}_6 and conversions to/from it
Add:
- support for segment types raid6_{ls,rs,la,ra}_6
(striped raid with dedicated last Q-Syndrome SubLVs)
- conversion support from raid5_{ls,rs,la,ra} to/from raid6_{ls,rs,la,ra}_6
- setting convenient segtypes on conversions from/to raid4/5/6
- related tests to lvconvert-raid-takeover.sh factoring
out _lvcreate,_lvconvert funxtions
Related: rhbz1366296
---
WHATS_NEW | 1 +
lib/metadata/raid_manip.c | 117 ++++++++-----
lib/metadata/segtype.h | 4 +
lib/raid/raid.c | 6 +-
libdm/libdm-deptree.c | 21 ++
test/shell/lvconvert-raid-takeover.sh | 324 +++++++++++++++------------------
6 files changed, 248 insertions(+), 225 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index cfa1179..1c0ef6d 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Support raid6_{ls,rs,la,ra}_6 segment types and conversions from/to it.
Support raid6_n_6 segment type and conversions from/to it.
Support raid5_n segment type and conversions from/to it.
Support new internal command _dmeventd_thin_command.
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index b769e34..736e2ee 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -2577,6 +2577,31 @@ static struct possible_takeover_reshape_type _possible_takeover_reshape_types[]
.current_areas = ~0U,
.options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+ /* raid5_ls <-> raid6_ls_6 */
+ { .current_types = SEG_RAID5_LS|SEG_RAID6_LS_6,
+ .possible_types = SEG_RAID5_LS|SEG_RAID6_LS_6,
+ .current_areas = ~0U,
+ .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+
+ /* raid5_rs -> raid6_rs_6 */
+ { .current_types = SEG_RAID5_RS|SEG_RAID6_RS_6,
+ .possible_types = SEG_RAID5_RS|SEG_RAID6_RS_6,
+ .current_areas = ~0U,
+ .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+
+ /* raid5_ls -> raid6_la_6 */
+ { .current_types = SEG_RAID5_LA|SEG_RAID6_LA_6,
+ .possible_types = SEG_RAID5_LA|SEG_RAID6_LA_6,
+ .current_areas = ~0U,
+ .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+
+ /* raid5_ls -> raid6_ra_6 */
+ { .current_types = SEG_RAID5_RA|SEG_RAID6_RA_6,
+ .possible_types = SEG_RAID5_RA|SEG_RAID6_RA_6,
+ .current_areas = ~0U,
+ .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+
+
/* mirror <-> raid1 with arbitrary number of legs */
{ .current_types = SEG_MIRROR|SEG_RAID1,
.possible_types = SEG_MIRROR|SEG_RAID1,
@@ -3068,14 +3093,6 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
dm_list_init(&removal_lvs);
- if (!seg_is_raid4(seg) &&
- !seg_is_raid5_n(seg) &&
- !seg_is_raid6_n_6(seg)) {
- log_error("LV %s has to be of type raid4/raid5_n/raid6_n_6 to allow for this conversion.",
- display_lvname(lv));
- return 0;
- }
-
/* Necessary when convering to raid0/striped w/o redundancy? */
if (!_raid_in_sync(lv))
return 0;
@@ -3254,7 +3271,7 @@ static int _striped_to_raid0_wrapper(struct logical_volume *lv,
return 1;
}
-/* Helper: striped/raid0* -> raid4/5/6/10 */
+/* Helper: striped/raid0* -> raid4/5/6/10, raid45 -> raid6 wrapper */
static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
{
uint32_t extents_copied, region_size, seg_len, stripe_size;
@@ -3263,25 +3280,9 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
dm_list_init(&removal_lvs);
- if (!seg_is_striped_target(seg) &&
- !seg_is_any_raid0(seg) &&
- !seg_is_raid4(seg) &&
- !seg_is_any_raid5(seg)) {
- log_error("Can't convert %s LV %s.", lvseg_name(seg), display_lvname(lv));
- return 0;
- }
-
if (seg_is_raid10(seg))
return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
- if (!segtype_is_raid4(new_segtype) &&
- !segtype_is_raid5_n(new_segtype) &&
- !segtype_is_raid6_n_6(new_segtype)) {
- /* Can't convert to e.g. raid10_offset */
- log_error("Can't convert %s to %s.", display_lvname(lv), new_segtype->name);
- return 0;
- }
-
if (new_data_copies > new_image_count) {
log_error("N number of data_copies \"--mirrors N-1\" may not be larger than number of stripes.");
return 0;
@@ -3292,15 +3293,6 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
return 0;
}
- /* FIXME: restricted to raid4 and raid5_n for the time being... */
- if (!segtype_is_raid4(new_segtype) &&
- !segtype_is_raid5_n(new_segtype) &&
- !segtype_is_raid6_n_6(new_segtype)) {
- /* Can't convert striped/raid0* to e.g. raid10_offset */
- log_error("Can't convert %s to %s.", display_lvname(lv), new_segtype->name);
- return 0;
- }
-
/* Archive metadata */
if (!archive(lv->vg))
return_0;
@@ -3794,30 +3786,65 @@ static int _log_prohibited_option(const struct lv_segment *seg_from,
static int _set_convenient_raid456_segtype_to(const struct lv_segment *seg_from,
const struct segment_type **segtype)
{
- if (seg_is_striped(seg_from) || seg_is_raid4(seg_from)) {
+ size_t len = min(strlen((*segtype)->name), strlen(lvseg_name(seg_from)));
+ const struct segment_type *segtype_sav = *segtype;
+
+ /* Bail out if same RAID level is requested. */
+ if (!strncmp((*segtype)->name, lvseg_name(seg_from), len))
+ return 1;
+
+ /* Striped/raid0 -> raid5/6 */
+ if (seg_is_striped(seg_from) || seg_is_any_raid0(seg_from)) {
/* If this is any raid5 conversion request -> enforce raid5_n, because we convert from striped */
if (segtype_is_any_raid5(*segtype) &&
!segtype_is_raid5_n(*segtype)) {
- log_error("Conversion to raid5_n not yet supported.");
- return 0;
+ if (!(*segtype = get_segtype_from_flag(seg_from->lv->vg->cmd, SEG_RAID5_N)))
+ return_0;
+ goto replaced;
/* If this is any raid6 conversion request -> enforce raid6_n_6, because we convert from striped */
} else if (segtype_is_any_raid6(*segtype) &&
!segtype_is_raid6_n_6(*segtype)) {
- log_error("Conversion to raid6_n_6 not yet supported.");
- return 0;
+ if (!(*segtype = get_segtype_from_flag(seg_from->lv->vg->cmd, SEG_RAID6_N_6)))
+ return_0;
+ goto replaced;
}
- /* ... and raid6 -> raid5 */
- } else if ((seg_is_raid6_zr(seg_from) ||
- seg_is_raid6_nr(seg_from) ||
- seg_is_raid6_nc(seg_from)) &&
+ /* raid4 -> raid5_n */
+ } else if (seg_is_raid4(seg_from) &&
segtype_is_any_raid5(*segtype)) {
- log_error("Conversion not supported.");
- return 0;
+ if (!(*segtype = get_segtype_from_flag(seg_from->lv->vg->cmd, SEG_RAID5_N)))
+ return_0;
+ goto replaced;
+
+ /* raid4/raid5_n -> striped/raid0/raid6 */
+ } else if ((seg_is_raid4(seg_from) || seg_is_raid5_n(seg_from)) &&
+ !segtype_is_striped(*segtype) &&
+ !segtype_is_any_raid0(*segtype) &&
+ !segtype_is_raid4(*segtype) &&
+ !segtype_is_raid5_n(*segtype) &&
+ !segtype_is_raid6_n_6(*segtype)) {
+ if (!(*segtype = get_segtype_from_flag(seg_from->lv->vg->cmd, SEG_RAID6_N_6)))
+ return_0;
+ goto replaced;
+
+ /* ... and raid6 -> striped/raid0/raid4/raid5_n */
+ } else if (seg_is_raid6_n_6(seg_from) &&
+ !segtype_is_striped(*segtype) &&
+ !segtype_is_any_raid0(*segtype) &&
+ !segtype_is_raid4(*segtype) &&
+ !segtype_is_raid5_n(*segtype)) {
+ if (!(*segtype = get_segtype_from_flag(seg_from->lv->vg->cmd, SEG_RAID5_N)))
+ return_0;
+ goto replaced;
}
return 1;
+
+replaced:
+ log_warn("Replaced LV type %s with possible type %s.",
+ segtype_sav->name, (*segtype)->name);
+ return 1;
}
/* Check allowed conversion from seg_from to *segtype_to */
diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h
index c20149d..e8fd26f 100644
--- a/lib/metadata/segtype.h
+++ b/lib/metadata/segtype.h
@@ -132,6 +132,10 @@ struct dev_manager;
#define segtype_is_raid6_nr(segtype) ((segtype)->flags & SEG_RAID6_NR ? 1 : 0)
#define segtype_is_raid6_n_6(segtype) ((segtype)->flags & SEG_RAID6_N_6 ? 1 : 0)
#define segtype_is_raid6_zr(segtype) ((segtype)->flags & SEG_RAID6_ZR ? 1 : 0)
+#define segtype_is_raid6_ls_6(segtype) ((segtype)->flags & SEG_RAID6_LS_6 ? 1 : 0)
+#define segtype_is_raid6_rs_6(segtype) ((segtype)->flags & SEG_RAID6_RS_6 ? 1 : 0)
+#define segtype_is_raid6_la_6(segtype) ((segtype)->flags & SEG_RAID6_LA_6 ? 1 : 0)
+#define segtype_is_raid6_ra_6(segtype) ((segtype)->flags & SEG_RAID6_RA_6 ? 1 : 0)
#define segtype_is_any_raid10(segtype) ((segtype)->flags & SEG_RAID10 ? 1 : 0)
#define segtype_is_raid10(segtype) ((segtype)->flags & SEG_RAID10 ? 1 : 0)
#define segtype_is_raid10_near(segtype) segtype_is_raid10(segtype)
diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index 631ffb7..c679207 100644
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -546,7 +546,11 @@ static const struct raid_type {
{ SEG_TYPE_NAME_RAID6_N_6, 2, SEG_RAID6_N_6 },
{ SEG_TYPE_NAME_RAID6_NC, 2, SEG_RAID6_NC },
{ SEG_TYPE_NAME_RAID6_NR, 2, SEG_RAID6_NR },
- { SEG_TYPE_NAME_RAID6_ZR, 2, SEG_RAID6_ZR }
+ { SEG_TYPE_NAME_RAID6_ZR, 2, SEG_RAID6_ZR },
+ { SEG_TYPE_NAME_RAID6_LS_6, 2, SEG_RAID6_LS_6 },
+ { SEG_TYPE_NAME_RAID6_RS_6, 2, SEG_RAID6_RS_6 },
+ { SEG_TYPE_NAME_RAID6_LA_6, 2, SEG_RAID6_LA_6 },
+ { SEG_TYPE_NAME_RAID6_RA_6, 2, SEG_RAID6_RA_6 }
};
static struct segment_type *_init_raid_segtype(struct cmd_context *cmd,
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index bd6c63d..9570b8a 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -56,6 +56,10 @@ enum {
SEG_RAID6_ZR,
SEG_RAID6_NR,
SEG_RAID6_NC,
+ SEG_RAID6_LS_6,
+ SEG_RAID6_RS_6,
+ SEG_RAID6_LA_6,
+ SEG_RAID6_RA_6,
};
/* FIXME Add crypt and multipath support */
@@ -92,6 +96,11 @@ static const struct {
{ SEG_RAID6_ZR, "raid6_zr"},
{ SEG_RAID6_NR, "raid6_nr"},
{ SEG_RAID6_NC, "raid6_nc"},
+ { SEG_RAID6_LS_6, "raid6_ls_6"},
+ { SEG_RAID6_RS_6, "raid6_rs_6"},
+ { SEG_RAID6_LA_6, "raid6_la_6"},
+ { SEG_RAID6_RA_6, "raid6_ra_6"},
+
/*
* WARNING: Since 'raid' target overloads this 1:1 mapping table
@@ -2153,6 +2162,10 @@ static int _emit_areas_line(struct dm_task *dmt __attribute__((unused)),
case SEG_RAID6_ZR:
case SEG_RAID6_NR:
case SEG_RAID6_NC:
+ case SEG_RAID6_LS_6:
+ case SEG_RAID6_RS_6:
+ case SEG_RAID6_LA_6:
+ case SEG_RAID6_RA_6:
if (!area->dev_node) {
EMIT_PARAMS(*pos, " -");
break;
@@ -2603,6 +2616,10 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
case SEG_RAID6_ZR:
case SEG_RAID6_NR:
case SEG_RAID6_NC:
+ case SEG_RAID6_LS_6:
+ case SEG_RAID6_RS_6:
+ case SEG_RAID6_LA_6:
+ case SEG_RAID6_RA_6:
target_type_is_raid = 1;
r = _raid_emit_segment_line(dmt, major, minor, seg, seg_start,
params, paramsize);
@@ -3886,6 +3903,10 @@ int dm_tree_node_add_null_area(struct dm_tree_node *node, uint64_t offset)
case SEG_RAID6_ZR:
case SEG_RAID6_NR:
case SEG_RAID6_NC:
+ case SEG_RAID6_LS_6:
+ case SEG_RAID6_RS_6:
+ case SEG_RAID6_LA_6:
+ case SEG_RAID6_RA_6:
break;
default:
log_error("dm_tree_node_add_null_area() called on an unsupported segment type");
diff --git a/test/shell/lvconvert-raid-takeover.sh b/test/shell/lvconvert-raid-takeover.sh
index b45088e..4565cc8 100644
--- a/test/shell/lvconvert-raid-takeover.sh
+++ b/test/shell/lvconvert-raid-takeover.sh
@@ -19,7 +19,64 @@ aux have_raid 1 9 0 || skip
correct_raid4_layout=0
aux have_raid 1 9 1 && correct_raid4_layout=1
-aux prepare_vg 9 288
+aux prepare_vg 6 80
+
+function _lvcreate
+{
+ local level=$1
+ local req_stripes=$2
+ local stripes=$3
+ local size=$4
+ local vg=$5
+ local lv=$6
+
+ lvcreate -y -aey --type $level -i $req_stripes -L $size -n $lv $vg
+ check lv_field $vg/$lv segtype "$level"
+ check lv_field $vg/$lv stripes $stripes
+ echo y | mkfs -t ext4 /dev/mapper/$vg-$lv
+ fsck -fn /dev/mapper/$vg-$lv
+}
+
+function _lvconvert
+{
+ local req_level=$1
+ local level=$2
+ local stripes=$3
+ local vg=$4
+ local lv=$5
+ local dont_wait=$6
+
+ lvconvert -y --ty $req_level $vg/$lv
+ [ $? -ne 0 ] && return $?
+ check lv_field $vg/$lv segtype "$level"
+ check lv_field $vg/$lv stripes $stripes
+ if [ -z "$dont_wait" ]
+ then
+ fsck -fn /dev/mapper/$vg-$lv
+ aux wait_for_sync $vg $lv
+ fi
+ fsck -fn /dev/mapper/$vg-$lv
+}
+
+function _invalid_raid5_conversions
+{
+ local lv=$1
+ local vg=$2
+
+ not _lvconvert striped 4 $vg $lv1
+ not _lvconvert raid0 raid0 4 $vg $lv1
+ not _lvconvert raid0_meta raid0_meta 4 $vg $lv1
+ not _lvconvert raid4 raid4 5 $vg $lv1
+ not _lvconvert raid5_ls raid5_ls 5 $vg $lv1
+ not _lvconvert raid5_rs raid5_rs 5 $vg $lv1
+ not _lvconvert raid5_la raid5_la 5 $vg $lv1
+ not _lvconvert raid5_ra raid5_ra 5 $vg $lv1
+ not _lvconvert raid6_zr raid6_zr 6 $vg $lv1
+ not _lvconvert raid6_nr raid6_nr 6 $vg $lv1
+ not _lvconvert raid6_nc raid6_nc 6 $vg $lv1
+ not _lvconvert raid6_n_6 raid6_n_6 6 $vg $lv1
+ not _lvconvert raid6 raid6_n_6 6 $vg $lv1
+}
# Delay 1st leg so that rebuilding status characters
# can be read before resync finished too quick.
@@ -81,240 +138,149 @@ aux wait_for_sync $vg $lv1
# Clean up
lvremove --yes $vg/$lv1
-# Create 3-way striped
-lvcreate -y -aey --type striped -i 3 -L 64M -n $lv1 $vg
-check lv_field $vg/$lv1 segtype "striped"
-check lv_field $vg/$lv1 stripes 3
-echo y | mkfs -t ext4 /dev/mapper/$vg-$lv1
-fsck -fn /dev/mapper/$vg-$lv1
-
-# Create 3-way raid0
-lvcreate -y -aey --type raid0 -i 3 -L 64M -n $lv2 $vg
-check lv_field $vg/$lv2 segtype "raid0"
-check lv_field $vg/$lv2 stripes 3
-echo y | mkfs -t ext4 /dev/mapper/$vg-$lv2
-fsck -fn /dev/mapper/$vg-$lv2
-
-# Create 3-way raid0_meta
-lvcreate -y -aey --type raid0_meta -i 3 -L 64M -n $lv3 $vg
-check lv_field $vg/$lv3 segtype "raid0_meta"
-check lv_field $vg/$lv3 stripes 3
-echo y | mkfs -t ext4 /dev/mapper/$vg-$lv3
-fsck -fn /dev/mapper/$vg-$lv3
if [ $correct_raid4_layout -eq 1 ]
then
-# Create 3-way raid4
-lvcreate -y -aey --type raid4 -i 3 -L 64M -n $lv4 $vg
-check lv_field $vg/$lv4 segtype "raid4"
-check lv_field $vg/$lv4 stripes 4
-echo y | mkfs -t ext4 /dev/mapper/$vg-$lv4
-fsck -fn /dev/mapper/$vg-$lv4
-aux wait_for_sync $vg $lv4
-fsck -fn /dev/mapper/$vg-$lv4
+#
+# Start out with raid4
+#
-# Convert raid4 -> striped (correct raid4 mapping test!)
-lvconvert -y --ty striped $vg/$lv4
-check lv_field $vg/$lv4 segtype "striped"
-check lv_field $vg/$lv4 stripes 3
-fsck -fn /dev/mapper/$vg-$lv4
+# Create 3-way striped raid4 (4 legs total)
+_lvcreate raid4 3 4 64M $vg $lv1
+aux wait_for_sync $vg $lv1
+# Convert raid4 -> striped
+_lvconvert striped striped 3 $vg $lv1 1
# Convert striped -> raid4
-lvconvert -y --ty raid4 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid4"
-check lv_field $vg/$lv1 stripes 4
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid4 raid4 4 $vg $lv1
# Convert raid4 -> raid5_n
-lvconvert -y --ty raid5_n $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid5_n"
-check lv_field $vg/$lv1 stripes 4
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid5 raid5_n 4 $vg $lv1 1
-# Convert raid5 -> striped
-lvconvert -y --ty striped $vg/$lv1
-check lv_field $vg/$lv1 segtype "striped"
-check lv_field $vg/$lv1 stripes 3
-fsck -fn /dev/mapper/$vg-$lv1
+# Convert raid5_n -> striped
+_lvconvert striped striped 3 $vg $lv1 1
# Convert striped -> raid5_n
-lvconvert -y --ty raid5_n $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid5_n"
-check lv_field $vg/$lv1 stripes 4
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid5_n raid5_n 4 $vg $lv1
# Convert raid5_n -> raid4
-lvconvert -y --ty raid4 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid4"
-check lv_field $vg/$lv1 stripes 4
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
-
-
-# Convert raid0 -> raid4
-lvconvert -y --ty raid4 $vg/$lv2
-check lv_field $vg/$lv2 segtype "raid4"
-check lv_field $vg/$lv2 stripes 4
-fsck -fn /dev/mapper/$vg-$lv2
-aux wait_for_sync $vg $lv2
-fsck -fn /dev/mapper/$vg-$lv2
+_lvconvert raid4 raid4 4 $vg $lv1 1
# Convert raid4 -> raid0
-lvconvert -y --ty raid0 $vg/$lv2
-check lv_field $vg/$lv2 segtype "raid0"
-check lv_field $vg/$lv2 stripes 3
-fsck -fn /dev/mapper/$vg-$lv2
+_lvconvert raid0 raid0 3 $vg $lv1 1
# Convert raid0 -> raid5_n
-lvconvert -y --ty raid5_n $vg/$lv2
-check lv_field $vg/$lv2 segtype "raid5_n"
-check lv_field $vg/$lv2 stripes 4
-fsck -fn /dev/mapper/$vg-$lv2
-aux wait_for_sync $vg $lv2
-fsck -fn /dev/mapper/$vg-$lv2
+_lvconvert raid5_n raid5_n 4 $vg $lv1
# Convert raid5_n -> raid0_meta
-lvconvert -y --ty raid0_meta $vg/$lv2
-check lv_field $vg/$lv2 segtype "raid0_meta"
-check lv_field $vg/$lv2 stripes 3
-fsck -fn /dev/mapper/$vg-$lv2
+_lvconvert raid0_meta raid0_meta 3 $vg $lv1 1
# Convert raid0_meta -> raid5_n
-lvconvert -y --ty raid5_n $vg/$lv2
-check lv_field $vg/$lv2 segtype "raid5_n"
-check lv_field $vg/$lv2 stripes 4
-fsck -fn /dev/mapper/$vg-$lv2
-aux wait_for_sync $vg $lv2
-fsck -fn /dev/mapper/$vg-$lv2
-
+_lvconvert raid5 raid5_n 4 $vg $lv1
# Convert raid4 -> raid0_meta
-lvconvert -y --ty raid0_meta $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid0_meta"
-check lv_field $vg/$lv1 stripes 3
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid0_meta raid0_meta 3 $vg $lv1 1
# Convert raid0_meta -> raid4
-lvconvert -y --ty raid4 $vg/$lv1
-fsck -fn /dev/mapper/$vg-$lv1
-check lv_field $vg/$lv1 segtype "raid4"
-check lv_field $vg/$lv1 stripes 4
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid4 raid4 4 $vg $lv1
# Convert raid4 -> raid0
-lvconvert -y --ty raid0 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid0"
-check lv_field $vg/$lv1 stripes 3
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid0 raid0 3 $vg $lv1 1
# Convert raid0 -> raid4
-lvconvert -y --ty raid4 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid4"
-check lv_field $vg/$lv1 stripes 4
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid4 raid4 4 $vg $lv1
# Convert raid4 -> striped
-lvconvert -y --ty striped $vg/$lv1
-check lv_field $vg/$lv1 segtype "striped"
-check lv_field $vg/$lv1 stripes 3
-fsck -fn /dev/mapper/$vg-$lv1
-
-
-
+_lvconvert striped striped 3 $vg $lv1 1
# Convert striped -> raid6_n_6
-lvconvert -y --ty raid6_n_6 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid6_n_6"
-check lv_field $vg/$lv1 stripes 5
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid6_n_6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> striped
-lvconvert -y --ty striped $vg/$lv1
-check lv_field $vg/$lv1 segtype "striped"
-check lv_field $vg/$lv1 stripes 3
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert striped striped 3 $vg $lv1 1
# Convert striped -> raid6_n_6
-lvconvert -y --ty raid6_n_6 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid6_n_6"
-check lv_field $vg/$lv1 stripes 5
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> raid5_n
-lvconvert -y --ty raid5_n $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid5_n"
-check lv_field $vg/$lv1 stripes 4
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid5_n raid5_n 4 $vg $lv1 1
# Convert raid5_n -> raid6_n_6
-lvconvert -y --ty raid6_n_6 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid6_n_6"
-check lv_field $vg/$lv1 stripes 5
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid6_n_6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> raid4
-lvconvert -y --ty raid4 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid4"
-check lv_field $vg/$lv1 stripes 4
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid4 raid4 4 $vg $lv1 1
# Convert raid4 -> raid6_n_6
-lvconvert -y --ty raid6_n_6 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid6_n_6"
-check lv_field $vg/$lv1 stripes 5
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> raid0
-lvconvert -y --ty raid0 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid0"
-check lv_field $vg/$lv1 stripes 3
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid0 raid0 3 $vg $lv1 1
# Convert raid0 -> raid6_n_6
-lvconvert -y --ty raid6_n_6 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid6_n_6"
-check lv_field $vg/$lv1 stripes 5
-fsck -fn /dev/mapper/$vg-$lv1
-aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid6_n_6 raid6_n_6 5 $vg $lv1
# Convert raid6_n_6 -> raid0_meta
-lvconvert -y --ty raid0_meta $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid0_meta"
-check lv_field $vg/$lv1 stripes 3
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid0_meta raid0_meta 3 $vg $lv1 1
# Convert raid0_meta -> raid6_n_6
-lvconvert -y --ty raid6_n_6 $vg/$lv1
-check lv_field $vg/$lv1 segtype "raid6_n_6"
-check lv_field $vg/$lv1 stripes 5
-fsck -fn /dev/mapper/$vg-$lv1
+_lvconvert raid6 raid6_n_6 5 $vg $lv1
+
+# Clean up
+lvremove -y $vg
+
+# Create + convert 4-way raid5 variations
+_lvcreate raid5 4 5 64M $vg $lv1
aux wait_for_sync $vg $lv1
-fsck -fn /dev/mapper/$vg-$lv1
+_invalid_raid5_conversions $vg $lv1
+not _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
+not _lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
+not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
+_lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
+_lvconvert raid5_ls raid5_ls 5 $vg $lv1 1
+lvremove -y $vg
+
+_lvcreate raid5_ls 4 5 64M $vg $lv1
+aux wait_for_sync $vg $lv1
+_invalid_raid5_conversions $vg $lv1
+not _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
+not _lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
+not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
+_lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
+_lvconvert raid5_ls raid5_ls 5 $vg $lv1 1
+lvremove -y $vg
+
+_lvcreate raid5_rs 4 5 64M $vg $lv1
+aux wait_for_sync $vg $lv1
+_invalid_raid5_conversions $vg $lv1
+not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
+not _lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
+not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
+_lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
+_lvconvert raid5_rs raid5_rs 5 $vg $lv1 1
+lvremove -y $vg
+
+_lvcreate raid5_la 4 5 64M $vg $lv1
+aux wait_for_sync $vg $lv1
+_invalid_raid5_conversions $vg $lv1
+not _lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
+not _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
+not _lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
+_lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
+_lvconvert raid5_la raid5_la 5 $vg $lv1 1
+lvremove -y $vg
+
+_lvcreate raid5_ra 4 5 64M $vg $lv1
+aux wait_for_sync $vg $lv1
+_invalid_raid5_conversions $vg $lv1
+not _lvconvert raid6_ls_6 raid6_ls_6 6 $vg $lv1
+not _lvconvert raid6_rs_6 raid6_rs_6 6 $vg $lv1
+not _lvconvert raid6_la_6 raid6_la_6 6 $vg $lv1
+_lvconvert raid6_ra_6 raid6_ra_6 6 $vg $lv1
+_lvconvert raid5_ra raid5_ra 5 $vg $lv1 1
+lvremove -y $vg
else
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d8568552e460afe4…
Commit: d8568552e460afe477f1baa7c46da81039f85b15
Parent: 3673ce48e0d6147fe7a24fcce97130fab8914e51
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Sat Feb 4 14:09:26 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Sat Feb 4 14:09:26 2017 +0100
WHATS_NEW: New segment type raid6_n_6
---
WHATS_NEW | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 95a24ba..cfa1179 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Support raid6_n_6 segment type and conversions from/to it.
Support raid5_n segment type and conversions from/to it.
Support new internal command _dmeventd_thin_command.
Introduce new dmeventd/thin_command configurable setting.
1
0
master - lvconvert: add segtype raid6_n_6 and conversions to/from it
by Heinz Mauelshagen 03 Feb '17
by Heinz Mauelshagen 03 Feb '17
03 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3673ce48e0d6147f…
Commit: 3673ce48e0d6147fe7a24fcce97130fab8914e51
Parent: 96f331fe05297259274c04ac7fbd7d99eb911c77
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Sat Feb 4 01:40:58 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Sat Feb 4 01:42:21 2017 +0100
lvconvert: add segtype raid6_n_6 and conversions to/from it
Add:
- support for segment type raid6_n_6 (striped raid with dedicated last parity/Q-Syndrome SubLVs)
- conversion support from striped/raid0/raid0_meta/raid4 to/from raid6_n_6
- related tests to lvconvert-raid-takeover.sh
Related: rhbz1366296
---
lib/metadata/raid_manip.c | 70 +++++++++++++++++++--------
lib/raid/raid.c | 1 +
libdm/libdm-deptree.c | 5 ++
test/shell/lvconvert-raid-takeover.sh | 85 +++++++++++++++++++++++++++++++++
4 files changed, 140 insertions(+), 21 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 3543a69..b769e34 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -2534,11 +2534,7 @@ static struct lv_segment *_convert_striped_to_raid0(struct logical_volume *lv,
* Change the user's requested segment type to
* the appropriate more-refined one for takeover.
*
- * raid0 can take over:
- * raid4
- *
- * raid4 can take over:
- * raid0 - if there is only one stripe zone
+ * raid can takeover striped,raid0 if there is only one stripe zone
*/
#define ALLOW_NONE 0x0
#define ALLOW_STRIPES 0x2
@@ -2575,9 +2571,9 @@ static struct possible_takeover_reshape_type _possible_takeover_reshape_types[]
.current_areas = 1,
.options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
- /* striped,raid0*,raid4,raid5_n <-> striped,raid0*,raid4,raid5_n */
- { .current_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID4|SEG_RAID5_N,
- .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID4|SEG_RAID5_N,
+ /* striped,raid0*,raid4,raid5_n,raid6_n_6 <-> striped,raid0*,raid4,raid5_n,raid6_n_6 */
+ { .current_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6,
+ .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID4|SEG_RAID5_N|SEG_RAID6_N_6,
.current_areas = ~0U,
.options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
@@ -3061,7 +3057,8 @@ static int _shift_parity_dev(struct lv_segment *seg)
return 1;
}
-/* raid45 -> raid0* / striped */
+/* raid456 -> raid0* / striped */
+static int _raid45_to_raid54_wrapper(TAKEOVER_FN_ARGS);
static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
{
int rename_sublvs = 0;
@@ -3084,8 +3081,9 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
return 0;
if (!yes && yes_no_prompt("Are you sure you want to convert \"%s\" LV %s to \"%s\" "
- "type losing all resilience? [y/n]: ",
- lvseg_name(seg), display_lvname(lv), new_segtype->name) == 'n') {
+ "type losing %s resilience? [y/n]: ",
+ lvseg_name(seg), display_lvname(lv), new_segtype->name,
+ segtype_is_striped(new_segtype) ? "all" : "some") == 'n') {
log_error("Logical volume %s NOT converted to \"%s\"",
display_lvname(lv), new_segtype->name);
return 0;
@@ -3135,8 +3133,13 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
!_raid0_add_or_remove_metadata_lvs(lv, 0 /* update_and_reload */, allocate_pvs, &removal_lvs))
return_0;
+ if (segtype_is_raid4(new_segtype)) {
+ if (!(seg->segtype = get_segtype_from_flag(lv->vg->cmd, SEG_RAID5_N)))
+ return_0;
+ } else
+ seg->segtype = new_segtype;
+
seg->region_size = region_size;
- seg->segtype = new_segtype;
if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, &removal_lvs))
return_0;
@@ -3150,6 +3153,10 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
return_0;
}
+ if (segtype_is_raid4(new_segtype))
+ return _raid45_to_raid54_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
+
return 1;
}
@@ -3287,7 +3294,8 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
/* FIXME: restricted to raid4 and raid5_n for the time being... */
if (!segtype_is_raid4(new_segtype) &&
- !segtype_is_raid5_n(new_segtype)) {
+ !segtype_is_raid5_n(new_segtype) &&
+ !segtype_is_raid6_n_6(new_segtype)) {
/* Can't convert striped/raid0* to e.g. raid10_offset */
log_error("Can't convert %s to %s.", display_lvname(lv), new_segtype->name);
return 0;
@@ -3456,7 +3464,9 @@ static int _takeover_from_raid0_to_raid45(TAKEOVER_FN_ARGS)
static int _takeover_from_raid0_to_raid6(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count + 2 /* new_image_count */,
+ 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_to_striped(TAKEOVER_FN_ARGS)
@@ -3504,7 +3514,9 @@ static int _takeover_from_raid0_meta_to_raid45(TAKEOVER_FN_ARGS)
static int _takeover_from_raid0_meta_to_raid6(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count + 2 /* new_image_count */,
+ 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_meta_to_striped(TAKEOVER_FN_ARGS)
@@ -3587,7 +3599,17 @@ static int _takeover_from_raid45_to_raid54(TAKEOVER_FN_ARGS)
static int _takeover_from_raid45_to_raid6(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ if (seg_is_raid4(first_seg(lv))) {
+ struct segment_type *segtype = get_segtype_from_flag(lv->vg->cmd, SEG_RAID5_N);
+
+ if (!segtype ||
+ !_raid45_to_raid54_wrapper(lv, segtype, yes, force, first_seg(lv)->area_count,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs))
+ return 0;
+ }
+ return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count + 1 /* new_image_count */,
+ 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid45_to_striped(TAKEOVER_FN_ARGS)
@@ -3597,22 +3619,26 @@ static int _takeover_from_raid45_to_striped(TAKEOVER_FN_ARGS)
static int _takeover_from_raid6_to_raid0(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_raid0_meta(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
+ 1 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_raid45(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 1,
+ 2 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid6_to_striped(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _raid456_to_raid0_or_striped_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count - 2,
+ 2 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_striped_to_raid0(TAKEOVER_FN_ARGS)
@@ -3649,7 +3675,9 @@ static int _takeover_from_striped_to_raid45(TAKEOVER_FN_ARGS)
static int _takeover_from_striped_to_raid6(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count + 2 /* new_image_count */,
+ 3 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
/*
diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index 7dfafef..631ffb7 100644
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -543,6 +543,7 @@ static const struct raid_type {
{ SEG_TYPE_NAME_RAID5_RA, 1, SEG_RAID5_RA },
{ SEG_TYPE_NAME_RAID5_RS, 1, SEG_RAID5_RS },
{ SEG_TYPE_NAME_RAID6, 2, SEG_RAID6 },
+ { SEG_TYPE_NAME_RAID6_N_6, 2, SEG_RAID6_N_6 },
{ SEG_TYPE_NAME_RAID6_NC, 2, SEG_RAID6_NC },
{ SEG_TYPE_NAME_RAID6_NR, 2, SEG_RAID6_NR },
{ SEG_TYPE_NAME_RAID6_ZR, 2, SEG_RAID6_ZR }
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 8a32320..bd6c63d 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -52,6 +52,7 @@ enum {
SEG_RAID5_RA,
SEG_RAID5_LS,
SEG_RAID5_RS,
+ SEG_RAID6_N_6,
SEG_RAID6_ZR,
SEG_RAID6_NR,
SEG_RAID6_NC,
@@ -87,6 +88,7 @@ static const struct {
{ SEG_RAID5_RA, "raid5_ra"},
{ SEG_RAID5_LS, "raid5_ls"},
{ SEG_RAID5_RS, "raid5_rs"},
+ { SEG_RAID6_N_6,"raid6_n_6"},
{ SEG_RAID6_ZR, "raid6_zr"},
{ SEG_RAID6_NR, "raid6_nr"},
{ SEG_RAID6_NC, "raid6_nc"},
@@ -2147,6 +2149,7 @@ static int _emit_areas_line(struct dm_task *dmt __attribute__((unused)),
case SEG_RAID5_RA:
case SEG_RAID5_LS:
case SEG_RAID5_RS:
+ case SEG_RAID6_N_6:
case SEG_RAID6_ZR:
case SEG_RAID6_NR:
case SEG_RAID6_NC:
@@ -2596,6 +2599,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
case SEG_RAID5_RA:
case SEG_RAID5_LS:
case SEG_RAID5_RS:
+ case SEG_RAID6_N_6:
case SEG_RAID6_ZR:
case SEG_RAID6_NR:
case SEG_RAID6_NC:
@@ -3878,6 +3882,7 @@ int dm_tree_node_add_null_area(struct dm_tree_node *node, uint64_t offset)
case SEG_RAID5_RA:
case SEG_RAID5_LS:
case SEG_RAID5_RS:
+ case SEG_RAID6_N_6:
case SEG_RAID6_ZR:
case SEG_RAID6_NR:
case SEG_RAID6_NC:
diff --git a/test/shell/lvconvert-raid-takeover.sh b/test/shell/lvconvert-raid-takeover.sh
index 0b7d326..b45088e 100644
--- a/test/shell/lvconvert-raid-takeover.sh
+++ b/test/shell/lvconvert-raid-takeover.sh
@@ -231,6 +231,91 @@ check lv_field $vg/$lv1 segtype "striped"
check lv_field $vg/$lv1 stripes 3
fsck -fn /dev/mapper/$vg-$lv1
+
+
+
+# Convert striped -> raid6_n_6
+lvconvert -y --ty raid6_n_6 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid6_n_6"
+check lv_field $vg/$lv1 stripes 5
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid6_n_6 -> striped
+lvconvert -y --ty striped $vg/$lv1
+check lv_field $vg/$lv1 segtype "striped"
+check lv_field $vg/$lv1 stripes 3
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert striped -> raid6_n_6
+lvconvert -y --ty raid6_n_6 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid6_n_6"
+check lv_field $vg/$lv1 stripes 5
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid6_n_6 -> raid5_n
+lvconvert -y --ty raid5_n $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid5_n"
+check lv_field $vg/$lv1 stripes 4
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid5_n -> raid6_n_6
+lvconvert -y --ty raid6_n_6 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid6_n_6"
+check lv_field $vg/$lv1 stripes 5
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid6_n_6 -> raid4
+lvconvert -y --ty raid4 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid4"
+check lv_field $vg/$lv1 stripes 4
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid4 -> raid6_n_6
+lvconvert -y --ty raid6_n_6 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid6_n_6"
+check lv_field $vg/$lv1 stripes 5
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid6_n_6 -> raid0
+lvconvert -y --ty raid0 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid0"
+check lv_field $vg/$lv1 stripes 3
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid0 -> raid6_n_6
+lvconvert -y --ty raid6_n_6 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid6_n_6"
+check lv_field $vg/$lv1 stripes 5
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid6_n_6 -> raid0_meta
+lvconvert -y --ty raid0_meta $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid0_meta"
+check lv_field $vg/$lv1 stripes 3
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid0_meta -> raid6_n_6
+lvconvert -y --ty raid6_n_6 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid6_n_6"
+check lv_field $vg/$lv1 stripes 5
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
else
not lvcreate -y -aey --type raid4 -i 3 -L 64M -n $lv4 $vg
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=96f331fe05297259…
Commit: 96f331fe05297259274c04ac7fbd7d99eb911c77
Parent: 7e92535d475da7403f2ec8eeb2c5af6209fa2ba8
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 3 23:41:48 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 3 23:41:48 2017 +0100
WHATS_NEW: New segment type raid5_n
---
WHATS_NEW | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index 94411ae..95a24ba 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Support raid5_n segment type and conversions from/to it.
Support new internal command _dmeventd_thin_command.
Introduce new dmeventd/thin_command configurable setting.
Use new default units 'r' for displaying sizes.
1
0
03 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7e92535d475da740…
Commit: 7e92535d475da7403f2ec8eeb2c5af6209fa2ba8
Parent: 60ddd05f163cbf53670e5c8deabfc384168eae0f
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 3 22:16:00 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 3 22:16:35 2017 +0100
lvconvert: add segtype raid5_n and conversions to/from it
Change:
- missed a return_0
- use lvseg_name() rather than my own function
Related: rhbz1366296
---
lib/metadata/raid_manip.c | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index f845164..3543a69 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -2227,7 +2227,7 @@ static int _convert_raid1_to_mirror(struct logical_volume *lv,
log_debug_metadata("Changing image count to %u on %s.",
new_image_count, display_lvname(lv));
if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, removal_lvs, 0, 0))
- return 0;
+ return_0;
}
/* Remove rmeta LVs */
@@ -2703,15 +2703,6 @@ static const char *_get_segtype_alias(const struct segment_type *segtype)
return "";
}
-/* Return "linear" for striped segtype with 1 area instead of "striped" */
-static const char *_get_segtype_name(const struct segment_type *segtype, unsigned new_image_count)
-{
- if (!segtype || (segtype_is_striped(segtype) && new_image_count == 1))
- return "linear";
-
- return segtype->name;
-}
-
static int _log_possible_conversion_types(const struct logical_volume *lv, const struct segment_type *new_segtype)
{
unsigned possible_conversions = 0;
@@ -2732,7 +2723,7 @@ static int _log_possible_conversion_types(const struct logical_volume *lv, const
log_error("Converting %s from %s%s%s%s is "
"directly possible to the following layout%s:",
- display_lvname(lv), _get_segtype_name(seg->segtype, seg->area_count),
+ display_lvname(lv), lvseg_name(seg),
*alias ? " (same as " : "", alias, *alias ? ")" : "",
possible_conversions > 1 ? "s" : "");
1
0
03 Feb '17
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=60ddd05f163cbf53…
Commit: 60ddd05f163cbf53670e5c8deabfc384168eae0f
Parent: 875ce04c61fb40436bf4d6308356c800d08c1f7e
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Feb 3 20:39:40 2017 +0100
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Feb 3 20:40:26 2017 +0100
lvconvert: add segtype raid5_n and conversions to/from it
Add:
- support for segment type raid5_n (striped raid with dedicated last parity SubLVs)
- conversion support from striped/raid0/raid0_meta/raid4 to/from raid5_n
- related tests to lvconvert-raid-takeover.sh
Related: rhbz1366296
---
lib/metadata/merge.c | 7 +-
lib/metadata/raid_manip.c | 252 +++++++++++++++++++++++----------
lib/raid/raid.c | 15 +-
libdm/libdm-deptree.c | 7 +-
test/shell/lvconvert-raid-takeover.sh | 63 ++++++++-
5 files changed, 259 insertions(+), 85 deletions(-)
diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c
index 59c0885..dbd91db 100644
--- a/lib/metadata/merge.c
+++ b/lib/metadata/merge.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2016 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -148,7 +148,8 @@ static void _check_raid1_seg(struct lv_segment *seg, int *error_count)
static void _check_raid45610_seg(struct lv_segment *seg, int *error_count)
{
/* Checks applying to any raid4/5/6/10 */
- if (!seg->meta_areas)
+ /* Allow raid4 + raid5_n to get activated w/o metadata (mandatory during conversion between them) */
+ if (!(seg_is_raid4(seg) || seg_is_raid5_n(seg)) && !seg->meta_areas)
raid_seg_error("no meta areas");
if (!seg->stripe_size)
raid_seg_error("zero stripe size");
@@ -610,7 +611,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
continue;
if (lv == seg_lv(seg, s))
seg_found++;
- if (seg_is_raid_with_meta(seg) && (lv == seg_metalv(seg, s)))
+ if (seg->meta_areas && seg_is_raid_with_meta(seg) && (lv == seg_metalv(seg, s)))
seg_found++;
}
if (seg_is_replicator_dev(seg)) {
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 8c88280..f845164 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2014 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2011-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -2175,6 +2175,7 @@ static int _convert_mirror_to_raid1(struct logical_volume *lv,
lv->status &= ~MIRROR;
lv->status &= ~MIRRORED;
lv->status |= RAID;
+ seg->status |= RAID;
if (!lv_update_and_reload(lv))
return_0;
@@ -2567,44 +2568,22 @@ static struct possible_takeover_reshape_type _possible_takeover_reshape_types[]
.possible_types = SEG_RAID0|SEG_RAID0_META,
.current_areas = 1,
.options = ALLOW_STRIPE_SIZE },
- { .current_types = SEG_STRIPED_TARGET, /* striped -> raid0*, i.e. seg->area_count > 1 */
- .possible_types = SEG_RAID0|SEG_RAID0_META,
- .current_areas = ~0U,
- .options = ALLOW_NONE },
- { .current_types = SEG_STRIPED_TARGET, /* striped -> raid4 , i.e. seg->area_count > 1 */
- .possible_types = SEG_RAID4,
- .current_areas = ~0U,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
+
/* raid0* -> */
{ .current_types = SEG_RAID0|SEG_RAID0_META, /* seg->area_count = 1 */
.possible_types = SEG_RAID1,
.current_areas = 1,
.options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
- { .current_types = SEG_RAID0|SEG_RAID0_META, /* raid0* -> striped, i.e. seg->area_count > 1 */
- .possible_types = SEG_STRIPED_TARGET,
- .current_areas = ~0U,
- .options = ALLOW_NONE },
- { .current_types = SEG_RAID0|SEG_RAID0_META, /* raid0* -> raid0*, i.e. seg->area_count > 1 */
- .possible_types = SEG_RAID0_META|SEG_RAID0,
- .current_areas = ~0U,
- .options = ALLOW_NONE },
- { .current_types = SEG_RAID0|SEG_RAID0_META, /* raid0* -> raid4, i.e. seg->area_count > 1 */
- .possible_types = SEG_RAID4,
- .current_areas = ~0U,
- .options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
- /* raid4 -> -> */
- { .current_types = SEG_RAID4, /* raid4 ->striped/raid0*, i.e. seg->area_count > 1 */
- .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META,
- .current_areas = ~0U,
- .options = ALLOW_NONE },
- /* raid1 -> mirror */
- { .current_types = SEG_RAID1,
- .possible_types = SEG_MIRROR,
+
+ /* striped,raid0*,raid4,raid5_n <-> striped,raid0*,raid4,raid5_n */
+ { .current_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID4|SEG_RAID5_N,
+ .possible_types = SEG_STRIPED_TARGET|SEG_RAID0|SEG_RAID0_META|SEG_RAID4|SEG_RAID5_N,
.current_areas = ~0U,
.options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
- /* mirror -> raid1 with arbitrary number of legs */
- { .current_types = SEG_MIRROR,
- .possible_types = SEG_RAID1,
+
+ /* mirror <-> raid1 with arbitrary number of legs */
+ { .current_types = SEG_MIRROR|SEG_RAID1,
+ .possible_types = SEG_MIRROR|SEG_RAID1,
.current_areas = ~0U,
.options = ALLOW_NONE }, /* FIXME: ALLOW_REGION_SIZE */
@@ -2724,6 +2703,15 @@ static const char *_get_segtype_alias(const struct segment_type *segtype)
return "";
}
+/* Return "linear" for striped segtype with 1 area instead of "striped" */
+static const char *_get_segtype_name(const struct segment_type *segtype, unsigned new_image_count)
+{
+ if (!segtype || (segtype_is_striped(segtype) && new_image_count == 1))
+ return "linear";
+
+ return segtype->name;
+}
+
static int _log_possible_conversion_types(const struct logical_volume *lv, const struct segment_type *new_segtype)
{
unsigned possible_conversions = 0;
@@ -2744,7 +2732,7 @@ static int _log_possible_conversion_types(const struct logical_volume *lv, const
log_error("Converting %s from %s%s%s%s is "
"directly possible to the following layout%s:",
- display_lvname(lv), lvseg_name(seg),
+ display_lvname(lv), _get_segtype_name(seg->segtype, seg->area_count),
*alias ? " (same as " : "", alias, *alias ? ")" : "",
possible_conversions > 1 ? "s" : "");
@@ -2911,6 +2899,8 @@ static int _raid1_to_mirrored_wrapper(TAKEOVER_FN_ARGS)
* parity device to lv segment area 0 and thus changing MD
* array roles, detach the MetaLVs and reload as raid0 in
* order to wipe them then reattach and set back to raid0_meta.
+ *
+ * Same applies to raid4 <-> raid5.
*/
static int _clear_meta_lvs(struct logical_volume *lv)
{
@@ -2920,16 +2910,18 @@ static int _clear_meta_lvs(struct logical_volume *lv)
const struct segment_type *tmp_segtype;
struct dm_list meta_lvs;
struct lv_list *lvl_array, *lvl;
+ int is_raid4_or_5N = seg_is_raid4(seg) || seg_is_raid5_n(seg);
- /* Reject non-raid0_meta segment types cautiously */
- if (!seg_is_raid0_meta(seg) ||
- !seg->meta_areas)
+ /* Reject non-raid0_meta/raid4/raid5_n segment types cautiously */
+ if (!seg->meta_areas ||
+ (!seg_is_raid0_meta(seg) && !is_raid4_or_5N))
return_0;
if (!(lvl_array = dm_pool_alloc(lv->vg->vgmem, seg->area_count * sizeof(*lvl_array))))
return_0;
dm_list_init(&meta_lvs);
+ tmp_segtype = seg->segtype;
tmp_areas = seg->meta_areas;
/* Extract all MetaLVs listing them on @meta_lvs */
@@ -2940,10 +2932,12 @@ static int _clear_meta_lvs(struct logical_volume *lv)
/* Memorize meta areas and segtype to set again after initializing. */
seg->meta_areas = NULL;
- tmp_segtype = seg->segtype;
- if (!(seg->segtype = get_segtype_from_flag(lv->vg->cmd, SEG_RAID0)) ||
- !lv_update_and_reload(lv))
+ if (seg_is_raid0_meta(seg) &&
+ !(seg->segtype = get_segtype_from_flag(lv->vg->cmd, SEG_RAID0)))
+ return_0;
+
+ if (!lv_update_and_reload(lv))
return_0;
/* Note: detached rmeta are NOT renamed */
@@ -3066,7 +3060,7 @@ static void _shift_area_lvs(struct lv_segment *seg, uint32_t s1, uint32_t s2)
*/
static int _shift_parity_dev(struct lv_segment *seg)
{
- if (seg_is_raid0_meta(seg))
+ if (seg_is_raid0_meta(seg) || seg_is_raid5_n(seg))
_shift_area_lvs(seg, seg->area_count - 1, 0);
else if (seg_is_raid4(seg))
_shift_area_lvs(seg, 0, seg->area_count - 1);
@@ -3082,10 +3076,13 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
int rename_sublvs = 0;
struct lv_segment *seg = first_seg(lv);
struct dm_list removal_lvs;
+ uint32_t region_size = seg->region_size;
dm_list_init(&removal_lvs);
- if (!seg_is_raid4(seg) && !seg_is_raid5_n(seg) && !seg_is_raid6_n_6(seg)) {
+ if (!seg_is_raid4(seg) &&
+ !seg_is_raid5_n(seg) &&
+ !seg_is_raid6_n_6(seg)) {
log_error("LV %s has to be of type raid4/raid5_n/raid6_n_6 to allow for this conversion.",
display_lvname(lv));
return 0;
@@ -3098,7 +3095,7 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
if (!yes && yes_no_prompt("Are you sure you want to convert \"%s\" LV %s to \"%s\" "
"type losing all resilience? [y/n]: ",
lvseg_name(seg), display_lvname(lv), new_segtype->name) == 'n') {
- log_error("Logical volume %s NOT converted to \"%s\".",
+ log_error("Logical volume %s NOT converted to \"%s\"",
display_lvname(lv), new_segtype->name);
return 0;
}
@@ -3122,22 +3119,23 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
if (segtype_is_any_raid0(new_segtype) &&
!(rename_sublvs = _rename_area_lvs(lv, "_"))) {
- log_error("Failed to rename %s LV %s MetaLVs.",
- lvseg_name(seg), display_lvname(lv));
+ log_error("Failed to rename %s LV %s MetaLVs.", lvseg_name(seg), display_lvname(lv));
return 0;
}
-
}
/* Remove meta and data LVs requested */
if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, &removal_lvs, 0, 0))
return 0;
- if (!(seg->segtype = get_segtype_from_flag(lv->vg->cmd, SEG_RAID0_META)))
- return_0;
+ /* FIXME Hard-coded raid4/5/6 to striped/raid0 */
+ if (segtype_is_striped_target(new_segtype) || segtype_is_any_raid0(new_segtype)) {
+ seg->area_len = seg->extents_copied = seg->area_len / seg->area_count;
+ if (!(seg->segtype = get_segtype_from_flag(lv->vg->cmd, SEG_RAID0_META)))
+ return_0;
- /* FIXME Hard-coded raid4 to raid0 */
- seg->area_len = seg->extents_copied = seg->area_len / seg->area_count;
+ region_size = 0;
+ }
if (segtype_is_striped_target(new_segtype)) {
if (!_convert_raid0_to_striped(lv, 0, &removal_lvs))
@@ -3146,15 +3144,15 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
!_raid0_add_or_remove_metadata_lvs(lv, 0 /* update_and_reload */, allocate_pvs, &removal_lvs))
return_0;
- seg->region_size = 0;
+ seg->region_size = region_size;
+ seg->segtype = new_segtype;
if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, &removal_lvs))
return_0;
if (rename_sublvs) {
if (!_rename_area_lvs(lv, NULL)) {
- log_error("Failed to rename %s LV %s MetaLVs.",
- lvseg_name(seg), display_lvname(lv));
+ log_error("Failed to rename %s LV %s MetaLVs.", lvseg_name(seg), display_lvname(lv));
return 0;
}
if (!lv_update_and_reload(lv))
@@ -3164,6 +3162,79 @@ static int _raid456_to_raid0_or_striped_wrapper(TAKEOVER_FN_ARGS)
return 1;
}
+/*
+ * raid4 <-> raid5_n helper
+ *
+ * On conversions between raid4 and raid5_n, the parity SubLVs need
+ * to be switched between beginning and end of the segment areas.
+ *
+ * The metadata devices reflect the previous positions within the RaidLV,
+ * thus need to be cleared in order to allow the kernel to start the new
+ * mapping and recreate metadata with the proper new position stored.
+ */
+static int _raid45_to_raid54_wrapper(TAKEOVER_FN_ARGS)
+{
+ struct lv_segment *seg = first_seg(lv);
+ struct dm_list removal_lvs;
+ uint32_t region_size = seg->region_size;
+
+ dm_list_init(&removal_lvs);
+
+ if (!(seg_is_raid4(seg) && segtype_is_raid5_n(new_segtype)) &&
+ !(seg_is_raid5_n(seg) && segtype_is_raid4(new_segtype))) {
+ log_error("LV %s has to be of type raid4 or raid5_n to allow for this conversion.",
+ display_lvname(lv));
+ return 0;
+ }
+
+
+ /* Necessary when convering to raid0/striped w/o redundancy? */
+ if (!_raid_in_sync(lv)) {
+ log_error("Unable to convert %s while it is not in-sync.",
+ display_lvname(lv));
+ return 0;
+ }
+
+ log_debug_metadata("Converting LV %s from %s to %s.", display_lvname(lv),
+ (seg_is_raid4(seg) ? SEG_TYPE_NAME_RAID4 : SEG_TYPE_NAME_RAID5_N),
+ (seg_is_raid4(seg) ? SEG_TYPE_NAME_RAID5_N : SEG_TYPE_NAME_RAID4));
+
+ /* Archive metadata */
+ if (!archive(lv->vg))
+ return_0;
+
+ if (!_rename_area_lvs(lv, "_")) {
+ log_error("Failed to rename %s LV %s MetaLVs.", lvseg_name(seg), display_lvname(lv));
+ return 0;
+ }
+
+ if (!_clear_meta_lvs(lv))
+ return_0;
+
+ /* Shift parity SubLV pair "PDD..." <-> "DD...P" on raid4 <-> raid5_n conversion */
+ if( !_shift_parity_dev(seg))
+ return 0;
+
+ /* Don't resync */
+ init_mirror_in_sync(1);
+ seg->region_size = new_region_size ?: region_size;
+ seg->segtype = new_segtype;
+
+ if (!_lv_update_reload_fns_reset_eliminate_lvs(lv, &removal_lvs))
+ return_0;
+
+ init_mirror_in_sync(0);
+
+ if (!_rename_area_lvs(lv, NULL)) {
+ log_error("Failed to rename %s LV %s MetaLVs.", lvseg_name(seg), display_lvname(lv));
+ return 0;
+ }
+ if (!lv_update_and_reload(lv))
+ return_0;
+
+ return 1;
+}
+
static int _striped_to_raid0_wrapper(struct logical_volume *lv,
const struct segment_type *new_segtype,
uint32_t new_stripes,
@@ -3188,14 +3259,31 @@ static int _striped_to_raid0_wrapper(struct logical_volume *lv,
/* Helper: striped/raid0* -> raid4/5/6/10 */
static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
{
+ uint32_t extents_copied, region_size, seg_len, stripe_size;
struct lv_segment *seg = first_seg(lv);
struct dm_list removal_lvs;
dm_list_init(&removal_lvs);
+ if (!seg_is_striped_target(seg) &&
+ !seg_is_any_raid0(seg) &&
+ !seg_is_raid4(seg) &&
+ !seg_is_any_raid5(seg)) {
+ log_error("Can't convert %s LV %s.", lvseg_name(seg), display_lvname(lv));
+ return 0;
+ }
+
if (seg_is_raid10(seg))
return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ if (!segtype_is_raid4(new_segtype) &&
+ !segtype_is_raid5_n(new_segtype) &&
+ !segtype_is_raid6_n_6(new_segtype)) {
+ /* Can't convert to e.g. raid10_offset */
+ log_error("Can't convert %s to %s.", display_lvname(lv), new_segtype->name);
+ return 0;
+ }
+
if (new_data_copies > new_image_count) {
log_error("N number of data_copies \"--mirrors N-1\" may not be larger than number of stripes.");
return 0;
@@ -3206,8 +3294,9 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
return 0;
}
- /* FIXME: restricted to raid4 for the time being... */
- if (!segtype_is_raid4(new_segtype)) {
+ /* FIXME: restricted to raid4 and raid5_n for the time being... */
+ if (!segtype_is_raid4(new_segtype) &&
+ !segtype_is_raid5_n(new_segtype)) {
/* Can't convert striped/raid0* to e.g. raid10_offset */
log_error("Can't convert %s to %s.", display_lvname(lv), new_segtype->name);
return 0;
@@ -3219,7 +3308,7 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
/* This helper can be used to convert from striped/raid0* -> raid10 too */
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);
if (!(seg = _convert_striped_to_raid0(lv, 1 /* alloc_metadata_devs */, 0 /* update_and_reload */, allocate_pvs)))
return_0;
@@ -3229,18 +3318,32 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
if (seg_is_raid0(seg)) {
log_debug_metadata("Adding metadata LVs to %s.", display_lvname(lv));
if (!_raid0_add_or_remove_metadata_lvs(lv, 1 /* update_and_reload */, allocate_pvs, NULL))
- return_0;
- /* raid0_meta -> raid4 needs clearing of MetaLVs in order to avoid raid disk role cahnge issues in the kernel */
+ return 0;
+ /* raid0_meta -> raid4 needs clearing of MetaLVs in order to avoid raid disk role change issues in the kernel */
} else if (segtype_is_raid4(new_segtype) &&
!_clear_meta_lvs(lv))
return_0;
+
/* Add the additional component LV pairs */
log_debug_metadata("Adding %" PRIu32 " component LV pair(s) to %s.",
new_image_count - lv_raid_image_count(lv),
display_lvname(lv));
+ extents_copied = seg->extents_copied;
+ region_size = seg->region_size;
+ seg_len = seg->len;
+ stripe_size = seg->stripe_size;
+
+ if (seg_is_raid4(seg) || seg_is_any_raid5(seg)) {
+ if (!(seg->segtype = get_segtype_from_flag(lv->vg->cmd, SEG_RAID0_META)))
+ return_0;
+ seg->area_len = seg_lv(seg, 0)->le_count;
+ lv->le_count = seg->len = seg->area_len * seg->area_count;
+ seg->extents_copied = seg->region_size = 0;
+ }
+
if (!_lv_raid_change_image_count(lv, new_image_count, allocate_pvs, NULL, 0, 1))
- return_0;
+ return 0;
if (segtype_is_raid4(new_segtype) &&
(!_shift_parity_dev(seg) ||
@@ -3250,9 +3353,12 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
}
seg->segtype = new_segtype;
- seg->region_size = new_region_size;
- /* FIXME Hard-coded raid0 to raid4 */
- seg->area_len = seg->len;
+ seg->region_size = new_region_size ?: region_size;
+
+ /* FIXME Hard-coded raid0 to raid4/5/6 */
+ seg->stripe_size = stripe_size;
+ lv->le_count = seg->len = seg->area_len = seg_len;
+ seg->extents_copied = extents_copied;
_check_and_adjust_region_size(lv);
@@ -3262,7 +3368,7 @@ static int _striped_or_raid0_to_raid45610_wrapper(TAKEOVER_FN_ARGS)
return_0;
if (segtype_is_raid4(new_segtype)) {
- /* We had to rename SubLVs because of collision free sgifting, rename back... */
+ /* We had to rename SubLVs because of collision free shifting, rename back... */
if (!_rename_area_lvs(lv, NULL))
return_0;
if (!lv_update_and_reload(lv))
@@ -3352,7 +3458,9 @@ static int _takeover_from_raid0_to_raid10(TAKEOVER_FN_ARGS)
static int _takeover_from_raid0_to_raid45(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count + 1, 1 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count + 1 /* new_image_count */,
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_to_raid6(TAKEOVER_FN_ARGS)
@@ -3398,7 +3506,9 @@ static int _takeover_from_raid0_meta_to_raid10(TAKEOVER_FN_ARGS)
static int _takeover_from_raid0_meta_to_raid45(TAKEOVER_FN_ARGS)
{
- return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count + 1, 1 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
+ return _striped_or_raid0_to_raid45610_wrapper(lv, new_segtype, yes, force,
+ first_seg(lv)->area_count + 1 /* new_image_count */,
+ 2 /* data_copies */, 0, 0, new_region_size, allocate_pvs);
}
static int _takeover_from_raid0_meta_to_raid6(TAKEOVER_FN_ARGS)
@@ -3481,7 +3591,7 @@ static int _takeover_from_raid45_to_raid1(TAKEOVER_FN_ARGS)
static int _takeover_from_raid45_to_raid54(TAKEOVER_FN_ARGS)
{
- return _takeover_unsupported_yet(lv, new_stripes, new_segtype);
+ return _raid45_to_raid54_wrapper(lv, new_segtype, yes, force, first_seg(lv)->area_count, 2 /* data_copies */, 0, 0, 0, allocate_pvs);
}
static int _takeover_from_raid45_to_raid6(TAKEOVER_FN_ARGS)
@@ -3679,14 +3789,10 @@ static int _set_convenient_raid456_segtype_to(const struct lv_segment *seg_from,
return 0;
}
- /* Got to do check for raid5 -> raid6 ... */
- } else if (seg_is_any_raid5(seg_from) &&
- segtype_is_any_raid6(*segtype)) {
- log_error("Conversion not supported.");
- return 0;
-
/* ... and raid6 -> raid5 */
- } else if (seg_is_any_raid6(seg_from) &&
+ } else if ((seg_is_raid6_zr(seg_from) ||
+ seg_is_raid6_nr(seg_from) ||
+ seg_is_raid6_nc(seg_from)) &&
segtype_is_any_raid5(*segtype)) {
log_error("Conversion not supported.");
return 0;
@@ -3927,7 +4033,7 @@ static int _lv_raid_rebuild_or_replace(struct logical_volume *lv,
const char *action_str = rebuild ? "rebuild" : "replace";
if (seg_is_any_raid0(raid_seg)) {
- log_error("Can't replace any devices in %s LV %s",
+ log_error("Can't replace any devices in %s LV %s.",
lvseg_name(raid_seg), display_lvname(lv));
return 0;
}
diff --git a/lib/raid/raid.c b/lib/raid/raid.c
index 1e562ff..7dfafef 100644
--- a/lib/raid/raid.c
+++ b/lib/raid/raid.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2016 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2011-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@@ -87,13 +87,13 @@ static int _raid_text_import_areas(struct lv_segment *seg,
}
/* Metadata device comes first. */
- if (!seg_is_raid0(seg)) {
- if (!(lv = find_lv(seg->lv->vg, cv->v.str))) {
- log_error("Couldn't find volume '%s' for segment '%s'.",
- cv->v.str ? : "NULL", seg_name);
- return 0;
- }
+ if (!(lv = find_lv(seg->lv->vg, cv->v.str))) {
+ log_error("Couldn't find volume '%s' for segment '%s'.",
+ cv->v.str ? : "NULL", seg_name);
+ return 0;
+ }
+ if (strstr(lv->name, "_rmeta_")) {
if (!set_lv_segment_area_lv(seg, s, lv, 0, RAID_META))
return_0;
cv = cv->next;
@@ -537,6 +537,7 @@ static const struct raid_type {
{ SEG_TYPE_NAME_RAID10, 0, SEG_RAID10 | SEG_AREAS_MIRRORED },
{ SEG_TYPE_NAME_RAID4, 1, SEG_RAID4 },
{ SEG_TYPE_NAME_RAID5, 1, SEG_RAID5 },
+ { SEG_TYPE_NAME_RAID5_N, 1, SEG_RAID5_N },
{ SEG_TYPE_NAME_RAID5_LA, 1, SEG_RAID5_LA },
{ SEG_TYPE_NAME_RAID5_LS, 1, SEG_RAID5_LS },
{ SEG_TYPE_NAME_RAID5_RA, 1, SEG_RAID5_RA },
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index c5226a7..8a32320 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2016 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2005-2017 Red Hat, Inc. All rights reserved.
*
* This file is part of the device-mapper userspace tools.
*
@@ -47,6 +47,7 @@ enum {
SEG_RAID1,
SEG_RAID10,
SEG_RAID4,
+ SEG_RAID5_N,
SEG_RAID5_LA,
SEG_RAID5_RA,
SEG_RAID5_LS,
@@ -81,6 +82,7 @@ static const struct {
{ SEG_RAID1, "raid1"},
{ SEG_RAID10, "raid10"},
{ SEG_RAID4, "raid4"},
+ { SEG_RAID5_N, "raid5_n"},
{ SEG_RAID5_LA, "raid5_la"},
{ SEG_RAID5_RA, "raid5_ra"},
{ SEG_RAID5_LS, "raid5_ls"},
@@ -2140,6 +2142,7 @@ static int _emit_areas_line(struct dm_task *dmt __attribute__((unused)),
case SEG_RAID1:
case SEG_RAID10:
case SEG_RAID4:
+ case SEG_RAID5_N:
case SEG_RAID5_LA:
case SEG_RAID5_RA:
case SEG_RAID5_LS:
@@ -2588,6 +2591,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
case SEG_RAID1:
case SEG_RAID10:
case SEG_RAID4:
+ case SEG_RAID5_N:
case SEG_RAID5_LA:
case SEG_RAID5_RA:
case SEG_RAID5_LS:
@@ -3869,6 +3873,7 @@ int dm_tree_node_add_null_area(struct dm_tree_node *node, uint64_t offset)
case SEG_RAID0_META:
case SEG_RAID1:
case SEG_RAID4:
+ case SEG_RAID5_N:
case SEG_RAID5_LA:
case SEG_RAID5_RA:
case SEG_RAID5_LS:
diff --git a/test/shell/lvconvert-raid-takeover.sh b/test/shell/lvconvert-raid-takeover.sh
index c1cb1aa..0b7d326 100644
--- a/test/shell/lvconvert-raid-takeover.sh
+++ b/test/shell/lvconvert-raid-takeover.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2016 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2016,2017 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
@@ -120,6 +120,7 @@ check lv_field $vg/$lv4 segtype "striped"
check lv_field $vg/$lv4 stripes 3
fsck -fn /dev/mapper/$vg-$lv4
+
# Convert striped -> raid4
lvconvert -y --ty raid4 $vg/$lv1
check lv_field $vg/$lv1 segtype "raid4"
@@ -128,6 +129,37 @@ fsck -fn /dev/mapper/$vg-$lv1
aux wait_for_sync $vg $lv1
fsck -fn /dev/mapper/$vg-$lv1
+# Convert raid4 -> raid5_n
+lvconvert -y --ty raid5_n $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid5_n"
+check lv_field $vg/$lv1 stripes 4
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid5 -> striped
+lvconvert -y --ty striped $vg/$lv1
+check lv_field $vg/$lv1 segtype "striped"
+check lv_field $vg/$lv1 stripes 3
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert striped -> raid5_n
+lvconvert -y --ty raid5_n $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid5_n"
+check lv_field $vg/$lv1 stripes 4
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+# Convert raid5_n -> raid4
+lvconvert -y --ty raid4 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid4"
+check lv_field $vg/$lv1 stripes 4
+fsck -fn /dev/mapper/$vg-$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn /dev/mapper/$vg-$lv1
+
+
# Convert raid0 -> raid4
lvconvert -y --ty raid4 $vg/$lv2
check lv_field $vg/$lv2 segtype "raid4"
@@ -136,6 +168,35 @@ fsck -fn /dev/mapper/$vg-$lv2
aux wait_for_sync $vg $lv2
fsck -fn /dev/mapper/$vg-$lv2
+# Convert raid4 -> raid0
+lvconvert -y --ty raid0 $vg/$lv2
+check lv_field $vg/$lv2 segtype "raid0"
+check lv_field $vg/$lv2 stripes 3
+fsck -fn /dev/mapper/$vg-$lv2
+
+# Convert raid0 -> raid5_n
+lvconvert -y --ty raid5_n $vg/$lv2
+check lv_field $vg/$lv2 segtype "raid5_n"
+check lv_field $vg/$lv2 stripes 4
+fsck -fn /dev/mapper/$vg-$lv2
+aux wait_for_sync $vg $lv2
+fsck -fn /dev/mapper/$vg-$lv2
+
+# Convert raid5_n -> raid0_meta
+lvconvert -y --ty raid0_meta $vg/$lv2
+check lv_field $vg/$lv2 segtype "raid0_meta"
+check lv_field $vg/$lv2 stripes 3
+fsck -fn /dev/mapper/$vg-$lv2
+
+# Convert raid0_meta -> raid5_n
+lvconvert -y --ty raid5_n $vg/$lv2
+check lv_field $vg/$lv2 segtype "raid5_n"
+check lv_field $vg/$lv2 stripes 4
+fsck -fn /dev/mapper/$vg-$lv2
+aux wait_for_sync $vg $lv2
+fsck -fn /dev/mapper/$vg-$lv2
+
+
# Convert raid4 -> raid0_meta
lvconvert -y --ty raid0_meta $vg/$lv1
check lv_field $vg/$lv1 segtype "raid0_meta"
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=875ce04c61fb4043…
Commit: 875ce04c61fb40436bf4d6308356c800d08c1f7e
Parent: 3eccbb4b4713f0d79831e7c146851bff820c94bb
Author: Tony Asleson <tasleson(a)redhat.com>
AuthorDate: Wed Feb 1 19:05:41 2017 -0600
Committer: Tony Asleson <tasleson(a)redhat.com>
CommitterDate: Wed Feb 1 19:05:41 2017 -0600
lvmdbusd: cmdhandler.py, remove duplicate code
Move similar code to common functions, less is more!
---
daemons/lvmdbusd/cmdhandler.py | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/daemons/lvmdbusd/cmdhandler.py b/daemons/lvmdbusd/cmdhandler.py
index f1591aa..31b7c5c 100644
--- a/daemons/lvmdbusd/cmdhandler.py
+++ b/daemons/lvmdbusd/cmdhandler.py
@@ -295,7 +295,7 @@ def vg_lv_snapshot(vg_name, snapshot_options, name, size_bytes):
return call(cmd)
-def vg_lv_create_linear(vg_name, create_options, name, size_bytes, thin_pool):
+def _vg_lv_create_common_cmd(create_options, size_bytes, thin_pool):
cmd = ['lvcreate']
cmd.extend(options_to_cli_args(create_options))
@@ -303,20 +303,18 @@ def vg_lv_create_linear(vg_name, create_options, name, size_bytes, thin_pool):
cmd.extend(['--size', str(size_bytes) + 'B'])
else:
cmd.extend(['--thin', '--size', str(size_bytes) + 'B'])
+ return cmd
+
+
+def vg_lv_create_linear(vg_name, create_options, name, size_bytes, thin_pool):
+ cmd = _vg_lv_create_common_cmd(create_options, size_bytes, thin_pool)
cmd.extend(['--name', name, vg_name])
return call(cmd)
def vg_lv_create_striped(vg_name, create_options, name, size_bytes,
num_stripes, stripe_size_kb, thin_pool):
- cmd = ['lvcreate']
- cmd.extend(options_to_cli_args(create_options))
-
- if not thin_pool:
- cmd.extend(['--size', str(size_bytes) + 'B'])
- else:
- cmd.extend(['--thin', '--size', str(size_bytes) + 'B'])
-
+ cmd = _vg_lv_create_common_cmd(create_options, size_bytes, thin_pool)
cmd.extend(['--stripes', str(num_stripes)])
if stripe_size_kb != 0:
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3eccbb4b4713f0d7…
Commit: 3eccbb4b4713f0d79831e7c146851bff820c94bb
Parent: 945842fa680d6c967b64362fe8b2ce6c3334a52d
Author: Tony Asleson <tasleson(a)redhat.com>
AuthorDate: Wed Feb 1 18:57:01 2017 -0600
Committer: Tony Asleson <tasleson(a)redhat.com>
CommitterDate: Wed Feb 1 18:57:01 2017 -0600
lvmdbusd: manager.py, remove duplicate code
Move similar code to common functions, less is more!
---
daemons/lvmdbusd/manager.py | 42 ++++++++++++++++--------------------------
1 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/daemons/lvmdbusd/manager.py b/daemons/lvmdbusd/manager.py
index 3f6f09b..41bb22a 100644
--- a/daemons/lvmdbusd/manager.py
+++ b/daemons/lvmdbusd/manager.py
@@ -31,6 +31,16 @@ class Manager(AutomatedProperties):
return dbus.String('1.0.0')
@staticmethod
+ def handle_execute(rc, out, err):
+ if rc == 0:
+ cfg.load()
+ else:
+ # Need to work on error handling, need consistent
+ raise dbus.exceptions.DBusException(
+ MANAGER_INTERFACE,
+ 'Exit code %s, stderr = %s' % (str(rc), err))
+
+ @staticmethod
def _pv_create(device, create_options):
# Check to see if we are already trying to create a PV for an existing
@@ -41,15 +51,8 @@ class Manager(AutomatedProperties):
MANAGER_INTERFACE, "PV Already exists!")
rc, out, err = cmdhandler.pv_create(create_options, [device])
- if rc == 0:
- cfg.load()
- created_pv = cfg.om.get_object_path_by_lvm_id(device)
- else:
- raise dbus.exceptions.DBusException(
- MANAGER_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
-
- return created_pv
+ Manager.handle_execute(rc, out, err)
+ return cfg.om.get_object_path_by_lvm_id(device)
@dbus.service.method(
dbus_interface=MANAGER_INTERFACE,
@@ -76,14 +79,8 @@ class Manager(AutomatedProperties):
MANAGER_INTERFACE, 'object path = %s not found' % p)
rc, out, err = cmdhandler.vg_create(create_options, pv_devices, name)
-
- if rc == 0:
- cfg.load()
- return cfg.om.get_object_path_by_lvm_id(name)
- else:
- raise dbus.exceptions.DBusException(
- MANAGER_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
+ Manager.handle_execute(rc, out, err)
+ return cfg.om.get_object_path_by_lvm_id(name)
@dbus.service.method(
dbus_interface=MANAGER_INTERFACE,
@@ -200,15 +197,8 @@ class Manager(AutomatedProperties):
activate, cache, device_path,
major_minor, scan_options)
- if rc == 0:
- # This could potentially change the state quite a bit, so lets
- # update everything to be safe
- cfg.load()
- return '/'
- else:
- raise dbus.exceptions.DBusException(
- MANAGER_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
+ Manager.handle_execute(rc, out, err)
+ return '/'
@dbus.service.method(
dbus_interface=MANAGER_INTERFACE,
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=945842fa680d6c96…
Commit: 945842fa680d6c967b64362fe8b2ce6c3334a52d
Parent: 681d69c70ae70dffa9d21bfd82e1e9821371ee82
Author: Tony Asleson <tasleson(a)redhat.com>
AuthorDate: Wed Feb 1 18:56:39 2017 -0600
Committer: Tony Asleson <tasleson(a)redhat.com>
CommitterDate: Wed Feb 1 18:56:39 2017 -0600
lvmdbusd: lvmdb.py, remove duplicate code
Move similar code to common functions, less is more!
---
daemons/lvmdbusd/lvmdb.py | 39 ++++++++++++++++-----------------------
1 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/daemons/lvmdbusd/lvmdb.py b/daemons/lvmdbusd/lvmdb.py
index 9529e03..974e7d7 100755
--- a/daemons/lvmdbusd/lvmdb.py
+++ b/daemons/lvmdbusd/lvmdb.py
@@ -69,18 +69,7 @@ class DataStore(object):
table[key] = record
@staticmethod
- def _parse_pvs(_pvs):
- pvs = sorted(_pvs, key=lambda pk: pk['pv_name'])
-
- c_pvs = OrderedDict()
- c_lookup = {}
- c_pvs_in_vgs = {}
-
- for p in pvs:
- DataStore._insert_record(
- c_pvs, p['pv_uuid'], p,
- ['pvseg_start', 'pvseg_size', 'segtype'])
-
+ def _pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup):
for p in c_pvs.values():
# Capture which PVs are associated with which VG
if p['vg_uuid'] not in c_pvs_in_vgs:
@@ -93,6 +82,20 @@ class DataStore(object):
# Lookup for translating between /dev/<name> and pv uuid
c_lookup[p['pv_name']] = p['pv_uuid']
+ @staticmethod
+ def _parse_pvs(_pvs):
+ pvs = sorted(_pvs, key=lambda pk: pk['pv_name'])
+
+ c_pvs = OrderedDict()
+ c_lookup = {}
+ c_pvs_in_vgs = {}
+
+ for p in pvs:
+ DataStore._insert_record(
+ c_pvs, p['pv_uuid'], p,
+ ['pvseg_start', 'pvseg_size', 'segtype'])
+
+ DataStore._pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup)
return c_pvs, c_lookup, c_pvs_in_vgs
@staticmethod
@@ -132,17 +135,7 @@ class DataStore(object):
i['pvseg_size'] = i['pv_pe_count']
i['segtype'] = 'free'
- for p in c_pvs.values():
- # Capture which PVs are associated with which VG
- if p['vg_uuid'] not in c_pvs_in_vgs:
- c_pvs_in_vgs[p['vg_uuid']] = []
-
- if p['vg_name']:
- c_pvs_in_vgs[p['vg_uuid']].append(
- (p['pv_name'], p['pv_uuid']))
-
- # Lookup for translating between /dev/<name> and pv uuid
- c_lookup[p['pv_name']] = p['pv_uuid']
+ DataStore._pvs_parse_common(c_pvs, c_pvs_in_vgs, c_lookup)
return c_pvs, c_lookup, c_pvs_in_vgs
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=681d69c70ae70dff…
Commit: 681d69c70ae70dffa9d21bfd82e1e9821371ee82
Parent: a010cede6e69fcb9301d0b1f4e282a2b04d15430
Author: Tony Asleson <tasleson(a)redhat.com>
AuthorDate: Wed Feb 1 16:51:00 2017 -0600
Committer: Tony Asleson <tasleson(a)redhat.com>
CommitterDate: Wed Feb 1 16:51:00 2017 -0600
lvmdbusd: pv.py, remove duplicate code
Move similar code to common functions, less is more!
---
daemons/lvmdbusd/pv.py | 65 ++++++++++++++++++-----------------------------
1 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/daemons/lvmdbusd/pv.py b/daemons/lvmdbusd/pv.py
index 95047d1..fe32143 100644
--- a/daemons/lvmdbusd/pv.py
+++ b/daemons/lvmdbusd/pv.py
@@ -135,23 +135,30 @@ class Pv(AutomatedProperties):
def _remove(pv_uuid, pv_name, remove_options):
# Remove the PV, if successful then remove from the model
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(pv_uuid, pv_name)
+ Pv.validate_dbus_object(pv_uuid, pv_name)
+ rc, out, err = cmdhandler.pv_remove(pv_name, remove_options)
+ Pv.handle_execute(rc, out, err)
+ return '/'
- if dbo:
- rc, out, err = cmdhandler.pv_remove(pv_name, remove_options)
- if rc == 0:
- cfg.load()
- else:
- # Need to work on error handling, need consistent
- raise dbus.exceptions.DBusException(
- PV_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
+ @staticmethod
+ def handle_execute(rc, out, err):
+ if rc == 0:
+ cfg.load()
else:
+ # Need to work on error handling, need consistent
+ raise dbus.exceptions.DBusException(
+ PV_INTERFACE,
+ 'Exit code %s, stderr = %s' % (str(rc), err))
+
+ @staticmethod
+ def validate_dbus_object(pv_uuid, pv_name):
+ dbo = cfg.om.get_object_by_uuid_lvm_id(pv_uuid, pv_name)
+ if not dbo:
raise dbus.exceptions.DBusException(
PV_INTERFACE,
'PV with uuid %s and name %s not present!' %
(pv_uuid, pv_name))
- return '/'
+ return dbo
@dbus.service.method(
dbus_interface=PV_INTERFACE,
@@ -168,22 +175,11 @@ class Pv(AutomatedProperties):
@staticmethod
def _resize(pv_uuid, pv_name, new_size_bytes, resize_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(pv_uuid, pv_name)
+ Pv.validate_dbus_object(pv_uuid, pv_name)
- if dbo:
- rc, out, err = cmdhandler.pv_resize(pv_name, new_size_bytes,
+ rc, out, err = cmdhandler.pv_resize(pv_name, new_size_bytes,
resize_options)
- if rc == 0:
- cfg.load()
- else:
- raise dbus.exceptions.DBusException(
- PV_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- PV_INTERFACE,
- 'PV with uuid %s and name %s not present!' %
- (pv_uuid, pv_name))
+ Pv.handle_execute(rc, out, err)
return '/'
@dbus.service.method(
@@ -201,21 +197,10 @@ class Pv(AutomatedProperties):
@staticmethod
def _allocation_enabled(pv_uuid, pv_name, yes_no, allocation_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(pv_uuid, pv_name)
-
- if dbo:
- rc, out, err = cmdhandler.pv_allocatable(
- pv_name, yes_no, allocation_options)
- if rc == 0:
- cfg.load()
- else:
- raise dbus.exceptions.DBusException(
- PV_INTERFACE, 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- PV_INTERFACE,
- 'PV with uuid %s and name %s not present!' %
- (pv_uuid, pv_name))
+ Pv.validate_dbus_object(pv_uuid, pv_name)
+ rc, out, err = cmdhandler.pv_allocatable(
+ pv_name, yes_no, allocation_options)
+ Pv.handle_execute(rc, out, err)
return '/'
@dbus.service.method(
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a010cede6e69fcb9…
Commit: a010cede6e69fcb9301d0b1f4e282a2b04d15430
Parent: 83a19075861d86d7800e395f4c30f90dabc11692
Author: Tony Asleson <tasleson(a)redhat.com>
AuthorDate: Wed Feb 1 16:37:03 2017 -0600
Committer: Tony Asleson <tasleson(a)redhat.com>
CommitterDate: Wed Feb 1 16:37:03 2017 -0600
lvmdbusd: vg.py, remove duplicate code
Move similar code to common functions, less is more!
---
daemons/lvmdbusd/vg.py | 418 +++++++++++++++---------------------------------
1 files changed, 128 insertions(+), 290 deletions(-)
diff --git a/daemons/lvmdbusd/vg.py b/daemons/lvmdbusd/vg.py
index 9b1df4e..c00084d 100644
--- a/daemons/lvmdbusd/vg.py
+++ b/daemons/lvmdbusd/vg.py
@@ -145,29 +145,35 @@ class Vg(AutomatedProperties):
@staticmethod
def fetch_new_lv(vg_name, lv_name):
- cfg.load()
return cfg.om.get_object_path_by_lvm_id("%s/%s" % (vg_name, lv_name))
@staticmethod
- def _rename(uuid, vg_name, new_name, rename_options):
- # Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- rc, out, err = cmdhandler.vg_rename(vg_name, new_name,
- rename_options)
- if rc == 0:
- cfg.load()
- else:
- # Need to work on error handling, need consistent
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
+ def handle_execute(rc, out, err):
+ if rc == 0:
+ cfg.load()
else:
+ # Need to work on error handling, need consistent
+ raise dbus.exceptions.DBusException(
+ VG_INTERFACE,
+ 'Exit code %s, stderr = %s' % (str(rc), err))
+
+ @staticmethod
+ def validate_dbus_object(vg_uuid, vg_name):
+ dbo = cfg.om.get_object_by_uuid_lvm_id(vg_uuid, vg_name)
+ if not dbo:
raise dbus.exceptions.DBusException(
VG_INTERFACE,
'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ (vg_uuid, vg_name))
+ return dbo
+
+ @staticmethod
+ def _rename(uuid, vg_name, new_name, rename_options):
+ # Make sure we have a dbus object representing it
+ Vg.validate_dbus_object(uuid, vg_name)
+ rc, out, err = cmdhandler.vg_rename(
+ vg_name, new_name, rename_options)
+ Vg.handle_execute(rc, out, err)
return '/'
@dbus.service.method(
@@ -184,24 +190,10 @@ class Vg(AutomatedProperties):
@staticmethod
def _remove(uuid, vg_name, remove_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- # Remove the VG, if successful then remove from the model
- rc, out, err = cmdhandler.vg_remove(vg_name, remove_options)
-
- if rc == 0:
- cfg.load()
- else:
- # Need to work on error handling, need consistent
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ Vg.validate_dbus_object(uuid, vg_name)
+ # Remove the VG, if successful then remove from the model
+ rc, out, err = cmdhandler.vg_remove(vg_name, remove_options)
+ Vg.handle_execute(rc, out, err)
return '/'
@dbus.service.method(
@@ -216,26 +208,9 @@ class Vg(AutomatedProperties):
@staticmethod
def _change(uuid, vg_name, change_options):
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- rc, out, err = cmdhandler.vg_change(change_options, vg_name)
-
- # To use an example with d-feet (Method input)
- # {"activate": __import__('gi.repository.GLib', globals(),
- # locals(), ['Variant']).Variant("s", "n")}
-
- if rc == 0:
- cfg.load()
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ Vg.validate_dbus_object(uuid, vg_name)
+ rc, out, err = cmdhandler.vg_change(change_options, vg_name)
+ Vg.handle_execute(rc, out, err)
return '/'
# TODO: This should be broken into a number of different methods
@@ -256,34 +231,24 @@ class Vg(AutomatedProperties):
@staticmethod
def _reduce(uuid, vg_name, missing, pv_object_paths, reduce_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- pv_devices = []
-
- # If pv_object_paths is not empty, then get the device paths
- if pv_object_paths and len(pv_object_paths) > 0:
- for pv_op in pv_object_paths:
- pv = cfg.om.get_object_by_path(pv_op)
- if pv:
- pv_devices.append(pv.lvm_id)
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'PV Object path not found = %s!' % pv_op)
-
- rc, out, err = cmdhandler.vg_reduce(vg_name, missing, pv_devices,
- reduce_options)
- if rc == 0:
- cfg.load()
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE, 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ Vg.validate_dbus_object(uuid, vg_name)
+
+ pv_devices = []
+
+ # If pv_object_paths is not empty, then get the device paths
+ if pv_object_paths and len(pv_object_paths) > 0:
+ for pv_op in pv_object_paths:
+ pv = cfg.om.get_object_by_path(pv_op)
+ if pv:
+ pv_devices.append(pv.lvm_id)
+ else:
+ raise dbus.exceptions.DBusException(
+ VG_INTERFACE,
+ 'PV Object path not found = %s!' % pv_op)
+
+ rc, out, err = cmdhandler.vg_reduce(vg_name, missing, pv_devices,
+ reduce_options)
+ Vg.handle_execute(rc, out, err)
return '/'
@dbus.service.method(
@@ -300,36 +265,26 @@ class Vg(AutomatedProperties):
@staticmethod
def _extend(uuid, vg_name, pv_object_paths, extend_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- extend_devices = []
+ Vg.validate_dbus_object(uuid, vg_name)
- for i in pv_object_paths:
- pv = cfg.om.get_object_by_path(i)
- if pv:
- extend_devices.append(pv.lvm_id)
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE, 'PV Object path not found = %s!' % i)
+ extend_devices = []
- if len(extend_devices):
- rc, out, err = cmdhandler.vg_extend(vg_name, extend_devices,
- extend_options)
- if rc == 0:
- cfg.load()
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
+ for i in pv_object_paths:
+ pv = cfg.om.get_object_by_path(i)
+ if pv:
+ extend_devices.append(pv.lvm_id)
else:
raise dbus.exceptions.DBusException(
- VG_INTERFACE, 'No pv_object_paths provided!')
+ VG_INTERFACE, 'PV Object path not found = %s!' % i)
+
+ if len(extend_devices):
+ rc, out, err = cmdhandler.vg_extend(vg_name, extend_devices,
+ extend_options)
+ Vg.handle_execute(rc, out, err)
else:
raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ VG_INTERFACE, 'No pv_object_paths provided!')
+
return '/'
@dbus.service.method(
@@ -366,33 +321,24 @@ class Vg(AutomatedProperties):
create_options):
# Make sure we have a dbus object representing it
pv_dests = []
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
- if dbo:
- if len(pv_dests_and_ranges):
- for pr in pv_dests_and_ranges:
- pv_dbus_obj = cfg.om.get_object_by_path(pr[0])
- if not pv_dbus_obj:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'PV Destination (%s) not found' % pr[0])
+ Vg.validate_dbus_object(uuid, vg_name)
- pv_dests.append((pv_dbus_obj.lvm_id, pr[1], pr[2]))
+ if len(pv_dests_and_ranges):
+ for pr in pv_dests_and_ranges:
+ pv_dbus_obj = cfg.om.get_object_by_path(pr[0])
+ if not pv_dbus_obj:
+ raise dbus.exceptions.DBusException(
+ VG_INTERFACE,
+ 'PV Destination (%s) not found' % pr[0])
- rc, out, err = cmdhandler.vg_lv_create(
- vg_name, create_options, name, size_bytes, pv_dests)
+ pv_dests.append((pv_dbus_obj.lvm_id, pr[1], pr[2]))
- if rc == 0:
- return Vg.fetch_new_lv(vg_name, name)
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ rc, out, err = cmdhandler.vg_lv_create(
+ vg_name, create_options, name, size_bytes, pv_dests)
+
+ Vg.handle_execute(rc, out, err)
+ return Vg.fetch_new_lv(vg_name, name)
@dbus.service.method(
dbus_interface=VG_INTERFACE,
@@ -428,25 +374,13 @@ class Vg(AutomatedProperties):
def _lv_create_linear(uuid, vg_name, name, size_bytes,
thin_pool, create_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- rc, out, err = cmdhandler.vg_lv_create_linear(
- vg_name, create_options, name, size_bytes, thin_pool)
+ Vg.validate_dbus_object(uuid, vg_name)
- if rc == 0:
- created_lv = Vg.fetch_new_lv(vg_name, name)
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ rc, out, err = cmdhandler.vg_lv_create_linear(
+ vg_name, create_options, name, size_bytes, thin_pool)
- return created_lv
+ Vg.handle_execute(rc, out, err)
+ return Vg.fetch_new_lv(vg_name, name)
@dbus.service.method(
dbus_interface=VG_INTERFACE,
@@ -466,24 +400,12 @@ class Vg(AutomatedProperties):
def _lv_create_striped(uuid, vg_name, name, size_bytes, num_stripes,
stripe_size_kb, thin_pool, create_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- rc, out, err = cmdhandler.vg_lv_create_striped(
- vg_name, create_options, name, size_bytes,
- num_stripes, stripe_size_kb, thin_pool)
- if rc == 0:
- created_lv = Vg.fetch_new_lv(vg_name, name)
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE, 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
-
- return created_lv
+ Vg.validate_dbus_object(uuid, vg_name)
+ rc, out, err = cmdhandler.vg_lv_create_striped(
+ vg_name, create_options, name, size_bytes,
+ num_stripes, stripe_size_kb, thin_pool)
+ Vg.handle_execute(rc, out, err)
+ return Vg.fetch_new_lv(vg_name, name)
@dbus.service.method(
dbus_interface=VG_INTERFACE,
@@ -506,25 +428,11 @@ class Vg(AutomatedProperties):
def _lv_create_mirror(uuid, vg_name, name, size_bytes,
num_copies, create_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- rc, out, err = cmdhandler.vg_lv_create_mirror(
- vg_name, create_options, name, size_bytes, num_copies)
- if rc == 0:
- created_lv = Vg.fetch_new_lv(vg_name, name)
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
-
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
-
- return created_lv
+ Vg.validate_dbus_object(uuid, vg_name)
+ rc, out, err = cmdhandler.vg_lv_create_mirror(
+ vg_name, create_options, name, size_bytes, num_copies)
+ Vg.handle_execute(rc, out, err)
+ return Vg.fetch_new_lv(vg_name, name)
@dbus.service.method(
dbus_interface=VG_INTERFACE,
@@ -545,26 +453,12 @@ class Vg(AutomatedProperties):
def _lv_create_raid(uuid, vg_name, name, raid_type, size_bytes,
num_stripes, stripe_size_kb, create_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- rc, out, err = cmdhandler.vg_lv_create_raid(
- vg_name, create_options, name, raid_type, size_bytes,
- num_stripes, stripe_size_kb)
- if rc == 0:
- created_lv = Vg.fetch_new_lv(vg_name, name)
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
-
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
-
- return created_lv
+ Vg.validate_dbus_object(uuid, vg_name)
+ rc, out, err = cmdhandler.vg_lv_create_raid(
+ vg_name, create_options, name, raid_type, size_bytes,
+ num_stripes, stripe_size_kb)
+ Vg.handle_execute(rc, out, err)
+ return Vg.fetch_new_lv(vg_name, name)
@dbus.service.method(
dbus_interface=VG_INTERFACE,
@@ -585,33 +479,27 @@ class Vg(AutomatedProperties):
def _create_pool(uuid, vg_name, meta_data_lv, data_lv,
create_options, create_method):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
+ Vg.validate_dbus_object(uuid, vg_name)
# Retrieve the full names for the metadata and data lv
md = cfg.om.get_object_by_path(meta_data_lv)
data = cfg.om.get_object_by_path(data_lv)
- if dbo and md and data:
+ if md and data:
new_name = data.Name
rc, out, err = create_method(
md.lv_full_name(), data.lv_full_name(), create_options)
+
if rc == 0:
mt_remove_dbus_objects((md, data))
- cache_pool_lv = Vg.fetch_new_lv(vg_name, new_name)
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
+
+ Vg.handle_execute(rc, out, err)
else:
msg = ""
- if not dbo:
- msg += 'VG with uuid %s and name %s not present!' % \
- (uuid, vg_name)
-
if not md:
msg += 'Meta data LV with object path %s not present!' % \
(meta_data_lv)
@@ -622,7 +510,7 @@ class Vg(AutomatedProperties):
raise dbus.exceptions.DBusException(VG_INTERFACE, msg)
- return cache_pool_lv
+ return Vg.fetch_new_lv(vg_name, new_name)
@dbus.service.method(
dbus_interface=VG_INTERFACE,
@@ -656,33 +544,21 @@ class Vg(AutomatedProperties):
pv_devices = []
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- # Check for existence of pv object paths
- for p in pv_object_paths:
- pv = cfg.om.get_object_by_path(p)
- if pv:
- pv_devices.append(pv.Name)
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE, 'PV object path = %s not found' % p)
+ Vg.validate_dbus_object(uuid, vg_name)
- rc, out, err = cmdhandler.pv_tag(
- pv_devices, tags_add, tags_del, tag_options)
- if rc == 0:
- cfg.load()
- return '/'
+ # Check for existence of pv object paths
+ for p in pv_object_paths:
+ pv = cfg.om.get_object_by_path(p)
+ if pv:
+ pv_devices.append(pv.Name)
else:
raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
+ VG_INTERFACE, 'PV object path = %s not found' % p)
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ rc, out, err = cmdhandler.pv_tag(
+ pv_devices, tags_add, tags_del, tag_options)
+ Vg.handle_execute(rc, out, err)
+ return '/'
@dbus.service.method(
dbus_interface=VG_INTERFACE,
@@ -720,25 +596,12 @@ class Vg(AutomatedProperties):
@staticmethod
def _vg_add_rm_tags(uuid, vg_name, tags_add, tags_del, tag_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
+ Vg.validate_dbus_object(uuid, vg_name)
- if dbo:
-
- rc, out, err = cmdhandler.vg_tag(
- vg_name, tags_add, tags_del, tag_options)
- if rc == 0:
- cfg.load()
- return '/'
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
-
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ rc, out, err = cmdhandler.vg_tag(
+ vg_name, tags_add, tags_del, tag_options)
+ Vg.handle_execute(rc, out, err)
+ return '/'
@dbus.service.method(
dbus_interface=VG_INTERFACE,
@@ -775,23 +638,10 @@ class Vg(AutomatedProperties):
@staticmethod
def _vg_change_set(uuid, vg_name, method, value, options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- rc, out, err = method(vg_name, value, options)
- if rc == 0:
- cfg.load()
- return '/'
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
-
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ Vg.validate_dbus_object(uuid, vg_name)
+ rc, out, err = method(vg_name, value, options)
+ Vg.handle_execute(rc, out, err)
+ return '/'
@dbus.service.method(
dbus_interface=VG_INTERFACE,
@@ -849,23 +699,11 @@ class Vg(AutomatedProperties):
def _vg_activate_deactivate(uuid, vg_name, activate, control_flags,
options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, vg_name)
-
- if dbo:
- rc, out, err = cmdhandler.activate_deactivate(
- 'vgchange', vg_name, activate, control_flags, options)
- if rc == 0:
- cfg.load()
- return '/'
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- VG_INTERFACE,
- 'VG with uuid %s and name %s not present!' %
- (uuid, vg_name))
+ Vg.validate_dbus_object(uuid, vg_name)
+ rc, out, err = cmdhandler.activate_deactivate(
+ 'vgchange', vg_name, activate, control_flags, options)
+ Vg.handle_execute(rc, out, err)
+ return '/'
@dbus.service.method(
dbus_interface=VG_INTERFACE,
1
0
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=83a19075861d86d7…
Commit: 83a19075861d86d7800e395f4c30f90dabc11692
Parent: 2350ea0060cd729f36245df5622b38c4b8d9bb12
Author: Tony Asleson <tasleson(a)redhat.com>
AuthorDate: Wed Feb 1 15:38:55 2017 -0600
Committer: Tony Asleson <tasleson(a)redhat.com>
CommitterDate: Wed Feb 1 15:38:55 2017 -0600
lvmdbusd: lv.py, remove duplicate code
Move similar code to common functions, less is more!
---
daemons/lvmdbusd/lv.py | 268 +++++++++++++++++-------------------------------
1 files changed, 92 insertions(+), 176 deletions(-)
diff --git a/daemons/lvmdbusd/lv.py b/daemons/lvmdbusd/lv.py
index fa54322..6c93e4d 100644
--- a/daemons/lvmdbusd/lv.py
+++ b/daemons/lvmdbusd/lv.py
@@ -272,6 +272,26 @@ class LvCommon(AutomatedProperties):
self.state = object_state
self._move_pv = self._get_move_pv()
+ @staticmethod
+ def handle_execute(rc, out, err):
+ if rc == 0:
+ cfg.load()
+ else:
+ # Need to work on error handling, need consistent
+ raise dbus.exceptions.DBusException(
+ LV_INTERFACE,
+ 'Exit code %s, stderr = %s' % (str(rc), err))
+
+ @staticmethod
+ def validate_dbus_object(lv_uuid, lv_name):
+ dbo = cfg.om.get_object_by_uuid_lvm_id(lv_uuid, lv_name)
+ if not dbo:
+ raise dbus.exceptions.DBusException(
+ LV_INTERFACE,
+ 'LV with uuid %s and name %s not present!' %
+ (lv_uuid, lv_name))
+ return dbo
+
@property
def VolumeType(self):
type_map = {'C': 'Cache', 'm': 'mirrored',
@@ -408,24 +428,10 @@ class Lv(LvCommon):
@staticmethod
def _remove(lv_uuid, lv_name, remove_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(lv_uuid, lv_name)
-
- if dbo:
- # Remove the LV, if successful then remove from the model
- rc, out, err = cmdhandler.lv_remove(lv_name, remove_options)
-
- if rc == 0:
- cfg.load()
- else:
- # Need to work on error handling, need consistent
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'LV with uuid %s and name %s not present!' %
- (lv_uuid, lv_name))
+ LvCommon.validate_dbus_object(lv_uuid, lv_name)
+ # Remove the LV, if successful then remove from the model
+ rc, out, err = cmdhandler.lv_remove(lv_name, remove_options)
+ LvCommon.handle_execute(rc, out, err)
return '/'
@dbus.service.method(
@@ -443,24 +449,11 @@ class Lv(LvCommon):
@staticmethod
def _rename(lv_uuid, lv_name, new_name, rename_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(lv_uuid, lv_name)
-
- if dbo:
- # Rename the logical volume
- rc, out, err = cmdhandler.lv_rename(lv_name, new_name,
- rename_options)
- if rc == 0:
- cfg.load()
- else:
- # Need to work on error handling, need consistent
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'LV with uuid %s and name %s not present!' %
- (lv_uuid, lv_name))
+ LvCommon.validate_dbus_object(lv_uuid, lv_name)
+ # Rename the logical volume
+ rc, out, err = cmdhandler.lv_rename(lv_name, new_name,
+ rename_options)
+ LvCommon.handle_execute(rc, out, err)
return '/'
@dbus.service.method(
@@ -500,32 +493,21 @@ class Lv(LvCommon):
def _snap_shot(lv_uuid, lv_name, name, optional_size,
snapshot_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(lv_uuid, lv_name)
+ dbo = LvCommon.validate_dbus_object(lv_uuid, lv_name)
+ # If you specify a size you get a 'thick' snapshot even if
+ # it is a thin lv
+ if not dbo.IsThinVolume:
+ if optional_size == 0:
+ space = dbo.SizeBytes / 80
+ remainder = space % 512
+ optional_size = space + 512 - remainder
+
+ rc, out, err = cmdhandler.vg_lv_snapshot(
+ lv_name, snapshot_options, name, optional_size)
+ LvCommon.handle_execute(rc, out, err)
+ full_name = "%s/%s" % (dbo.vg_name_lookup(), name)
+ return cfg.om.get_object_path_by_lvm_id(full_name)
- if dbo:
- # If you specify a size you get a 'thick' snapshot even if
- # it is a thin lv
- if not dbo.IsThinVolume:
- if optional_size == 0:
- space = dbo.SizeBytes / 80
- remainder = space % 512
- optional_size = space + 512 - remainder
-
- rc, out, err = cmdhandler.vg_lv_snapshot(
- lv_name, snapshot_options, name, optional_size)
- if rc == 0:
- cfg.load()
- full_name = "%s/%s" % (dbo.vg_name_lookup(), name)
- return cfg.om.get_object_path_by_lvm_id(full_name)
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'LV with uuid %s and name %s not present!' %
- (lv_uuid, lv_name))
@dbus.service.method(
dbus_interface=LV_INTERFACE,
@@ -548,38 +530,24 @@ class Lv(LvCommon):
resize_options):
# Make sure we have a dbus object representing it
pv_dests = []
- dbo = cfg.om.get_object_by_uuid_lvm_id(lv_uuid, lv_name)
-
- if dbo:
- # If we have PVs, verify them
- if len(pv_dests_and_ranges):
- for pr in pv_dests_and_ranges:
- pv_dbus_obj = cfg.om.get_object_by_path(pr[0])
- if not pv_dbus_obj:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'PV Destination (%s) not found' % pr[0])
+ dbo = LvCommon.validate_dbus_object(lv_uuid, lv_name)
- pv_dests.append((pv_dbus_obj.lvm_id, pr[1], pr[2]))
+ # If we have PVs, verify them
+ if len(pv_dests_and_ranges):
+ for pr in pv_dests_and_ranges:
+ pv_dbus_obj = cfg.om.get_object_by_path(pr[0])
+ if not pv_dbus_obj:
+ raise dbus.exceptions.DBusException(
+ LV_INTERFACE,
+ 'PV Destination (%s) not found' % pr[0])
- size_change = new_size_bytes - dbo.SizeBytes
+ pv_dests.append((pv_dbus_obj.lvm_id, pr[1], pr[2]))
- rc, out, err = cmdhandler.lv_resize(dbo.lvm_id, size_change,
- pv_dests, resize_options)
-
- if rc == 0:
- # Refresh what's changed
- cfg.load()
- return "/"
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'LV with uuid %s and name %s not present!' %
- (lv_uuid, lv_name))
+ size_change = new_size_bytes - dbo.SizeBytes
+ rc, out, err = cmdhandler.lv_resize(dbo.lvm_id, size_change,
+ pv_dests, resize_options)
+ LvCommon.handle_execute(rc, out, err)
+ return "/"
@dbus.service.method(
dbus_interface=LV_INTERFACE,
@@ -612,23 +580,11 @@ class Lv(LvCommon):
def _lv_activate_deactivate(uuid, lv_name, activate, control_flags,
options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, lv_name)
-
- if dbo:
- rc, out, err = cmdhandler.activate_deactivate(
- 'lvchange', lv_name, activate, control_flags, options)
- if rc == 0:
- cfg.load()
- return '/'
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'LV with uuid %s and name %s not present!' %
- (uuid, lv_name))
+ LvCommon.validate_dbus_object(uuid, lv_name)
+ rc, out, err = cmdhandler.activate_deactivate(
+ 'lvchange', lv_name, activate, control_flags, options)
+ LvCommon.handle_execute(rc, out, err)
+ return '/'
@dbus.service.method(
dbus_interface=LV_INTERFACE,
@@ -660,25 +616,11 @@ class Lv(LvCommon):
@staticmethod
def _add_rm_tags(uuid, lv_name, tags_add, tags_del, tag_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(uuid, lv_name)
-
- if dbo:
-
- rc, out, err = cmdhandler.lv_tag(
- lv_name, tags_add, tags_del, tag_options)
- if rc == 0:
- cfg.load()
- return '/'
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
-
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'LV with uuid %s and name %s not present!' %
- (uuid, lv_name))
+ LvCommon.validate_dbus_object(uuid, lv_name)
+ rc, out, err = cmdhandler.lv_tag(
+ lv_name, tags_add, tags_del, tag_options)
+ LvCommon.handle_execute(rc, out, err)
+ return '/'
@dbus.service.method(
dbus_interface=LV_INTERFACE,
@@ -736,24 +678,13 @@ class LvThinPool(Lv):
@staticmethod
def _lv_create(lv_uuid, lv_name, name, size_bytes, create_options):
# Make sure we have a dbus object representing it
- dbo = cfg.om.get_object_by_uuid_lvm_id(lv_uuid, lv_name)
+ dbo = LvCommon.validate_dbus_object(lv_uuid, lv_name)
- if dbo:
- rc, out, err = cmdhandler.lv_lv_create(
- lv_name, create_options, name, size_bytes)
- if rc == 0:
- full_name = "%s/%s" % (dbo.vg_name_lookup(), name)
- cfg.load()
- return cfg.om.get_object_path_by_lvm_id(full_name)
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'LV with uuid %s and name %s not present!' %
- (lv_uuid, lv_name))
+ rc, out, err = cmdhandler.lv_lv_create(
+ lv_name, create_options, name, size_bytes)
+ LvCommon.handle_execute(rc, out, err)
+ full_name = "%s/%s" % (dbo.vg_name_lookup(), name)
+ return cfg.om.get_object_path_by_lvm_id(full_name)
@dbus.service.method(
dbus_interface=THIN_POOL_INTERFACE,
@@ -790,14 +721,13 @@ class LvCachePool(Lv):
@staticmethod
def _cache_lv(lv_uuid, lv_name, lv_object_path, cache_options):
-
# Make sure we have a dbus object representing cache pool
- dbo = cfg.om.get_object_by_uuid_lvm_id(lv_uuid, lv_name)
+ dbo = LvCommon.validate_dbus_object(lv_uuid, lv_name)
# Make sure we have dbus object representing lv to cache
lv_to_cache = cfg.om.get_object_by_path(lv_object_path)
- if dbo and lv_to_cache:
+ if lv_to_cache:
fcn = lv_to_cache.lv_full_name()
rc, out, err = cmdhandler.lv_cache_lv(
dbo.lv_full_name(), fcn, cache_options)
@@ -809,22 +739,14 @@ class LvCachePool(Lv):
cfg.load()
lv_converted = cfg.om.get_object_path_by_lvm_id(fcn)
-
else:
raise dbus.exceptions.DBusException(
LV_INTERFACE,
'Exit code %s, stderr = %s' % (str(rc), err))
else:
- msg = ""
- if not dbo:
- dbo += 'CachePool LV with uuid %s and name %s not present!' % \
- (lv_uuid, lv_name)
-
- if not lv_to_cache:
- dbo += 'LV to cache with object path %s not present!' % \
- (lv_object_path)
-
- raise dbus.exceptions.DBusException(LV_INTERFACE, msg)
+ raise dbus.exceptions.DBusException(
+ LV_INTERFACE, 'LV to cache with object path %s not present!' %
+ lv_object_path)
return lv_converted
@dbus.service.method(
@@ -855,31 +777,25 @@ class LvCacheLv(Lv):
@staticmethod
def _detach_lv(lv_uuid, lv_name, detach_options, destroy_cache):
# Make sure we have a dbus object representing cache pool
- dbo = cfg.om.get_object_by_uuid_lvm_id(lv_uuid, lv_name)
-
- if dbo:
+ dbo = LvCommon.validate_dbus_object(lv_uuid, lv_name)
- # Get current cache name
- cache_pool = cfg.om.get_object_by_path(dbo.CachePool)
+ # Get current cache name
+ cache_pool = cfg.om.get_object_by_path(dbo.CachePool)
- rc, out, err = cmdhandler.lv_detach_cache(
- dbo.lv_full_name(), detach_options, destroy_cache)
- if rc == 0:
- # The cache pool gets removed as hidden and put back to
- # visible, so lets delete
- mt_remove_dbus_objects((cache_pool, dbo))
- cfg.load()
+ rc, out, err = cmdhandler.lv_detach_cache(
+ dbo.lv_full_name(), detach_options, destroy_cache)
+ if rc == 0:
+ # The cache pool gets removed as hidden and put back to
+ # visible, so lets delete
+ mt_remove_dbus_objects((cache_pool, dbo))
+ cfg.load()
- uncached_lv_path = cfg.om.get_object_path_by_lvm_id(lv_name)
- else:
- raise dbus.exceptions.DBusException(
- LV_INTERFACE,
- 'Exit code %s, stderr = %s' % (str(rc), err))
+ uncached_lv_path = cfg.om.get_object_path_by_lvm_id(lv_name)
else:
raise dbus.exceptions.DBusException(
LV_INTERFACE,
- 'LV with uuid %s and name %s not present!' %
- (lv_uuid, lv_name))
+ 'Exit code %s, stderr = %s' % (str(rc), err))
+
return uncached_lv_path
@dbus.service.method(
1
0