MSVSphere Packaging Team
3 months ago
parent
216ddc92c7
commit
20fe1eef69
GPG Key ID:
B2B0B9F29E528FE8
@ -1 +1 @@
|
|||||||
SOURCES/LVM2.2.03.27.tgz
|
SOURCES/LVM2.2.03.28.tgz
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
8e10ec429efd8fec5577783d2b2b19329f7ebe54 SOURCES/LVM2.2.03.27.tgz
|
762d6924860a01973ca61543208d97ef385be1f6 SOURCES/LVM2.2.03.28.tgz
|
||||||
|
|||||||
@ -0,0 +1,30 @@
|
|||||||
|
From f006e040090f9f3466c5e789157903607447a08e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Rajnoha <prajnoha@redhat.com>
|
||||||
|
Date: Tue, 5 Nov 2024 14:48:23 +0100
|
||||||
|
Subject: [PATCH 3/7] lv_manip: use the same param validation for RAID 0 as for
|
||||||
|
RAID 1/4/5/6
|
||||||
|
|
||||||
|
This actually reverts commit 83ae675f8df53010c984b78d0318d0d92d5ac83a.
|
||||||
|
|
||||||
|
(cherry picked from commit 1d8a4c4817895f45a5fee00ccf721b351e5a4668)
|
||||||
|
---
|
||||||
|
lib/metadata/lv_manip.c | 3 ---
|
||||||
|
1 file changed, 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
|
||||||
|
index e14947357..15a7f3c9a 100644
|
||||||
|
--- a/lib/metadata/lv_manip.c
|
||||||
|
+++ b/lib/metadata/lv_manip.c
|
||||||
|
@@ -5465,9 +5465,6 @@ static int _lvresize_adjust_extents(struct logical_volume *lv,
|
||||||
|
/* FIXME Warn if command line values are being overridden? */
|
||||||
|
lp->stripes = seg_last->area_count / seg_mirrors;
|
||||||
|
lp->stripe_size = seg_last->stripe_size;
|
||||||
|
- } else if (seg_is_raid0(seg_last)) {
|
||||||
|
- lp->stripes = seg_last->area_count;
|
||||||
|
- lp->stripe_size = seg_last->stripe_size;
|
||||||
|
} else {
|
||||||
|
/* If extending, find stripes, stripesize & size of last segment */
|
||||||
|
/* FIXME Don't assume mirror seg will always be AREA_LV */
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
From a6b5d4dad0e71c2774edb29bb087c84bfac53210 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Rajnoha <prajnoha@redhat.com>
|
||||||
|
Date: Tue, 5 Nov 2024 14:20:59 +0100
|
||||||
|
Subject: [PATCH 4/7] tests: remove superfluous -a option for df used in
|
||||||
|
lvresize-xfs.sh
|
||||||
|
|
||||||
|
The df -a looks at whole system and it returns an error code in case
|
||||||
|
there's an inaccessible fs which is not even part of the testing environment.
|
||||||
|
The -a for df is not actually needed here in the lvresize-xfs test, so remove it.
|
||||||
|
|
||||||
|
(cherry picked from commit a2ca20dad98f4d7389d449672b3ff0b16858f02b)
|
||||||
|
---
|
||||||
|
test/shell/lvresize-xfs.sh | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/test/shell/lvresize-xfs.sh b/test/shell/lvresize-xfs.sh
|
||||||
|
index da204dac6..87fbf6f9d 100644
|
||||||
|
--- a/test/shell/lvresize-xfs.sh
|
||||||
|
+++ b/test/shell/lvresize-xfs.sh
|
||||||
|
@@ -113,7 +113,7 @@ dd if=/dev/zero of="$mount_dir_space/zeros1" bs=1M count=20 oflag=direct
|
||||||
|
# succeeds, then the xfs extend fails because it cannot be done unmounted
|
||||||
|
not lvextend --fs resize --fsmode offline -L+20M $vg/$lv
|
||||||
|
check lv_field $vg/$lv lv_size "320.00m"
|
||||||
|
-df -a | tee dfa
|
||||||
|
+df | tee dfa
|
||||||
|
grep "$mount_dir_space" dfa
|
||||||
|
df --output=size "$mount_dir_space" |tee df2
|
||||||
|
# fs not extended so fs size not changed
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
From 38177186f79c44ba62aca80bdfe1b72ad2d6e84c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Rajnoha <prajnoha@redhat.com>
|
||||||
|
Date: Wed, 6 Nov 2024 10:39:27 +0100
|
||||||
|
Subject: [PATCH 5/7] WHATS_NEW: update
|
||||||
|
|
||||||
|
(cherry picked from commit 44a04b71f8e8ff730b5538c4b6323041cf904ece)
|
||||||
|
---
|
||||||
|
WHATS_NEW | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/WHATS_NEW b/WHATS_NEW
|
||||||
|
index 85ffe0d0c..d07a1eaeb 100644
|
||||||
|
--- a/WHATS_NEW
|
||||||
|
+++ b/WHATS_NEW
|
||||||
|
@@ -1,3 +1,8 @@
|
||||||
|
+Version 2.03.29 -
|
||||||
|
+==================
|
||||||
|
+ Fix segfault/VG write error for raid LV lvextend -i|--stripes -I|--stripesize.
|
||||||
|
+ Revert ignore -i|--stripes, -I|--stripesize for lvextend on raid0 LV (2.03.27).
|
||||||
|
+
|
||||||
|
Version 2.03.28 - 04th November 2024
|
||||||
|
====================================
|
||||||
|
Use radix_tree to lookup for UUID within committed metadata.
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
From 9a735a3998b96adf8259759b4c228c308327a54d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Kabelac <zkabelac@redhat.com>
|
||||||
|
Date: Fri, 8 Nov 2024 16:12:30 +0100
|
||||||
|
Subject: [PATCH 6/7] vdo: fix input units for minimim_io_size
|
||||||
|
|
||||||
|
When specifying minimum_io_size with --vdosettings,
|
||||||
|
command assumed wrong unit (sectors).
|
||||||
|
|
||||||
|
So '--vdosettings minimum_io_size=512|4096' resulted into
|
||||||
|
an error that only 512 or 4096 values are allowed, but
|
||||||
|
at the same time values 1 or 8 were accepted.
|
||||||
|
|
||||||
|
So fix by converting any number >= 512 to 'sectors' and
|
||||||
|
keep input of 1 or 8 still valid if anyone has been using
|
||||||
|
this before.
|
||||||
|
|
||||||
|
So now we take 512 or 4096 and still also 1 or 8 with the
|
||||||
|
same effect.
|
||||||
|
|
||||||
|
Also correct the 'error' message when invalid minimum_io_size
|
||||||
|
is specified.
|
||||||
|
|
||||||
|
(cherry picked from commit 158d3243b638f50f62c60128168c21840787f1ab)
|
||||||
|
---
|
||||||
|
device_mapper/vdo/vdo_target.c | 2 +-
|
||||||
|
tools/toollib.c | 4 ++++
|
||||||
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/device_mapper/vdo/vdo_target.c b/device_mapper/vdo/vdo_target.c
|
||||||
|
index a8a753e39..cdd3dbe6d 100644
|
||||||
|
--- a/device_mapper/vdo/vdo_target.c
|
||||||
|
+++ b/device_mapper/vdo/vdo_target.c
|
||||||
|
@@ -28,7 +28,7 @@ bool dm_vdo_validate_target_params(const struct dm_vdo_target_params *vtp,
|
||||||
|
if ((vtp->minimum_io_size != (512 >> SECTOR_SHIFT)) &&
|
||||||
|
(vtp->minimum_io_size != (4096 >> SECTOR_SHIFT))) {
|
||||||
|
log_error("VDO minimum io size %u is unsupported [512, 4096].",
|
||||||
|
- vtp->minimum_io_size);
|
||||||
|
+ (vtp->minimum_io_size << SECTOR_SHIFT));
|
||||||
|
valid = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/tools/toollib.c b/tools/toollib.c
|
||||||
|
index dcb6c8f4f..f854d17c5 100644
|
||||||
|
--- a/tools/toollib.c
|
||||||
|
+++ b/tools/toollib.c
|
||||||
|
@@ -1372,6 +1372,10 @@ int get_vdo_settings(struct cmd_context *cmd,
|
||||||
|
u |= VDO_CHANGE_ONLINE;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* store size in sector units */
|
||||||
|
+ if (vtp->minimum_io_size >= 512)
|
||||||
|
+ vtp->minimum_io_size >>= SECTOR_SHIFT;
|
||||||
|
+
|
||||||
|
// validation of updated VDO option
|
||||||
|
if (!dm_vdo_validate_target_params(vtp, 0 /* vdo_size */))
|
||||||
|
goto_out;
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
From cd28cd0158b3e8f618472b2e2d50d95f6f20a2ba Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Kabelac <zkabelac@redhat.com>
|
||||||
|
Date: Fri, 8 Nov 2024 16:38:29 +0100
|
||||||
|
Subject: [PATCH 7/7] tests: check vdo minimum_io_size
|
||||||
|
|
||||||
|
(cherry picked from commit dcac774f0982470b29bf04f27b6394fe27c4df71)
|
||||||
|
---
|
||||||
|
test/shell/lvcreate-vdo.sh | 11 +++++++++++
|
||||||
|
1 file changed, 11 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/test/shell/lvcreate-vdo.sh b/test/shell/lvcreate-vdo.sh
|
||||||
|
index b24801375..87d6f98a1 100644
|
||||||
|
--- a/test/shell/lvcreate-vdo.sh
|
||||||
|
+++ b/test/shell/lvcreate-vdo.sh
|
||||||
|
@@ -89,4 +89,15 @@ check lv_field $vg/$lv1 vdo_ack_threads "4"
|
||||||
|
lvs -a $vg
|
||||||
|
lvremove -ff $vg
|
||||||
|
|
||||||
|
+lvcreate --type vdo --vdosettings 'minimum_io_size=512' -L10G -V1T -ky -n $lv1 $vg
|
||||||
|
+check lv_field $vg/$lv1 vdo_minimum_io_size "512b"
|
||||||
|
+lvremove -ff $vg
|
||||||
|
+
|
||||||
|
+lvcreate --type vdo --vdosettings 'minimum_io_size=4096' -L10G -V1T -ky -n $lv1 $vg
|
||||||
|
+check lv_field $vg/$lv1 vdo_minimum_io_size "4.00k"
|
||||||
|
+lvremove -ff $vg
|
||||||
|
+
|
||||||
|
+# only 512 or 4096 are valid values (and eventually 1 or 8 sectors)
|
||||||
|
+not lvcreate --type vdo --vdosettings 'minimum_io_size=8000' -L10G -V1T -ky -n $lv1 $vg
|
||||||
|
+
|
||||||
|
vgremove -ff $vg
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
@ -0,0 +1,62 @@
|
|||||||
|
From 6e34a9e3959b659ac633d862af74c4c387a4d5ad Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Kabelac <zkabelac@redhat.com>
|
||||||
|
Date: Wed, 13 Nov 2024 12:52:18 +0100
|
||||||
|
Subject: [PATCH 1/3] raid: fix name rotation
|
||||||
|
|
||||||
|
Since we now keep lv names valid all the time (as they are part
|
||||||
|
of radix_tree) - there is a problem with this renaming code, that
|
||||||
|
for a moment used duplicated name in vg struct.
|
||||||
|
|
||||||
|
Fix it by interating LVs backwared - which avoids breaking consitency
|
||||||
|
and also actually makes code more simple.
|
||||||
|
|
||||||
|
(cherry picked from commit c2f41c1a59351772b78f2328edd61f996cc37c3b)
|
||||||
|
---
|
||||||
|
lib/metadata/raid_manip.c | 23 ++++++++---------------
|
||||||
|
1 file changed, 8 insertions(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
|
||||||
|
index 60ae897ef..8abad8be7 100644
|
||||||
|
--- a/lib/metadata/raid_manip.c
|
||||||
|
+++ b/lib/metadata/raid_manip.c
|
||||||
|
@@ -2637,6 +2637,7 @@ static int _raid_add_images_without_commit(struct logical_volume *lv,
|
||||||
|
struct lv_list *lvl;
|
||||||
|
struct lv_segment_area *new_areas;
|
||||||
|
struct segment_type *segtype;
|
||||||
|
+ const char *lv_name, *lv_name_tmp;
|
||||||
|
|
||||||
|
if (lv_is_not_synced(lv)) {
|
||||||
|
log_error("Can't add image to out-of-sync RAID LV:"
|
||||||
|
@@ -2704,22 +2705,14 @@ static int _raid_add_images_without_commit(struct logical_volume *lv,
|
||||||
|
* commits the LVM metadata before clearing the LVs.
|
||||||
|
*/
|
||||||
|
if (seg_is_linear(seg)) {
|
||||||
|
- struct dm_list *l;
|
||||||
|
- struct lv_list *lvl_tmp;
|
||||||
|
- const char *lv_name;
|
||||||
|
-
|
||||||
|
- dm_list_iterate(l, &data_lvs) {
|
||||||
|
- if (l == dm_list_last(&data_lvs)) {
|
||||||
|
- lvl = dm_list_item(l, struct lv_list);
|
||||||
|
- if (!(lv_name = _generate_raid_name(lv, "rimage", count)) ||
|
||||||
|
- !lv_set_name(lvl->lv, lv_name))
|
||||||
|
- return_0;
|
||||||
|
- continue;
|
||||||
|
- }
|
||||||
|
- lvl = dm_list_item(l, struct lv_list);
|
||||||
|
- lvl_tmp = dm_list_item(l->n, struct lv_list);
|
||||||
|
- if (!lv_set_name(lvl->lv, lvl_tmp->lv->name))
|
||||||
|
+ if (!(lv_name = _generate_raid_name(lv, "rimage", count)))
|
||||||
|
+ return_0;
|
||||||
|
+
|
||||||
|
+ dm_list_iterate_back_items(lvl, &data_lvs) {
|
||||||
|
+ lv_name_tmp = lvl->lv->name;
|
||||||
|
+ if (!lv_set_name(lvl->lv, lv_name))
|
||||||
|
return_0;
|
||||||
|
+ lv_name = lv_name_tmp; /* rotate name in list */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
From d6bdd28fca7fd770e6038a406ebb34b49ec54d5c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Kabelac <zkabelac@redhat.com>
|
||||||
|
Date: Wed, 13 Nov 2024 12:59:27 +0100
|
||||||
|
Subject: [PATCH 2/3] tests: check _tdata conversion to raid1
|
||||||
|
|
||||||
|
(cherry picked from commit 7b9bdcb4d4aef7f0a079e2278869f19aa7fb7c83)
|
||||||
|
---
|
||||||
|
test/shell/lvconvert-thin-raid.sh | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/test/shell/lvconvert-thin-raid.sh b/test/shell/lvconvert-thin-raid.sh
|
||||||
|
index c021e3b77..7b0e4a5c9 100644
|
||||||
|
--- a/test/shell/lvconvert-thin-raid.sh
|
||||||
|
+++ b/test/shell/lvconvert-thin-raid.sh
|
||||||
|
@@ -58,4 +58,10 @@ lvconvert --merge $vg/${lv1}_tmeta_rimage_1
|
||||||
|
lvconvert -y -m +1 $vg/${lv1}_tdata "$dev2"
|
||||||
|
lvconvert -y -m +1 $vg/${lv1}_tmeta "$dev1"
|
||||||
|
|
||||||
|
+lvremove -f $vg
|
||||||
|
+
|
||||||
|
+lvcreate -L10M -T $vg/pool
|
||||||
|
+lvconvert -y --type raid1 -m2 $vg/pool_tdata
|
||||||
|
+lvconvert -y --type raid1 -m2 $vg/pool_tmeta
|
||||||
|
+
|
||||||
|
vgremove -ff $vg
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
From babe041d8b75ab4b09714d7eadadc3175a9a4299 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Kabelac <zkabelac@redhat.com>
|
||||||
|
Date: Wed, 13 Nov 2024 13:06:15 +0100
|
||||||
|
Subject: [PATCH 3/3] WHATS_NEW: update
|
||||||
|
|
||||||
|
(cherry picked from commit 473e93fbfff513f849e76eba919c44aa07608c30)
|
||||||
|
---
|
||||||
|
WHATS_NEW | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/WHATS_NEW b/WHATS_NEW
|
||||||
|
index d07a1eaeb..bea47f154 100644
|
||||||
|
--- a/WHATS_NEW
|
||||||
|
+++ b/WHATS_NEW
|
||||||
|
@@ -1,5 +1,6 @@
|
||||||
|
Version 2.03.29 -
|
||||||
|
==================
|
||||||
|
+ Fix renaming of raid sub LVs when converting a volume to raid (2.03.28).
|
||||||
|
Fix segfault/VG write error for raid LV lvextend -i|--stripes -I|--stripesize.
|
||||||
|
Revert ignore -i|--stripes, -I|--stripesize for lvextend on raid0 LV (2.03.27).
|
||||||
|
|
||||||
|
--
|
||||||
|
2.47.0
|
||||||
|
|
||||||
Loading…
Reference in new issue