This patch fixes issues with improper udev flags on sub-LVs.

The current code does not always assign proper udev flags to sub-LVs (e.g.
mirror images and log LVs).  This shows up especially during a splitmirror
operation in which an image is split off from a mirror to form a new LV.

A mirror with a disk log is actually composed of 4 different LVs: the 2
mirror images, the log, and the top-level LV that "glues" them all together.
When a 2-way mirror is split into two linear LVs, two of those LVs must be
removed.  The segments of the image which is not split off to form the new
LV are transferred to the top-level LV.  This is done so that the original
LV can maintain its major/minor, UUID, and name.  The sub-lv from which the
segments were transferred gets an error segment as a transitory process
before it is eventually removed.  (Note that if the error target was not put
in place, a resume_lv would result in two LVs pointing to the same segment!
If the machine crashes before the eventual removal of the sub-LV, the result
would be a residual LV with the same mapping as the original (now linear) LV.)
So, the two LVs that need to be removed are now the log device and the sub-LV
with the error segment.  If udev_flags are not properly set, a resume will
cause the error LV to come up and be scanned by udev.  This causes I/O errors.
Additionally, when udev scans sub-LVs (or former sub-LVs), it can cause races
when we are trying to remove those LVs.  This is especially bad during failure
conditions.

When the mirror is suspended, the top-level along with its sub-LVs are
suspended.  The changes (now 2 linear devices and the yet-to-be-removed log
and error LV) are committed.  When the resume takes place on the original
LV, there are no longer links to the other sub-lvs through the LVM metadata.
The links are implicitly handled by querying the kernel for a list of
dependencies.  This is done in the '_add_dev' function (which is recursively
called for each dependency found) - called through the following chain:
	_add_dev
	dm_tree_add_dev_with_udev_flags
	<*** DM / LVM divide ***>
	_add_dev_to_dtree
	_add_lv_to_dtree
	_create_partial_dtree
	_tree_action
	dev_manager_activate
	_lv_activate_lv
	_lv_resume
	lv_resume_if_active
When udev flags are calculated by '_get_udev_flags', it is done by referencing
the 'logical_volume' structure.  Those flags are then passed down into
'dm_tree_add_dev_with_udev_flags', which in turn passes them to '_add_dev'.
Unfortunately, when '_add_dev' is finding the dependencies, it has no way to
calculate their proper udev_flags.  This is because it is below the DM/LVM
divide - it doesn't have access to the logical_volume structure.  In fact,
'_add_dev' simply reuses the udev_flags given for the initial device!  This
virtually guarentees the udev_flags are wrong for all the dependencies unless
they are reset by some other mechanism.  The current code provides no such
mechanism.  Even if '_add_new_lv_to_dtree' were called on the sub-devices -
which it isn't - entries already in the tree are simply passed over, failing
to reset any udev_flags.  The solution must retain its implicit nature of
discovering dependencies and be able to go back over the dependencies found
to properly set the udev_flags.

My solution simply calls a new function before leaving '_add_new_lv_to_dtree'
that iterates over the dtree nodes to properly reset the udev_flags of any
children.  It is important that this function occur after the '_add_dev' has
done its job of querying the kernel for a list of dependencies.  It is this
list of children that we use to look up their respective LVs and properly
calculate the udev_flags.

This solution has worked for single machine, cluster, and cluster w/ exclusive
activation.

diff --git a/WHATS_NEW b/WHATS_NEW
index 6ad6384bae7f688cd6fbc6d0c1a1fbe14c4ea590..3fff79a4cbbd510c08ef7cdc92a086a000fab3d0 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.89 - 
 ==================================
+  Fix improper udev settings during suspend/resume for mirror sub-LVs.
   Fix vgsplit when there are mirrors that have mirrored logs.
   Clarify multi-name device filter pattern matching explanation in lvm.conf.5.
   Introduce lv_send_message and dev_manager_send_message.

diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 33e08c83b37b0d12362c1ce507f2291cf5c4383e..b01dfc5f267670e4b849c9fa3d8b4412729262e3 100644 (file)
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -1568,6 +1568,57 @@ static int _add_segment_to_dtree(struct dev_manager *dm,
        return 1;
 }
 
+static int _set_udev_flags_for_children(struct dev_manager *dm,
+                                       struct volume_group *vg,
+                                       struct dm_tree_node *dnode)
+{
+       char *p;
+       const char *uuid;
+       void *handle = NULL;
+       struct dm_tree_node *child;
+       const struct dm_info *info;
+       struct lv_list *lvl;
+
+       while ((child = dm_tree_next_child(&handle, dnode, 0))) {
+               /* Ignore root node */
+               if (!(info  = dm_tree_node_get_info(child)) || !info->exists)
+                       continue;
+
+               if (!(uuid = dm_tree_node_get_uuid(child))) {
+                       log_error(INTERNAL_ERROR
+                                 "Failed to get uuid for %" PRIu32 ":%" PRIu32,
+                                 info->major, info->minor);
+                       continue;
+               }
+
+               /* Ignore non-LVM devices */
+               if (!(p = strstr(uuid, UUID_PREFIX)))
+                       continue;
+               p += strlen(UUID_PREFIX);
+
+               /* Ignore LVs that belong to different VGs (due to stacking) */
+               if (strncmp(p, (char *)vg->id.uuid, ID_LEN))
+                       continue;
+
+               /* Ignore LVM devices with 'layer' suffixes */
+               if (strrchr(p, '-'))
+                       continue;
+
+               if (!(lvl = find_lv_in_vg_by_lvid(vg, (const union lvid *)p))) {
+                       log_error(INTERNAL_ERROR
+                                 "%s (%" PRIu32 ":%" PRIu32 ") not found in VG",
+                                 dm_tree_node_get_name(child),
+                                 info->major, info->minor);
+                       return 0;
+               }
+
+               dm_tree_node_set_udev_flags(child,
+                                           _get_udev_flags(dm, lvl->lv, NULL));
+       }
+
+       return 1;
+}
+
 static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
                                struct logical_volume *lv, struct lv_activate_opts *laopts,
                                const char *layer)
@@ -1672,6 +1723,9 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
                        if (!_add_new_lv_to_dtree(dm, dtree, sl->seg->lv, laopts, NULL))
                                return_0;
 
+       if (!_set_udev_flags_for_children(dm, lv->vg, dnode))
+               return_0;
+
        return 1;
 }
 

diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 2192bbeafee8f2a55f0c19ffde417043fe05a099..fdf8943514faadd2f049cbc75944cca66595b4ae 100644 (file)
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -560,6 +560,8 @@ int dm_tree_node_add_thin_target(struct dm_tree_node *node,
                                 const char *thin_pool_uuid,
                                 uint32_t device_id);
 
+void dm_tree_node_set_udev_flags(struct dm_tree_node *node, uint16_t udev_flags);
+
 void dm_tree_node_set_presuspend_node(struct dm_tree_node *node,
                                      struct dm_tree_node *presuspend_node);
 

diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index c6a327891ab1f09b6e1599ad7e05e39d2cc5a25d..62d267143985f021886fc489a5bf99369bc7f0ca 100644 (file)
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -741,6 +741,18 @@ struct dm_tree_node *dm_tree_add_new_dev_with_udev_flags(struct dm_tree *dtree,
        return node;
 }
 
+void dm_tree_node_set_udev_flags(struct dm_tree_node *dnode, uint16_t udev_flags)
+
+{
+       struct dm_info *dinfo = &dnode->info;
+
+       if (udev_flags != dnode->udev_flags)
+               log_debug("Resetting %s (%" PRIu32 ":%" PRIu32
+                         ") udev_flags from 0x%x to 0x%x",
+                         dnode->name, dinfo->major, dinfo->minor,
+                         dnode->udev_flags, udev_flags);
+       dnode->udev_flags = udev_flags;
+}
 
 void dm_tree_node_set_read_ahead(struct dm_tree_node *dnode,
                                 uint32_t read_ahead,