shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

lvconvert: improve text about splitmirrors

Browse Source 
in messages and man page.
This commit is contained in:
David Teigland 2018-07-23 12:28:48 -05:00
parent 8a66c81b9b
commit 778ce8d808
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/metadata/raid_manip.c
View File

@ -3553,7 +3553,7 @@ int lv_raid_merge(struct logical_volume *image_lv)
struct volume_group *vg = image_lv->vg; struct volume_group *vg = image_lv->vg;
if (image_lv->status & LVM_WRITE) { if (image_lv->status & LVM_WRITE) {
log_error("%s is not read-only - refusing to merge.", log_error("%s cannot be merged because --trackchanges was not used.",
display_lvname(image_lv)); display_lvname(image_lv));
return 0; return 0;
} }
@ -3562,7 +3562,7 @@ int lv_raid_merge(struct logical_volume *image_lv)
return_0; return_0;
if (!(p = strstr(lv_name, "_rimage_"))) { if (!(p = strstr(lv_name, "_rimage_"))) {
log_error("Unable to merge non-mirror image %s.", log_error("Unable to merge non-raid image %s.",
display_lvname(image_lv)); display_lvname(image_lv));
return 0; return 0;
} }

14
tools/args.h
View File

@ -618,7 +618,9 @@ arg(splitcache_ARG, '\0', "splitcache", 0, 0, 0,
arg(splitmirrors_ARG, '\0', "splitmirrors", number_VAL, 0, 0, arg(splitmirrors_ARG, '\0', "splitmirrors", number_VAL, 0, 0,
"Splits the specified number of images from a raid1 or mirror LV\n" "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" "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") "changes to the raid1 LV are tracked while the split LV remains detached.\n"
"If --name is specified, then the images are permanently split from the\n"
"original LV and changes are not tracked.\n")
arg(splitsnapshot_ARG, '\0', "splitsnapshot", 0, 0, 0, arg(splitsnapshot_ARG, '\0', "splitsnapshot", 0, 0, 0,
"Separates a COW snapshot from its origin LV. The LV that is split off\n" "Separates a COW snapshot from its origin LV. The LV that is split off\n"
@ -697,10 +699,12 @@ arg(thinpool_ARG, '\0', "thinpool", lv_VAL, 0, 0,
arg(trackchanges_ARG, '\0', "trackchanges", 0, 0, 0, arg(trackchanges_ARG, '\0', "trackchanges", 0, 0, 0,
"Can be used with --splitmirrors on a raid1 LV. This causes\n" "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" "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" "remain detached. This is a temporary state that allows the read-only\n"
"merged efficiently back into the raid1 LV later. Only the regions with\n" "detached image to be merged efficiently back into the raid1 LV later.\n"
"changed data are resynchronized during merge. (This option only applies\n" "Only the regions with changed data are resynchronized during merge.\n"
"when using the raid1 LV type.)\n") "While a raid1 LV is tracking changes, operations on it are limited to\n"
"merging the split image (see --mergemirrors) or permanently splitting\n"
"the image (see --splitmirrors with --name.\n")
/* TODO: hide this? */ /* TODO: hide this? */
arg(trustcache_ARG, '\0', "trustcache", 0, 0, 0, arg(trustcache_ARG, '\0', "trustcache", 0, 0, 0,

2
tools/command-lines.in
View File

@ -408,7 +408,7 @@ lvconvert --splitmirrors Number --trackchanges LV_raid1_cache
OO: OO_LVCONVERT OO: OO_LVCONVERT
OP: PV ... OP: PV ...
ID: lvconvert_split_mirror_images ID: lvconvert_split_mirror_images
DESC: Split images from a raid1 LV and track changes to origin. DESC: Split images from a raid1 LV and track changes to origin for later merge.
RULE: all not lv_is_locked lv_is_pvmove RULE: all not lv_is_locked lv_is_pvmove
lvconvert --mergemirrors LV_linear_raid|VG|Tag ... lvconvert --mergemirrors LV_linear_raid|VG|Tag ...