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

libdm: enhance tracking of activated LVs

Browse Source 
Existing mechanism was not able to trace root volume issue.
Simplify the functionality by using simply using activated flag
and trace the dtree in reverse order.
This commit is contained in:
Zdenek Kabelac 2021-09-12 21:15:31 +02:00
parent d489445e5a
commit a8ee82ed51
3 changed files with 43 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.181 - Version 1.02.181 -
=================================== ===================================
Enhance tracking of activated devices when preloading dm tree.
Fix bug in construction of cache table line (regression from 1.02.159). Fix bug in construction of cache table line (regression from 1.02.159).
Version 1.02.179 - 11th August 2021 Version 1.02.179 - 11th August 2021

50
device_mapper/libdm-deptree.c
View File

@ -330,16 +330,7 @@ struct dm_tree_node {
dm_node_callback_fn callback; dm_node_callback_fn callback;
void *callback_data; void *callback_data;
/* int activated; /* tracks activation during preload */
* TODO:
* Add advanced code which tracks of send ioctls and their
* proper revert operation for more advanced recovery
* Current code serves mostly only to recovery when
* thin pool metadata check fails and command would
* have left active thin data and metadata subvolumes.
*/
struct dm_list activated; /* Head of activated nodes for preload revert */
struct dm_list activated_list; /* List of activated nodes for preload revert */
}; };
struct dm_tree { struct dm_tree {
@ -374,7 +365,6 @@ struct dm_tree *dm_tree_create(void)
dtree->root.dtree = dtree; dtree->root.dtree = dtree;
dm_list_init(&dtree->root.uses); dm_list_init(&dtree->root.uses);
dm_list_init(&dtree->root.used_by); dm_list_init(&dtree->root.used_by);
dm_list_init(&dtree->root.activated);
dtree->skip_lockfs = 0; dtree->skip_lockfs = 0;
dtree->no_flush = 0; dtree->no_flush = 0;
dtree->mem = dmem; dtree->mem = dmem;
@ -559,7 +549,6 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
dm_list_init(&node->uses); dm_list_init(&node->uses);
dm_list_init(&node->used_by); dm_list_init(&node->used_by);
dm_list_init(&node->activated);
dm_list_init(&node->props.segs); dm_list_init(&node->props.segs);
dev = MKDEV(info->major, info->minor); dev = MKDEV(info->major, info->minor);
@ -2187,7 +2176,7 @@ static int _create_node(struct dm_tree_node *dnode, struct dm_tree_node *parent)
} }
if (r) if (r)
dm_list_add_h(&parent->activated, &dnode->activated_list); dnode->activated = 1;
out: out:
dm_task_destroy(dmt); dm_task_destroy(dmt);
@ -3180,26 +3169,29 @@ out:
return r; return r;
} }
/* /* Try to deactivate only nodes created during preload. */
* Currently try to deactivate only nodes created during preload. static int _dm_tree_revert_activated(struct dm_tree_node *dnode)
* New node is always attached to the front of activated_list
*/
static int _dm_tree_revert_activated(struct dm_tree_node *parent)
{ {
void *handle = NULL;
struct dm_tree_node *child; struct dm_tree_node *child;
dm_list_iterate_items_gen(child, &parent->activated, activated_list) { while ((child = dm_tree_next_child(&handle, dnode, 0))) {
log_debug_activation("Reverting %s.", _node_name(child)); if (child->activated) {
if (child->callback) { if (child->callback) {
log_debug_activation("Dropping callback for %s.", _node_name(child)); log_debug_activation("Dropping callback for %s.", _node_name(child));
child->callback = NULL; child->callback = NULL;
}
log_debug_activation("Reverting %s.", _node_name(child));
if (!_deactivate_node(child->name, child->info.major, child->info.minor,
&child->dtree->cookie, child->udev_flags, 0)) {
log_debug_activation("Unable to deactivate %s.", _node_name(child));
return 0;
}
} }
if (!_deactivate_node(child->name, child->info.major, child->info.minor,
&child->dtree->cookie, child->udev_flags, 0)) { if (dm_tree_node_num_children(child, 0) &&
log_error("Unable to deactivate %s.", _node_name(child)); !_dm_tree_revert_activated(child))
return 0;
}
if (!_dm_tree_revert_activated(child))
return_0; return_0;
} }

50
libdm/libdm-deptree.c
View File

@ -292,16 +292,7 @@ struct dm_tree_node {
dm_node_callback_fn callback; dm_node_callback_fn callback;
void *callback_data; void *callback_data;
/* int activated; /* tracks activation during preload */
* TODO:
* Add advanced code which tracks of send ioctls and their
* proper revert operation for more advanced recovery
* Current code serves mostly only to recovery when
* thin pool metadata check fails and command would
* have left active thin data and metadata subvolumes.
*/
struct dm_list activated; /* Head of activated nodes for preload revert */
struct dm_list activated_list; /* List of activated nodes for preload revert */
}; };
struct dm_tree { struct dm_tree {
@ -336,7 +327,6 @@ struct dm_tree *dm_tree_create(void)
dtree->root.dtree = dtree; dtree->root.dtree = dtree;
dm_list_init(&dtree->root.uses); dm_list_init(&dtree->root.uses);
dm_list_init(&dtree->root.used_by); dm_list_init(&dtree->root.used_by);
dm_list_init(&dtree->root.activated);
dtree->skip_lockfs = 0; dtree->skip_lockfs = 0;
dtree->no_flush = 0; dtree->no_flush = 0;
dtree->mem = dmem; dtree->mem = dmem;
@ -521,7 +511,6 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
dm_list_init(&node->uses); dm_list_init(&node->uses);
dm_list_init(&node->used_by); dm_list_init(&node->used_by);
dm_list_init(&node->activated);
dm_list_init(&node->props.segs); dm_list_init(&node->props.segs);
dev = MKDEV(info->major, info->minor); dev = MKDEV(info->major, info->minor);
@ -2036,7 +2025,7 @@ static int _create_node(struct dm_tree_node *dnode, struct dm_tree_node *parent)
} }
if (r) if (r)
dm_list_add_h(&parent->activated, &dnode->activated_list); dnode->activated = 1;
out: out:
dm_task_destroy(dmt); dm_task_destroy(dmt);
@ -2793,26 +2782,29 @@ out:
return r; return r;
} }
/* /* Try to deactivate only nodes created during preload. */
* Currently try to deactivate only nodes created during preload. static int _dm_tree_revert_activated(struct dm_tree_node *dnode)
* New node is always attached to the front of activated_list
*/
static int _dm_tree_revert_activated(struct dm_tree_node *parent)
{ {
void *handle = NULL;
struct dm_tree_node *child; struct dm_tree_node *child;
dm_list_iterate_items_gen(child, &parent->activated, activated_list) { while ((child = dm_tree_next_child(&handle, dnode, 0))) {
log_debug_activation("Reverting %s.", _node_name(child)); if (child->activated) {
if (child->callback) { if (child->callback) {
log_debug_activation("Dropping callback for %s.", _node_name(child)); log_debug_activation("Dropping callback for %s.", _node_name(child));
child->callback = NULL; child->callback = NULL;
}
log_debug_activation("Reverting %s.", _node_name(child));
if (!_deactivate_node(child->name, child->info.major, child->info.minor,
&child->dtree->cookie, child->udev_flags, 0)) {
log_debug_activation("Unable to deactivate %s.", _node_name(child));
return 0;
}
} }
if (!_deactivate_node(child->name, child->info.major, child->info.minor,
&child->dtree->cookie, child->udev_flags, 0)) { if (dm_tree_node_num_children(child, 0) &&
log_error("Unable to deactivate %s.", _node_name(child)); !_dm_tree_revert_activated(child))
return 0;
}
if (!_dm_tree_revert_activated(child))
return_0; return_0;
} }