diff options
author | David Teigland <teigland@redhat.com> | 2018-07-23 12:28:48 -0500 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2018-07-23 12:28:48 -0500 |
commit | 778ce8d80830a60d258b419720be3e45a7ee9f0b (patch) | |
tree | 75e50585062126e46858f506e8c937d2e4cc6e3e | |
parent | 8a66c81b9beb87f2f381e7e2aa76e4e54fd19934 (diff) | |
download | lvm2-778ce8d80830a60d258b419720be3e45a7ee9f0b.tar.gz |
lvconvert: improve text about splitmirrors
in messages and man page.
-rw-r--r-- | lib/metadata/raid_manip.c | 4 | ||||
-rw-r--r-- | tools/args.h | 14 | ||||
-rw-r--r-- | tools/command-lines.in | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 92e01a270..931b411e1 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -3553,7 +3553,7 @@ int lv_raid_merge(struct logical_volume *image_lv) struct volume_group *vg = image_lv->vg; 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)); return 0; } @@ -3562,7 +3562,7 @@ int lv_raid_merge(struct logical_volume *image_lv) return_0; 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)); return 0; } diff --git a/tools/args.h b/tools/args.h index 9e83b125a..adca84b2e 100644 --- a/tools/args.h +++ b/tools/args.h @@ -618,7 +618,9 @@ arg(splitcache_ARG, '\0', "splitcache", 0, 0, 0, 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") + "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, "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, "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") + "remain detached. This is a temporary state that allows the read-only\n" + "detached image to be merged efficiently back into the raid1 LV later.\n" + "Only the regions with changed data are resynchronized during merge.\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? */ arg(trustcache_ARG, '\0', "trustcache", 0, 0, 0, diff --git a/tools/command-lines.in b/tools/command-lines.in index d6cd04e5b..1511098f6 100644 --- a/tools/command-lines.in +++ b/tools/command-lines.in @@ -408,7 +408,7 @@ 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. +DESC: Split images from a raid1 LV and track changes to origin for later merge. RULE: all not lv_is_locked lv_is_pvmove lvconvert --mergemirrors LV_linear_raid|VG|Tag ... |