shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Fix RHBZ 651590 (failure to lock LV results in failure to repair mirror after

Browse Source 
transient error), stemming from the following sequence of events:

1) devices fail IO, triggering repair
2) dmeventd starts fixing up the mirror
3) during the downconversion, a new metadata version is written

--> the devices come back online here

4) the mirror device suspend/resume is called to update DM tables
5) during the suspend/resume cycle, *pre*-commit metadata is read;
   however, since the failed devices are now back online, we get back
   inconsistent set of precommit metadata and the whole operation fails

The patch relaxes the check that fails in step 5 above, namely by ignoring
inconsistencies coming from PVs that are marked MISSING.
This commit is contained in:
Petr Rockai 2011-06-15 17:45:02 +00:00
parent 53dd32f41d
commit 6d25c0d26f
4 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/format_text/format-text.c
View File

@ -127,6 +127,12 @@ static unsigned _mda_locns_match_raw(struct metadata_area *mda1,
return 0;
}
static struct device *_mda_get_device_raw(struct metadata_area *mda)
{
struct mda_context *mdac = (struct mda_context *) mda->metadata_locn;
return mdac->area.dev;
}
/*
* For circular region between region_start and region_start + region_size,
* back up one SECTOR_SIZE from 'region_ptr' and return the value.
@ -1629,7 +1635,8 @@ static struct metadata_area_ops _metadata_text_raw_ops = {
.mda_total_sectors = _mda_total_sectors_raw,
.mda_in_vg = _mda_in_vg_raw,
.pv_analyze_mda = _pv_analyze_mda_raw,
.mda_locns_match = _mda_locns_match_raw
.mda_locns_match = _mda_locns_match_raw,
.mda_get_device = _mda_get_device_raw
};
static int _text_pv_setup(const struct format_type *fmt,

42
lib/metadata/metadata.c
View File

@ -2837,6 +2837,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
int inconsistent_pvs = 0;
int inconsistent_seqno = 0;
int inconsistent_mdas = 0;
int inconsistent_mda_count = 0;
unsigned use_precommitted = precommitted;
unsigned saved_handles_missing_pvs = cmd->handles_missing_pvs;
struct dm_list *pvids;
@ -2913,6 +2914,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
return_NULL;
/* Ensure contents of all metadata areas match - else do recovery */
inconsistent_mda_count=0;
dm_list_iterate_items(mda, &fid->metadata_areas_in_use) {
if ((use_precommitted &&
!(vg = mda->ops->vg_read_precommit(fid, vgname, mda))) ||
@ -2922,6 +2924,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
free_vg(vg);
continue;
}
if (!correct_vg) {
correct_vg = vg;
continue;
@ -2940,6 +2943,9 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
if (vg->seqno > correct_vg->seqno) {
free_vg(correct_vg);
correct_vg = vg;
} else {
mda->status |= MDA_INCONSISTENT;
++inconsistent_mda_count;
}
}
@ -3067,6 +3073,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
}
/* Ensure contents of all metadata areas match - else recover */
inconsistent_mda_count=0;
dm_list_iterate_items(mda, &fid->metadata_areas_in_use) {
if ((use_precommitted &&
!(vg = mda->ops->vg_read_precommit(fid, vgname,
@ -3111,6 +3118,9 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
if (vg->seqno > correct_vg->seqno) {
free_vg(correct_vg);
correct_vg = vg;
} else {
mda->status |= MDA_INCONSISTENT;
++inconsistent_mda_count;
}
}
@ -3137,13 +3147,26 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
if (use_precommitted) {
log_error("Inconsistent pre-commit metadata copies "
"for volume group %s", vgname);
/* FIXME: during repair, there is inconsistent flag set because some metadata areas
* are missing (on missing PVs). Code should create list of missing PVs, compare it
* with PV marked missing in metadata and if equals, use it as consistent vg.
* For now, return precommited metadata if remainng seq match here to allow
* preloading table in suspend call.
/*
* Check whether all of the inconsistent MDAs were on
* MISSING PVs -- in that case, we should be safe.
*/
if (!inconsistent_seqno) {
dm_list_iterate_items(mda, &fid->metadata_areas_in_use) {
if (mda->status & MDA_INCONSISTENT) {
log_debug("Checking inconsistent MDA: %s", dev_name(mda_get_device(mda)));
dm_list_iterate_items(pvl, &correct_vg->pvs) {
if (mda_get_device(mda) == pvl->pv->dev &&
(pvl->pv->status & MISSING_PV))
--inconsistent_mda_count;
}
}
}
if (inconsistent_mda_count < 0)
log_error(INTERNAL_ERROR "Too many inconsistent MDAs.");
if (!inconsistent_mda_count) {
*consistent = 0;
_free_pv_list(&all_pvs);
return correct_vg;
@ -4285,6 +4308,13 @@ unsigned mda_locns_match(struct metadata_area *mda1, struct metadata_area *mda2)
return mda1->ops->mda_locns_match(mda1, mda2);
}
struct device *mda_get_device(struct metadata_area *mda)
{
if (!mda->ops->mda_get_device)
return NULL;
return mda->ops->mda_get_device(mda);
}
unsigned mda_is_ignored(struct metadata_area *mda)
{
return (mda->status & MDA_IGNORED);

6
lib/metadata/metadata.h
View File

@ -175,9 +175,12 @@ struct metadata_area_ops {
*/
unsigned (*mda_locns_match)(struct metadata_area *mda1,
struct metadata_area *mda2);
struct device *(*mda_get_device)(struct metadata_area *mda);
};
#define MDA_IGNORED 0x00000001
#define MDA_IGNORED 0x00000001
#define MDA_INCONSISTENT 0x00000002
struct metadata_area {
struct dm_list list;
@ -191,6 +194,7 @@ struct metadata_area *mda_copy(struct dm_pool *mem,
unsigned mda_is_ignored(struct metadata_area *mda);
void mda_set_ignored(struct metadata_area *mda, unsigned ignored);
unsigned mda_locns_match(struct metadata_area *mda1, struct metadata_area *mda2);
struct device *mda_get_device(struct metadata_area *mda);
struct format_instance_ctx {
uint32_t type;

6
test/t-lvconvert-repair-transient-dmeventd.sh
View File

@ -19,9 +19,9 @@ lvchange --monitor y $vg/4way
aux disable_dev $dev2 $dev4
mkfs.ext3 $DM_DEV_DIR/$vg/4way
aux enable_dev $dev2 $dev4
sleep 10
sleep 3
lvs -a -o +devices | not grep unknown
check mirror $vg 4way
check mirror_legs $vg 4way 2
lvs -a -o +devices | should not grep mimage_1
lvs -a -o +devices | should not grep mimage_3
lvs -a -o +devices | not grep mimage_1
lvs -a -o +devices | not grep mimage_3