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

Look up missing PVs by uuid not dev_name in _pvs_single to avoid invalid stat.

Browse Source 
Make find_pv_in_vg_by_uuid() return same type as related functions.
This commit is contained in:
Alasdair Kergon 2010-03-16 15:30:48 +00:00
parent b19719801b
commit d61f611adc
5 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WHATS_NEW
View File

@ -1,5 +1,7 @@
Version 2.02.63 -
================================
Look up missing PVs by uuid not dev_name in _pvs_single to avoid invalid stat.
Make find_pv_in_vg_by_uuid() return same type as related functions.
Introduce is_missing_pv().
Fix clvmd Makefile to not overwrite LIBS from template definition.

4
lib/metadata/metadata-exported.h
View File

@ -597,8 +597,8 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd,
/* Find a PV within a given VG */
struct pv_list *find_pv_in_vg(const struct volume_group *vg,
const char *pv_name);
struct physical_volume *find_pv_in_vg_by_uuid(const struct volume_group *vg,
const struct id *id);
struct pv_list *find_pv_in_vg_by_uuid(const struct volume_group *vg,
const struct id *id);
/* Find an LV within a given VG */
struct lv_list *find_lv_in_vg(const struct volume_group *vg,

34
lib/metadata/metadata.c
View File

@ -52,9 +52,6 @@ static struct physical_volume *_find_pv_by_name(struct cmd_context *cmd,
static struct pv_list *_find_pv_in_vg(const struct volume_group *vg,
const char *pv_name);
static struct physical_volume *_find_pv_in_vg_by_uuid(const struct volume_group *vg,
const struct id *id);
static uint32_t _vg_bad_status_bits(const struct volume_group *vg,
uint64_t status);
@ -1656,37 +1653,36 @@ int pv_is_in_vg(struct volume_group *vg, struct physical_volume *pv)
return 0;
}
static struct pv_list *_find_pv_in_vg_by_uuid(const struct volume_group *vg,
const struct id *id)
{
struct pv_list *pvl;
dm_list_iterate_items(pvl, &vg->pvs)
if (id_equal(&pvl->pv->id, id))
return pvl;
return NULL;
}
/**
* find_pv_in_vg_by_uuid - Find PV in VG by PV UUID
* @vg: volume group to search
* @id: UUID of the PV to match
*
* Returns:
* PV handle - if UUID of PV found in VG
* struct pv_list within owning struct volume_group - if UUID of PV found in VG
* NULL - invalid parameter or UUID of PV not found in VG
*
* Note
* FIXME - liblvm todo - make into function that takes VG handle
*/
struct physical_volume *find_pv_in_vg_by_uuid(const struct volume_group *vg,
const struct id *id)
struct pv_list *find_pv_in_vg_by_uuid(const struct volume_group *vg,
const struct id *id)
{
return _find_pv_in_vg_by_uuid(vg, id);
}
static struct physical_volume *_find_pv_in_vg_by_uuid(const struct volume_group *vg,
const struct id *id)
{
struct pv_list *pvl;
dm_list_iterate_items(pvl, &vg->pvs)
if (id_equal(&pvl->pv->id, id))
return pvl->pv;
return NULL;
}
struct lv_list *find_lv_in_vg(const struct volume_group *vg,
const char *lv_name)
{

2
tools/pvcreate.c
View File

@ -56,7 +56,7 @@ static int pvcreate_restore_params_validate(struct cmd_context *cmd,
pp->restorefile);
return 0;
}
if (!(existing_pv = find_pv_in_vg_by_uuid(vg, pp->idp))) {
if (!(existing_pv = find_pv_in_vg_by_uuid(vg, pp->idp)->pv)) {
log_error("Can't find uuid %s in backup file %s",
uuid, pp->restorefile);
return 0;

53
tools/reporter.c
View File

@ -70,29 +70,29 @@ static int _pvsegs_sub_single(struct cmd_context *cmd,
struct logical_volume _free_logical_volume = {
.vg = vg ?: &_free_vg,
.name = (char *) "",
.snapshot = NULL,
.snapshot = NULL,
.status = VISIBLE_LV,
.major = -1,
.minor = -1,
};
struct lv_segment _free_lv_segment = {
.lv = &_free_logical_volume,
.le = 0,
.status = 0,
.stripe_size = 0,
.area_count = 0,
.area_len = 0,
.origin = NULL,
.cow = NULL,
.chunk_size = 0,
.region_size = 0,
.extents_copied = 0,
.log_lv = NULL,
.areas = NULL,
.lv = &_free_logical_volume,
.le = 0,
.status = 0,
.stripe_size = 0,
.area_count = 0,
.area_len = 0,
.origin = NULL,
.cow = NULL,
.chunk_size = 0,
.region_size = 0,
.extents_copied = 0,
.log_lv = NULL,
.areas = NULL,
};
_free_lv_segment.segtype = get_segtype_from_string(cmd, "free");
_free_lv_segment.segtype = get_segtype_from_string(cmd, "free");
_free_lv_segment.len = pvseg->len;
dm_list_init(&_free_vg.pvs);
dm_list_init(&_free_vg.lvs);
@ -136,6 +136,7 @@ static int _pvs_single(struct cmd_context *cmd, struct volume_group *vg,
int ret = ECMD_PROCESSED;
const char *vg_name = NULL;
struct volume_group *old_vg = vg;
char uuid[64] __attribute((aligned(8)));
if (is_pv(pv) && !is_orphan(pv) && !vg) {
vg_name = pv_vg_name(pv);
@ -149,16 +150,28 @@ static int _pvs_single(struct cmd_context *cmd, struct volume_group *vg,
/*
* Replace possibly incomplete PV structure with new one
* allocated in vg_read_internal() path.
* allocated in vg_read.
*/
if (!(pvl = find_pv_in_vg(vg, pv_dev_name(pv)))) {
log_error("Unable to find \"%s\" in volume group \"%s\"",
pv_dev_name(pv), vg->name);
if (!is_missing_pv(pv)) {
if (!(pvl = find_pv_in_vg(vg, pv_dev_name(pv)))) {
log_error("Unable to find \"%s\" in volume group \"%s\"",
pv_dev_name(pv), vg->name);
ret = ECMD_FAILED;
goto out;
}
} else if (!(pvl = find_pv_in_vg_by_uuid(vg, &pv->id))) {
if (!id_write_format(&pv->id, uuid, sizeof(uuid))) {
stack;
uuid[0] = '\0';
}
log_error("Unable to find missing PV %s in volume group %s",
uuid, vg->name);
ret = ECMD_FAILED;
goto out;
}
pv = pvl->pv;
pv = pvl->pv;
}
if (!report_object(handle, vg, NULL, pv, NULL, NULL)) {