diff options
| author | David Teigland <teigland@redhat.com> | 2016-12-09 14:39:57 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2016-12-19 15:40:28 -0600 |
| commit | a8c3979252933fb3e0e94abf1ef62401ec85ed32 (patch) | |
| tree | ca5cc35dae6e6a10eccc61e090383f99497b9eb7 /tools/command-lines.in | |
| parent | 94fab0ec871705db060ca3416a81f750e4bfb037 (diff) | |
| download | lvm2-a8c3979252933fb3e0e94abf1ef62401ec85ed32.tar.gz | |
lvconvert: use command defs for mergemirrors
and route the generic --merge to one of the
specific merge functions
Diffstat (limited to 'tools/command-lines.in')
| -rw-r--r-- | tools/command-lines.in | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/tools/command-lines.in b/tools/command-lines.in index f67667bc0..13e93bca8 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,21 @@ 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 thin LV into its origin LV. -DESC: Merge COW snapshot LV into its origin. +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 --- @@ -526,7 +516,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 @@ -887,7 +877,7 @@ DESC: (infers --type thin). --- lvconvert --mergethin LV_thin ... -OO: --background, --interval Number, OO_LVCONVERT +OO: 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 |