a85c03bfb8
- Fix LV activation issues (boo#1152378, rh#1727270) + bug-1152378-md-component-detection-for-differing-PV-and-device-s.patch + bug-1152378-pvscan-fix-PV-online-when-device-has-a-different-siz.patch OBS-URL: https://build.opensuse.org/request/show/734667 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=254
64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
From f17353e3e604ad2d80bcd77ea0a6a93472e6b5bd Mon Sep 17 00:00:00 2001
|
|
From: David Teigland <teigland@redhat.com>
|
|
Date: Tue, 9 Jul 2019 13:32:41 -0500
|
|
Subject: [PATCH] md component detection for differing PV and device sizes
|
|
|
|
This check was mistakenly removed when shifting code in commit
|
|
"separate code for setting devices from metadata parsing".
|
|
|
|
Put it back with some new conditions.
|
|
---
|
|
lib/metadata/metadata.c | 26 ++++++++++++++++++++++++--
|
|
1 file changed, 24 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
|
|
index 121cf4f..f19df3d 100644
|
|
--- a/lib/metadata/metadata.c
|
|
+++ b/lib/metadata/metadata.c
|
|
@@ -3504,18 +3504,40 @@ static void _set_pv_device(struct format_instance *fid,
|
|
struct physical_volume *pv)
|
|
{
|
|
char buffer[64] __attribute__((aligned(8)));
|
|
+ struct cmd_context *cmd = fid->fmt->cmd;
|
|
+ struct device *dev;
|
|
uint64_t size;
|
|
|
|
- if (!(pv->dev = lvmcache_device_from_pvid(fid->fmt->cmd, &pv->id, &pv->label_sector))) {
|
|
+ if (!(dev = lvmcache_device_from_pvid(cmd, &pv->id, &pv->label_sector))) {
|
|
if (!id_write_format(&pv->id, buffer, sizeof(buffer)))
|
|
buffer[0] = '\0';
|
|
|
|
- if (fid->fmt->cmd && !fid->fmt->cmd->pvscan_cache_single)
|
|
+ if (cmd && !cmd->pvscan_cache_single)
|
|
log_warn("WARNING: Couldn't find device with uuid %s.", buffer);
|
|
else
|
|
log_debug_metadata("Couldn't find device with uuid %s.", buffer);
|
|
}
|
|
|
|
+ /*
|
|
+ * If the device and PV are not the size, it's a clue that we might
|
|
+ * be reading an MD component (but not necessarily). Skip this check:
|
|
+ * . if md component detection is disabled
|
|
+ * . if we are already doing full a md check in label scan
|
|
+ * . if md_component_checks is auto, not none (full means use_full_md_check is set)
|
|
+ */
|
|
+ if (dev && (pv->size != dev->size) && cmd &&
|
|
+ cmd->md_component_detection &&
|
|
+ !cmd->use_full_md_check &&
|
|
+ !strcmp(cmd->md_component_checks, "auto")) {
|
|
+ if (dev_is_md_component(dev, NULL, 1)) {
|
|
+ log_warn("WARNING: device %s is an md component, not setting device for PV.",
|
|
+ dev_name(dev));
|
|
+ dev = NULL;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ pv->dev = dev;
|
|
+
|
|
/*
|
|
* A previous command wrote the VG while this dev was missing, so
|
|
* the MISSING flag was included in the PV.
|
|
--
|
|
2.23.0
|
|
|