lvm2-commits February 2020

lvm2-commits@lists.fedorahosted.org

3 participants
45 discussions

master - tests: move vgsplit writecache
by David Teigland 04 Feb '20

04 Feb '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c0de37ab1888a53cce970… Commit: c0de37ab1888a53cce97007c3f4fdfb6f85ab5bf Parent: c1ee6f0eef24a44cc02ec941f560bc17ac61b3d8 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Feb 4 10:20:19 2020 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Feb 4 10:20:19 2020 -0600 tests: move vgsplit writecache to a different file --- test/shell/vgsplit-cache.sh | 10 +--------- test/shell/writecache-split.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/test/shell/vgsplit-cache.sh b/test/shell/vgsplit-cache.sh index 200f0a9..eba85be 100644 --- a/test/shell/vgsplit-cache.sh +++ b/test/shell/vgsplit-cache.sh @@ -70,8 +70,7 @@ test 3 -eq "$(get vg_field $vg1 pv_count)" lvremove -y $vg -# dm-cache or dm-writecache with cachevol must not -# separated main LV and cachevol +# dm-cache with cachevol must not separated main LV and cachevol vgremove -ff $vg vgremove -ff $vg1 @@ -85,11 +84,4 @@ fail vgsplit $vg $vg1 "$dev2" fail vgsplit $vg $vg1 "$dev3" lvremove $vg/$lv1 -lvcreate -L6 -n $lv1 -an $vg "$dev2" -lvcreate -L6 -n $lv2 -an $vg "$dev3" -lvconvert -y --type writecache --cachevol $lv2 $vg/$lv1 -fail vgsplit $vg $vg1 "$dev2" -fail vgsplit $vg $vg1 "$dev3" -lvremove $vg/$lv1 - vgremove -ff $vg diff --git a/test/shell/writecache-split.sh b/test/shell/writecache-split.sh index 6a7a2cd..7168d02 100644 --- a/test/shell/writecache-split.sh +++ b/test/shell/writecache-split.sh @@ -126,3 +126,17 @@ vgchange -an $vg vgextend --restoremissing $vg "$dev3" vgremove -ff $vg + +# +# vgsplit should not separate cachevol from main lv +# + +vgcreate $vg "$dev1" "$dev2" "$dev3" "$dev4" +lvcreate -L6 -n $lv1 -an $vg "$dev2" +lvcreate -L6 -n $lv2 -an $vg "$dev3" +lvconvert -y --type writecache --cachevol $lv2 $vg/$lv1 +fail vgsplit $vg $vg1 "$dev2" +fail vgsplit $vg $vg1 "$dev3" +lvremove $vg/$lv1 + +vgremove -ff $vg

1 0

master - pvmove: prevent moving writecache device
by David Teigland 03 Feb '20

03 Feb '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c1ee6f0eef24a44cc02ec… Commit: c1ee6f0eef24a44cc02ec941f560bc17ac61b3d8 Parent: 379a7e1288a5e7a15cd2872c074b219992575b4d Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Feb 3 15:59:12 2020 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Feb 3 15:59:12 2020 -0600 pvmove: prevent moving writecache device --- tools/pvmove.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/pvmove.c b/tools/pvmove.c index 674decf..0419a3d 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -376,6 +376,11 @@ static struct logical_volume *_set_up_pvmove_lv(struct cmd_context *cmd, return NULL; } + if (lv_is_writecache_cachevol(lv)) { + log_error("Unable to pvmove device used for writecache."); + return NULL; + } + seg = first_seg(lv); if (!needs_exclusive) { /* Presence of exclusive LV decides whether pvmove must be also exclusive */ @@ -615,6 +620,11 @@ static int _pvmove_setup_single(struct cmd_context *cmd, log_error("Logical volume %s not found.", lv_name); return ECMD_FAILED; } + + if (lv_is_writecache(lv)) { + log_error("pvmove not allowed on LV using writecache."); + return ECMD_FAILED; + } } /*

1 0

master - vgsplit: handle cachevol
by David Teigland 03 Feb '20

03 Feb '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=379a7e1288a5e7a15cd28… Commit: 379a7e1288a5e7a15cd2872c074b219992575b4d Parent: adbb0a8d5bd0f735a756e32effcf0bddac0f6de7 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Feb 3 15:33:58 2020 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Feb 3 15:33:58 2020 -0600 vgsplit: handle cachevol attached to a cache or writecache LV. Ensure PVs in cachevol are moved with the main LV. --- test/shell/vgsplit-cache.sh | 26 ++++++++++++++++++++++++- tools/vgsplit.c | 46 ++++++++++++++++++++++++++++++--------------- 2 files changed, 56 insertions(+), 16 deletions(-) diff --git a/test/shell/vgsplit-cache.sh b/test/shell/vgsplit-cache.sh index 3bbcc2d..200f0a9 100644 --- a/test/shell/vgsplit-cache.sh +++ b/test/shell/vgsplit-cache.sh @@ -68,4 +68,28 @@ vgs $vg $vg1 test 4 -eq "$(get vg_field $vg pv_count)" test 3 -eq "$(get vg_field $vg1 pv_count)" -vgremove -ff $vg $vg1 +lvremove -y $vg + +# dm-cache or dm-writecache with cachevol must not +# separated main LV and cachevol + +vgremove -ff $vg +vgremove -ff $vg1 + +vgcreate $vg "$dev1" "$dev2" "$dev3" "$dev4" + +lvcreate -L6 -n $lv1 -an $vg "$dev2" +lvcreate -L6 -n $lv2 -an $vg "$dev3" +lvconvert -y --type cache --cachevol $lv2 $vg/$lv1 +fail vgsplit $vg $vg1 "$dev2" +fail vgsplit $vg $vg1 "$dev3" +lvremove $vg/$lv1 + +lvcreate -L6 -n $lv1 -an $vg "$dev2" +lvcreate -L6 -n $lv2 -an $vg "$dev3" +lvconvert -y --type writecache --cachevol $lv2 $vg/$lv1 +fail vgsplit $vg $vg1 "$dev2" +fail vgsplit $vg $vg1 "$dev3" +lvremove $vg/$lv1 + +vgremove -ff $vg diff --git a/tools/vgsplit.c b/tools/vgsplit.c index 1bcc308..3dc19ec 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -379,25 +379,25 @@ static int _move_cache(struct volume_group *vg_from, { int is_moving; struct dm_list *lvh, *lvht; - struct logical_volume *lv, *data, *meta, *orig; + struct logical_volume *lv, *data = NULL, *meta = NULL, *orig = NULL, *fast = NULL; struct lv_segment *seg, *cache_seg; dm_list_iterate_safe(lvh, lvht, &vg_from->lvs) { lv = dm_list_item(lvh, struct lv_list)->lv; seg = first_seg(lv); - if (!lv_is_cache(lv) && !lv_is_cache_pool(lv)) + if (!lv_is_cache(lv) && !lv_is_writecache(lv) && !lv_is_cache_pool(lv) && !lv_is_cache_vol(lv)) continue; - if (lv_is_cache(lv) && lv_is_cache_vol(seg->pool_lv)) { - log_error("Cannot split while LV %s has cache attached.", display_lvname(lv)); - return 0; - } - if (lv_is_cache(lv)) { orig = seg_lv(seg, 0); seg = first_seg(seg->pool_lv); - } else { /* lv_is_cache_pool */ + + } else if (lv_is_writecache(lv)) { + orig = seg_lv(seg, 0); + seg = first_seg(seg->writecache); + + } else if (lv_is_cache_pool(lv) || lv_is_cache_vol(lv)) { orig = NULL; if (!dm_list_empty(&seg->lv->segs_using_this_lv)) { if (!(cache_seg = get_only_segment_using_this_lv(seg->lv))) @@ -406,16 +406,26 @@ static int _move_cache(struct volume_group *vg_from, } } - data = seg_lv(seg, 0); - meta = seg->metadata_lv; + if (lv_is_cache_vol(lv)) { + fast = lv; + } else { + data = seg_lv(seg, 0); + meta = seg->metadata_lv; + } - if ((orig && !lv_is_on_pvs(orig, &vg_to->pvs)) && - !lv_is_on_pvs(data, &vg_to->pvs) && - !lv_is_on_pvs(meta, &vg_to->pvs)) + if (data && meta) { + if ((orig && !lv_is_on_pvs(orig, &vg_to->pvs)) && + !lv_is_on_pvs(data, &vg_to->pvs) && + !lv_is_on_pvs(meta, &vg_to->pvs)) + continue; + } + + if (fast && orig && + !lv_is_on_pvs(orig, &vg_to->pvs) && !lv_is_on_pvs(fast, &vg_to->pvs)) continue; /* Ensure all components are coming along */ - if (orig) { + if (orig && data && meta) { is_moving = _lv_is_in_vg(vg_to, orig); if (_lv_is_in_vg(vg_to, data) != is_moving) { @@ -431,11 +441,17 @@ static int _move_cache(struct volume_group *vg_from, display_lvname(orig), display_lvname(meta)); return 0; } - } else if (_lv_is_in_vg(vg_to, data) != _lv_is_in_vg(vg_to, meta)) { + + } else if (data && meta && (_lv_is_in_vg(vg_to, data) != _lv_is_in_vg(vg_to, meta))) { log_error("Cannot split cache pool data %s and its metadata %s " "into separate VGs.", display_lvname(data), display_lvname(meta)); return 0; + + } else if (orig && fast && (_lv_is_in_vg(vg_to, orig) != _lv_is_in_vg(vg_to, fast))) { + log_error("Cannot split cache origin %s and its cachevol %s into separate VGs.", + display_lvname(orig), display_lvname(fast)); + return 0; } if (!_move_one_lv(vg_from, vg_to, lvh, &lvht))

1 0

master - writecache: reject invalid high/low watermark setting
by David Teigland 03 Feb '20

03 Feb '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=adbb0a8d5bd0f735a756e… Commit: adbb0a8d5bd0f735a756e32effcf0bddac0f6de7 Parent: 64a82a1c79a4aaef5359150f960932aee4df1982 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Feb 3 11:33:30 2020 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Feb 3 11:33:30 2020 -0600 writecache: reject invalid high/low watermark setting --- tools/lvconvert.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index d0d277b..f6a329b 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -5504,6 +5504,12 @@ static int _get_writecache_settings(struct cmd_context *cmd, struct writecache_s } } + if (settings->high_watermark_set && settings->low_watermark_set && + (settings->high_watermark <= settings->low_watermark)) { + log_error("High watermark must be greater than or equal to low watermark."); + return 0; + } + return 1; }

1 0

master - man: lvmcache writecache watermark percent
by David Teigland 03 Feb '20

03 Feb '20

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=64a82a1c79a4aaef53591… Commit: 64a82a1c79a4aaef5359150f960932aee4df1982 Parent: bddbbcb98ca135b91aa688c04c1c8be7d76a2bd1 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Feb 3 11:21:24 2020 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Feb 3 11:21:24 2020 -0600 man: lvmcache writecache watermark percent --- man/lvmcache.7_main | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/man/lvmcache.7_main b/man/lvmcache.7_main index fb91be8..d8e8dc7 100644 --- a/man/lvmcache.7_main +++ b/man/lvmcache.7_main @@ -221,14 +221,14 @@ $ lvconvert --type writecache --cachevol fast \\ Tunable options are: .IP \[bu] 2 -high_watermark = <count> +high_watermark = <percent> -Start writeback when the number of used blocks reach this watermark +Start writeback when the writecache usage reaches this percent (0-100). .IP \[bu] 2 -low_watermark = <count> +low_watermark = <percent> -Stop writeback when the number of used blocks drops below this watermark +Stop writeback when the writecache usage reaches this percent (0-100). .IP \[bu] 2 writeback_jobs = <count>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits February 2020