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

activation: reduce table preloading

Browse Source 
Over the time the code for preloading detached LVs got unnecessarily
complicate. But actually we need to preload only LVs that
were previously non-toplevel (invisible) LVs and became visible
toplevel LVs in the precommitted metadata.

If there would be needed some other rule, it would likely be a bug in
conversion code forgetting to set visibility flag on detached LV.

This reduces number of unnecessary repeated DM tree preloading.
This commit is contained in:
Zdenek Kabelac 2024-02-27 17:19:30 +01:00
parent d356561465
commit 9e2870cc9f
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/activate/activate.c
View File

@ -2039,7 +2039,7 @@ int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume
} }
struct detached_lv_data { struct detached_lv_data {
const struct logical_volume *lv_pre; const struct volume_group *vg_pre;
struct lv_activate_opts *laopts; struct lv_activate_opts *laopts;
int *flush_required; int *flush_required;
}; };
@ -2049,40 +2049,17 @@ static int _preload_detached_lv(struct logical_volume *lv, void *data)
struct detached_lv_data *detached = data; struct detached_lv_data *detached = data;
struct logical_volume *lv_pre; struct logical_volume *lv_pre;
/* Check and preload removed raid image leg or metadata */ /* Check if the LV was 'hidden' (non-toplevel) in committed metadata
if (lv_is_raid_image(lv)) { * and becomes 'visible' (toplevel) in precommitted metadata */
if ((lv_pre = find_lv_in_vg_by_lvid(detached->lv_pre->vg, &lv->lvid)) && if (!lv_is_visible(lv) &&
!lv_is_raid_image(lv_pre) && lv_is_active(lv) && (lv_pre = find_lv_in_vg_by_lvid(detached->vg_pre, &lv->lvid)) &&
!_lv_preload(lv_pre, detached->laopts, detached->flush_required))
return_0;
} else if (lv_is_raid_metadata(lv)) {
if ((lv_pre = find_lv_in_vg_by_lvid(detached->lv_pre->vg, &lv->lvid)) &&
!lv_is_raid_metadata(lv_pre) && lv_is_active(lv) &&
!_lv_preload(lv_pre, detached->laopts, detached->flush_required))
return_0;
} else if (lv_is_mirror_image(lv)) {
if ((lv_pre = find_lv_in_vg_by_lvid(detached->lv_pre->vg, &lv->lvid)) &&
!lv_is_mirror_image(lv_pre) && lv_is_active(lv) &&
!_lv_preload(lv_pre, detached->laopts, detached->flush_required))
return_0;
}
if (!lv_is_visible(lv) && (lv_pre = find_lv(detached->lv_pre->vg, lv->name)) &&
lv_is_visible(lv_pre)) { lv_is_visible(lv_pre)) {
log_debug_activation("Preloading detached hidden volume %s as visible volume %s.",
display_lvname(lv), display_lvname(lv_pre));
if (!_lv_preload(lv_pre, detached->laopts, detached->flush_required)) if (!_lv_preload(lv_pre, detached->laopts, detached->flush_required))
return_0; return_0;
} }
/* FIXME: condition here should be far more limiting to really
* detect detached LVs */
if ((lv_pre = find_lv(detached->lv_pre->vg, lv->name))) {
if (lv_is_visible(lv_pre) && lv_is_active(lv) &&
!lv_is_pool(lv) &&
(!lv_is_cow(lv) || !lv_is_cow(lv_pre)) &&
!_lv_preload(lv_pre, detached->laopts, detached->flush_required))
return_0;
}
return 1; return 1;
} }
@ -2173,7 +2150,7 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
/* /*
* Search for existing LVs that have become detached and preload them. * Search for existing LVs that have become detached and preload them.
*/ */
detached.lv_pre = lv_pre; detached.vg_pre = lv_pre->vg;
detached.laopts = laopts; detached.laopts = laopts;
detached.flush_required = &flush_required; detached.flush_required = &flush_required;