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

thin: fix monitoring of thin pool volume

Browse Source 
Properly skip unmonitoring of thin pool volume in deactivation code
path. Code makes sure if there is just any thin pool user
it stays monitored with all its resources.
This commit is contained in:
Zdenek Kabelac 2013-09-07 02:46:48 +02:00
parent 4c001a7854
commit 655296609e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.101 - Version 2.02.101 -
=================================== ===================================
Fix dmeventd unmonitoring of thin pools.
Fix lvresize for stacked thin pool volumes (i.e. mirrors). Fix lvresize for stacked thin pool volumes (i.e. mirrors).
Write Completed debug message before reinstating log defaults after command. Write Completed debug message before reinstating log defaults after command.
Skip pvmove of RAID, thin, snapshot, origin, or mirror LVs in a cluster. Skip pvmove of RAID, thin, snapshot, origin, or mirror LVs in a cluster.

16
lib/activate/activate.c
View File

@ -1416,7 +1416,6 @@ int monitor_dev_for_events(struct cmd_context *cmd, struct logical_volume *lv,
int (*monitor_fn) (struct lv_segment *s, int e); int (*monitor_fn) (struct lv_segment *s, int e);
uint32_t s; uint32_t s;
static const struct lv_activate_opts zlaopts = { 0 }; static const struct lv_activate_opts zlaopts = { 0 };
static const struct lv_activate_opts thinopts = { .skip_in_use = 1 };
struct lvinfo info; struct lvinfo info;
if (!laopts) if (!laopts)
@ -1435,11 +1434,12 @@ int monitor_dev_for_events(struct cmd_context *cmd, struct logical_volume *lv,
/* /*
* Allow to unmonitor thin pool via explicit pool unmonitor * Allow to unmonitor thin pool via explicit pool unmonitor
* or unmonitor before the last thin pool user deactivation * or unmonitor before the last thin pool user deactivation
* Skip unmonitor, if invoked via unmonitor of thin volume * Skip unmonitor, if invoked via deactivation of thin volume
* and there is another thin pool user (open_count > 1) * and there is another thin pool user (open_count > 1)
* FIXME think about watch ruler influence.
*/ */
if (laopts->skip_in_use && lv_info(lv->vg->cmd, lv, 1, &info, 1, 0) && if (laopts->skip_in_use && lv_is_thin_pool(lv) &&
(info.open_count != 1)) { lv_info(lv->vg->cmd, lv, 1, &info, 1, 0) && (info.open_count > 1)) {
log_debug_activation("Skipping unmonitor of opened %s (open:%d)", log_debug_activation("Skipping unmonitor of opened %s (open:%d)",
lv->name, info.open_count); lv->name, info.open_count);
return 1; return 1;
@ -1495,14 +1495,13 @@ int monitor_dev_for_events(struct cmd_context *cmd, struct logical_volume *lv,
} }
/* /*
* If requested unmonitoring of thin volume, request test * If requested unmonitoring of thin volume, preserve skip_in_use flag.
* if there is no other thin pool user
* *
* FIXME: code here looks like _lv_postorder() * FIXME: code here looks like _lv_postorder()
*/ */
if (seg->pool_lv && if (seg->pool_lv &&
!monitor_dev_for_events(cmd, seg->pool_lv, !monitor_dev_for_events(cmd, seg->pool_lv,
(!monitor) ? &thinopts : NULL, monitor)) (!monitor) ? laopts : NULL, monitor))
r = 0; r = 0;
if (seg->metadata_lv && if (seg->metadata_lv &&
@ -1912,6 +1911,7 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s, struct logical_vo
{ {
struct logical_volume *lv_to_free = NULL; struct logical_volume *lv_to_free = NULL;
struct lvinfo info; struct lvinfo info;
static const struct lv_activate_opts laopts = { .skip_in_use = 1 };
int r = 0; int r = 0;
if (!activation()) if (!activation())
@ -1949,7 +1949,7 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s, struct logical_vo
lv_calculate_readahead(lv, NULL); lv_calculate_readahead(lv, NULL);
if (!monitor_dev_for_events(cmd, lv, NULL, 0)) if (!monitor_dev_for_events(cmd, lv, &laopts, 0))
stack; stack;
critical_section_inc(cmd, "deactivating"); critical_section_inc(cmd, "deactivating");