mirror: fix leg splitting

Enhance lv_info with lv_info_with_name_check.
This 'variant' not only check existance if UUID in DM table
but also compares its  DM name  whether it's matching expected LV name.
Otherwise activation may 'skip' activation with rename in case the
DM UUID already exists, just device is different name.

This change make fairly easier manipulation with i.e. detached mirror
leg which ATM is using same UUID - just the LV name have been changed.

Used code was not able to run 'activation' (and do a rename) and just
skipped the call. So the code used to do a workaround and 'tried'
to deactivate such LV firts - this however work only in non-clvmd case,
as cluster was not having the lock for deactivated LV.

With this extended lv_info code will run 'activation' and will
synchronize the name to match expected LV name.

Patch extends _lv_info() with new paramter 'with_name_check',
which is later translated into 'name_check' argument for
_info_run() which in case of name mismatch evaluates the
check as if device does not exists.

Such call is only used in one place _lv_activate() which then
let activation run.  All other invocation of _info() calls
are left intact.

TODO: fix mirror table manipulation (and raid)....

diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 232d5818b98116b52486c837e9173ace53d168df..a82a5cbc4d20b3e6e0ae3ca00facd470f60d4787 100644 (file)
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -620,7 +620,7 @@ static int _lv_info(struct cmd_context *cmd, const struct logical_volume *lv,
                    int use_layer, struct lvinfo *info,
                    const struct lv_segment *seg,
                    struct lv_seg_status *seg_status,
-                   int with_open_count, int with_read_ahead)
+                   int with_open_count, int with_read_ahead, int with_name_check)
 {
        struct dm_info dminfo;
 
@@ -638,7 +638,7 @@ static int _lv_info(struct cmd_context *cmd, const struct logical_volume *lv,
        /* New thin-pool has no layer, but -tpool suffix needs to be queried */
        if (!use_layer && lv_is_new_thin_pool(lv)) {
                /* Check if there isn't existing old thin pool mapping in the table */
-               if (!dev_manager_info(cmd, lv, NULL, 0, 0, &dminfo, NULL, NULL))
+               if (!dev_manager_info(cmd, lv, NULL, 0, 0, 0, &dminfo, NULL, NULL))
                        return_0;
                if (!dminfo.exists)
                        use_layer = 1;
@@ -651,8 +651,9 @@ static int _lv_info(struct cmd_context *cmd, const struct logical_volume *lv,
 
        if (!dev_manager_info(cmd, lv,
                              (use_layer) ? lv_layer(lv) : NULL,
-                             with_open_count, with_read_ahead,
-                             &dminfo, (info) ? &info->read_ahead : NULL,
+                             with_open_count, with_read_ahead, with_name_check,
+                             &dminfo,
+                             (info) ? &info->read_ahead : NULL,
                              seg_status))
                return_0;
 
@@ -681,7 +682,16 @@ int lv_info(struct cmd_context *cmd, const struct logical_volume *lv, int use_la
        if (!activation())
                return 0;
 
-       return _lv_info(cmd, lv, use_layer, info, NULL, NULL, with_open_count, with_read_ahead);
+       return _lv_info(cmd, lv, use_layer, info, NULL, NULL, with_open_count, with_read_ahead, 0);
+}
+
+int lv_info_with_name_check(struct cmd_context *cmd, const struct logical_volume *lv,
+                           int use_layer, struct lvinfo *info)
+{
+       if (!activation())
+               return 0;
+
+       return _lv_info(cmd, lv, use_layer, info, NULL, NULL, 0, 0, 1);
 }
 
 /*
@@ -711,16 +721,16 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
                 * STATUS is collected from cache LV */
                if (!(lv_seg = get_only_segment_using_this_lv(lv)))
                        return_0;
-               (void) _lv_info(cmd, lv_seg->lv, 1, NULL, lv_seg, &status->seg_status, 0, 0);
+               (void) _lv_info(cmd, lv_seg->lv, 1, NULL, lv_seg, &status->seg_status, 0, 0, 0);
                return 1;
        }
 
        if (lv_is_thin_pool(lv)) {
                /* Always collect status for '-tpool' */
-               if (_lv_info(cmd, lv, 1, &status->info, lv_seg, &status->seg_status, 0, 0) &&
+               if (_lv_info(cmd, lv, 1, &status->info, lv_seg, &status->seg_status, 0, 0, 0) &&
                    (status->seg_status.type == SEG_STATUS_THIN_POOL)) {
                        /* There is -tpool device, but query 'active' state of 'fake' thin-pool */
-                       if (!_lv_info(cmd, lv, 0, NULL, NULL, NULL, 0, 0) &&
+                       if (!_lv_info(cmd, lv, 0, NULL, NULL, NULL, 0, 0, 0) &&
                            !status->seg_status.thin_pool->needs_check)
                                status->info.exists = 0; /* So pool LV is not active */
                }
@@ -729,10 +739,10 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
 
        if (lv_is_external_origin(lv)) {
                if (!_lv_info(cmd, lv, 0, &status->info, NULL, NULL,
-                             with_open_count, with_read_ahead))
+                             with_open_count, with_read_ahead, 0))
                        return_0;
 
-               (void) _lv_info(cmd, lv, 1, NULL, lv_seg, &status->seg_status, 0, 0);
+               (void) _lv_info(cmd, lv, 1, NULL, lv_seg, &status->seg_status, 0, 0, 0);
                return 1;
        }
 
@@ -745,13 +755,13 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
                /* Show INFO for actual origin and grab status for merging origin */
                if (!_lv_info(cmd, lv, 0, &status->info, lv_seg,
                              lv_is_merging_origin(lv) ? &status->seg_status : NULL,
-                             with_open_count, with_read_ahead))
+                             with_open_count, with_read_ahead, 0))
                        return_0;
 
                if (status->info.exists &&
                    (status->seg_status.type != SEG_STATUS_SNAPSHOT)) /* Not merging */
                        /* Grab STATUS from layered -real */
-                       (void) _lv_info(cmd, lv, 1, NULL, lv_seg, &status->seg_status, 0, 0);
+                       (void) _lv_info(cmd, lv, 1, NULL, lv_seg, &status->seg_status, 0, 0, 0);
                return 1;
        }
 
@@ -760,7 +770,7 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
                        olv = origin_from_cow(lv);
 
                        if (!_lv_info(cmd, olv, 0, &status->info, first_seg(olv), &status->seg_status,
-                                     with_open_count, with_read_ahead))
+                                     with_open_count, with_read_ahead, 0))
                                return_0;
 
                        if (status->seg_status.type == SEG_STATUS_SNAPSHOT ||
@@ -782,13 +792,13 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
 
        if (lv_is_vdo(lv)) {
                if (!_lv_info(cmd, lv, 0, &status->info, NULL, NULL,
-                             with_open_count, with_read_ahead))
+                             with_open_count, with_read_ahead, 0))
                        return_0;
                if (status->info.exists) {
                        /* Status for VDO pool */
                        (void) _lv_info(cmd, seg_lv(lv_seg, 0), 1, NULL,
                                        first_seg(seg_lv(lv_seg, 0)),
-                                       &status->seg_status, 0, 0);
+                                       &status->seg_status, 0, 0, 0);
                        /* Use VDO pool segtype result for VDO segtype */
                        status->seg_status.seg = lv_seg;
                }
@@ -797,10 +807,10 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
 
        if (lv_is_vdo_pool(lv)) {
                /* Always collect status for '-vpool' */
-               if (_lv_info(cmd, lv, 1, &status->info, lv_seg, &status->seg_status, 0, 0) &&
+               if (_lv_info(cmd, lv, 1, &status->info, lv_seg, &status->seg_status, 0, 0, 0) &&
                    (status->seg_status.type == SEG_STATUS_VDO_POOL)) {
                        /* There is -tpool device, but query 'active' state of 'fake' vdo-pool */
-                       if (!_lv_info(cmd, lv, 0, NULL, NULL, NULL, 0, 0))
+                       if (!_lv_info(cmd, lv, 0, NULL, NULL, NULL, 0, 0, 0))
                                status->info.exists = 0; /* So VDO pool LV is not active */
                }
 
@@ -808,7 +818,7 @@ int lv_info_with_seg_status(struct cmd_context *cmd,
        }
 
        return _lv_info(cmd, lv, 0, &status->info, lv_seg, &status->seg_status,
-                       with_open_count, with_read_ahead);
+                       with_open_count, with_read_ahead, 0);
 }
 
 #define OPEN_COUNT_CHECK_RETRIES 25
@@ -2573,7 +2583,7 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
                             laopts->noscan ? " noscan" : "",
                             laopts->temporary ? " temporary" : "");
 
-       if (!lv_info(cmd, lv, 0, &info, 0, 0))
+       if (!lv_info_with_name_check(cmd, lv, 0, &info))
                goto_out;
 
        /*

diff --git a/lib/activate/activate.h b/lib/activate/activate.h
index dc13f176adc90642c74143ec7991b5abf2417a83..4bb755cc4e8d571c17cbc91825b1c9d604fcf32b 100644 (file)
--- a/lib/activate/activate.h
+++ b/lib/activate/activate.h
@@ -146,6 +146,8 @@ int lv_info(struct cmd_context *cmd, const struct logical_volume *lv, int use_la
            struct lvinfo *info, int with_open_count, int with_read_ahead);
 int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s, int use_layer,
                    struct lvinfo *info, int with_open_count, int with_read_ahead);
+int lv_info_with_name_check(struct cmd_context *cmd, const struct logical_volume *lv,
+                           int use_layer, struct lvinfo *info);
 
 /*
  * Returns 1 if lv_info_and_seg_status structure has been populated,

diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index c87076c9dfe98f795d424a2335450d4a90d28be4..1adb44d7b65aa6a19272d710f64e97464c5e8808 100644 (file)
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -248,6 +248,7 @@ static uint32_t _seg_len(const struct lv_segment *seg)
 static int _info_run(const char *dlid, struct dm_info *dminfo,
                     uint32_t *read_ahead,
                     struct lv_seg_status *seg_status,
+                    const char *name_check,
                     int with_open_count, int with_read_ahead,
                     uint32_t major, uint32_t minor)
 {
@@ -258,6 +259,7 @@ static int _info_run(const char *dlid, struct dm_info *dminfo,
        void *target = NULL;
        uint64_t target_start, target_length, start, length;
        char *target_name, *target_params;
+       const char *dev_name;
 
        if (seg_status) {
                dmtask = DM_DEVICE_STATUS;
@@ -271,6 +273,11 @@ static int _info_run(const char *dlid, struct dm_info *dminfo,
                                    with_open_count, with_flush, 0)))
                return_0;
 
+       if (name_check && dminfo->exists &&
+           (dev_name = dm_task_get_name(dmt)) &&
+           (strcmp(name_check, dev_name) != 0))
+               dminfo->exists = 0;     /* mismatching name -> device does not exist */
+
        if (with_read_ahead && dminfo->exists) {
                if (!dm_task_get_read_ahead(dmt, read_ahead))
                        goto_out;
@@ -791,18 +798,19 @@ static int _original_uuid_format_check_required(struct cmd_context *cmd)
 
 static int _info(struct cmd_context *cmd,
                 const char *name, const char *dlid,
-                int with_open_count, int with_read_ahead,
+                int with_open_count, int with_read_ahead, int with_name_check,
                 struct dm_info *dminfo, uint32_t *read_ahead,
                 struct lv_seg_status *seg_status)
 {
        char old_style_dlid[sizeof(UUID_PREFIX) + 2 * ID_LEN];
        const char *suffix, *suffix_position;
+       const char *name_check = (with_name_check) ? name : NULL;
        unsigned i = 0;
 
        log_debug_activation("Getting device info for %s [%s].", name, dlid);
 
        /* Check for dlid */
-       if (!_info_run(dlid, dminfo, read_ahead, seg_status,
+       if (!_info_run(dlid, dminfo, read_ahead, seg_status, name_check,
                       with_open_count, with_read_ahead, 0, 0))
                return_0;
 
@@ -818,7 +826,8 @@ static int _info(struct cmd_context *cmd,
                        (void) strncpy(old_style_dlid, dlid, sizeof(old_style_dlid));
                        old_style_dlid[sizeof(old_style_dlid) - 1] = '\0';
                        if (!_info_run(old_style_dlid, dminfo, read_ahead, seg_status,
-                                      with_open_count, with_read_ahead, 0, 0))
+                                      name_check, with_open_count, with_read_ahead,
+                                      0, 0))
                                return_0;
                        if (dminfo->exists)
                                return 1;
@@ -831,7 +840,7 @@ static int _info(struct cmd_context *cmd,
 
        /* Check for dlid before UUID_PREFIX was added */
        if (!_info_run(dlid + sizeof(UUID_PREFIX) - 1, dminfo, read_ahead, seg_status,
-                      with_open_count, with_read_ahead, 0, 0))
+                      name_check, with_open_count, with_read_ahead, 0, 0))
                return_0;
 
        return 1;
@@ -861,7 +870,7 @@ out:
 
 static int _info_by_dev(uint32_t major, uint32_t minor, struct dm_info *info)
 {
-       return _info_run(NULL, info, NULL, 0, 0, 0, major, minor);
+       return _info_run(NULL, info, NULL, NULL, NULL, 0, 0, major, minor);
 }
 
 int dev_manager_check_prefix_dm_major_minor(uint32_t major, uint32_t minor, const char *prefix)
@@ -883,7 +892,7 @@ int dev_manager_check_prefix_dm_major_minor(uint32_t major, uint32_t minor, cons
 
 int dev_manager_info(struct cmd_context *cmd,
                     const struct logical_volume *lv, const char *layer,
-                    int with_open_count, int with_read_ahead,
+                    int with_open_count, int with_read_ahead, int with_name_check,
                     struct dm_info *dminfo, uint32_t *read_ahead,
                     struct lv_seg_status *seg_status)
 {
@@ -896,7 +905,8 @@ int dev_manager_info(struct cmd_context *cmd,
        if (!(dlid = build_dm_uuid(cmd->mem, lv, layer)))
                goto_out;
 
-       if (!(r = _info(cmd, name, dlid, with_open_count, with_read_ahead,
+       if (!(r = _info(cmd, name, dlid,
+                       with_open_count, with_read_ahead, with_name_check,
                        dminfo, read_ahead, seg_status)))
                stack;
 out:
@@ -2096,7 +2106,7 @@ static int _add_dev_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
        if (!(dlid = build_dm_uuid(dm->track_pending_delete ? dm->cmd->pending_delete_mem : dm->mem, lv, layer)))
                return_0;
 
-       if (!_info(dm->cmd, name, dlid, 1, 0, &info, NULL, NULL))
+       if (!_info(dm->cmd, name, dlid, 1, 0, 0, &info, NULL, NULL))
                return_0;
 
        /*
@@ -2396,7 +2406,7 @@ static int _add_cvol_subdev_to_dtree(struct dev_manager *dm, struct dm_tree *dtr
        if (!(name = dm_build_dm_name(dm->mem, lv->vg->name, pool_lv->name, layer)))
                return_0;
 
-       if (!_info(dm->cmd, name, dlid, 1, 0, &info, NULL, NULL))
+       if (!_info(dm->cmd, name, dlid, 1, 0, 0, &info, NULL, NULL))
                return_0;
 
        if (info.exists) {
@@ -2692,7 +2702,7 @@ static char *_add_error_or_zero_device(struct dev_manager *dm, struct dm_tree *d
                                      seg->lv->name, errid)))
                return_NULL;
 
-       if (!_info(dm->cmd, name, dlid, 1, 0, &info, NULL, NULL))
+       if (!_info(dm->cmd, name, dlid, 1, 0, 0, &info, NULL, NULL))
                return_NULL;
 
        if (!info.exists) {

diff --git a/lib/activate/dev_manager.h b/lib/activate/dev_manager.h
index d3d9ce4a0aa086cdb9d64b19b988a28db4c61e7f..5bff477995ef3cfc4b132f8da71a87345b6c63e2 100644 (file)
--- a/lib/activate/dev_manager.h
+++ b/lib/activate/dev_manager.h
@@ -47,7 +47,7 @@ void dev_manager_exit(void);
  */
 int dev_manager_info(struct cmd_context *cmd, const struct logical_volume *lv,
                     const char *layer,
-                    int with_open_count, int with_read_ahead,
+                    int with_open_count, int with_read_ahead, int with_name_check,
                     struct dm_info *dminfo, uint32_t *read_ahead,
                     struct lv_seg_status *seg_status);