shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

metadata: import device name hint from metadata

Browse Source 
Start by using it in a comment for a missing PV.
This commit is contained in:
David Teigland 2019-09-04 14:13:14 -05:00
parent fcfabb26a5
commit 3a8e41a67b
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/format_text/import_vsn1.c
View File

@ -184,6 +184,7 @@ static int _read_pv(struct cmd_context *cmd,
struct physical_volume *pv; struct physical_volume *pv;
struct pv_list *pvl; struct pv_list *pvl;
const struct dm_config_value *cv; const struct dm_config_value *cv;
const char *device_hint;
uint64_t size, ba_start; uint64_t size, ba_start;
if (!(pvl = dm_pool_zalloc(mem, sizeof(*pvl))) || if (!(pvl = dm_pool_zalloc(mem, sizeof(*pvl))) ||
@ -228,6 +229,11 @@ static int _read_pv(struct cmd_context *cmd,
return 0; return 0;
} }
if (dm_config_get_str(pvn, "device", &device_hint)) {
if (!(pv->device_hint = dm_pool_strdup(mem, device_hint)))
log_error("Failed to allocate memory for device hint in read_pv.");
}
if (!_read_uint64(pvn, "pe_start", &pv->pe_start)) { if (!_read_uint64(pvn, "pe_start", &pv->pe_start)) {
log_error("Couldn't read extent start value (pe_start) " log_error("Couldn't read extent start value (pe_start) "
"for physical volume."); "for physical volume.");

5
lib/metadata/metadata.c
View File

@ -4971,7 +4971,10 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, const
if (!pvl->pv->dev) { if (!pvl->pv->dev) {
/* The obvious and common case of a missing device. */ /* The obvious and common case of a missing device. */
log_warn("WARNING: VG %s is missing PV %s.", vg_name, uuidstr); if (pvl->pv->device_hint)
log_warn("WARNING: VG %s is missing PV %s (last written to %s).", vg_name, uuidstr, pvl->pv->device_hint);
else
log_warn("WARNING: VG %s is missing PV %s.", vg_name, uuidstr);
missing_pv_dev++; missing_pv_dev++;
} else if (pvl->pv->status & MISSING_PV) { } else if (pvl->pv->status & MISSING_PV) {

1
lib/metadata/pv.h
View File

@ -26,6 +26,7 @@ struct physical_volume {
struct id id; struct id id;
struct id old_id; /* Set during pvchange -u. */ struct id old_id; /* Set during pvchange -u. */
struct device *dev; struct device *dev;
const char *device_hint; /* primary name last time metadata was written */
const struct format_type *fmt; const struct format_type *fmt;
struct format_instance *fid; struct format_instance *fid;