mirror: properly reload table for log init

Since mirror can be stacked, we need to properly reload whole
table stack, otherwice we may mishandle devices in dm table.

diff --git a/WHATS_NEW b/WHATS_NEW
index 6affa13c956f875c798674cb2a28782b1ef6113c..434f4a0ff80b1209ae1d5a5dc1717949d64e0121 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
 Version 2.02.178 - 
 =====================================
+  Reload whole device stack when reinitilizing mirror log.
+  Mirrors without monitoring are WARNING and not blocking on error.
   Detect too big region_size with clustered mirrors.
   Fix evaluation of maximal region size for mirror log.
   Enhance mirror log size estimation and use smaller size when possible.

diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index 6c8732b57249850c4851db7f5b445e23a926edc6..e09103d725904272d9649cd07bfccbb40dc91e32 100644 (file)
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -315,6 +315,7 @@ static int _write_log_header(struct cmd_context *cmd, struct logical_volume *lv)
  * Initialize mirror log contents
  */
 static int _init_mirror_log(struct cmd_context *cmd,
+                           struct logical_volume *lock_holder,
                            struct logical_volume *log_lv, int in_sync,
                            struct dm_list *tagsl, int remove_on_failure)
 {
@@ -346,7 +347,10 @@ static int _init_mirror_log(struct cmd_context *cmd,
                }
 
        /* store mirror log on disk(s) */
-       if (!vg_write(log_lv->vg) || !vg_commit(log_lv->vg))
+       if (!lock_holder) {
+               if (!vg_write(log_lv->vg) || !vg_commit(log_lv->vg))
+                       return_0;
+       } else if (!lv_update_and_reload((struct logical_volume*) lock_holder))
                return_0;
 
        if (!activate_lv_excl_local(cmd, log_lv)) {
@@ -1021,7 +1025,9 @@ static int _remove_mirror_images(struct logical_volume *lv,
        /* Mirror with only 1 area is 'in sync'. */
        if (new_area_count == 1 && is_temporary_mirror_layer(lv)) {
                detached_log_lv = detach_mirror_log(mirrored_seg);
-               if (!_init_mirror_log(lv->vg->cmd, detached_log_lv,
+               if (!_init_mirror_log(lv->vg->cmd,
+                                     (struct logical_volume*)lv_lock_holder(mirrored_seg->lv),
+                                     detached_log_lv,
                                      1, &lv->tags, 0)) {
                        /* As a result, unnecessary sync may run after
                         * collapsing. But safe.*/
@@ -1822,7 +1828,7 @@ static struct logical_volume *_set_up_mirror_log(struct cmd_context *cmd,
                }
        }
 
-       if (!_init_mirror_log(cmd, log_lv, in_sync, &lv->tags, 1)) {
+       if (!_init_mirror_log(cmd, NULL, log_lv, in_sync, &lv->tags, 1)) {
                log_error("Failed to initialise mirror log.");
                return NULL;
        }
@@ -1870,7 +1876,7 @@ struct logical_volume *prepare_mirror_log(struct logical_volume *lv,
                goto out;
        }
 
-       if (!_init_mirror_log(cmd, log_lv, in_sync, &lv->tags, 1)) {
+       if (!_init_mirror_log(cmd, NULL, log_lv, in_sync, &lv->tags, 1)) {
                log_error("Failed to initialise mirror log.");
                log_lv = NULL;
                goto out;