Restrict lvm1 partial mode.

Current lvm1 allocation code seems to not properly
map segments on missing PVs.

For now disable this functionality.
(It never worked and previous commit just introduced segfault here.)

So the partial mode in lvm1 can only process missing PVs
with no LV segments only.

Also do not use random PV UUID for missing part but use fixed
string derived from VG UUID (to not confuse clvmd tests).

diff --git a/WHATS_NEW b/WHATS_NEW
index 5d09a63604b883a091a69a44e3690f5ec396e690..a600f1da1bb9a8d1a1d05faac7331f20b4a325b3 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.75 - 
 =====================================
+  Avoid segfault by limiting partial mode for lvm1 metadata. (2.02.74)
   Add dm_zalloc and use it and dm_pool_zalloc throughout.
   Add pv_get_property and create generic internal _get_property function.
   Add 'get' functions for pv and vg properties/fields.

diff --git a/lib/format1/format1.c b/lib/format1/format1.c
index d6c462a53910d19c94ed87743ad6d11aefa43ea0..f5a9d12b21f5d277c9323fbc6fa76719ef5d348f 100644 (file)
--- a/lib/format1/format1.c
+++ b/lib/format1/format1.c
@@ -118,6 +118,28 @@ static int _fix_partial_vg(struct volume_group *vg, struct dm_list *pvs)
        struct disk_list *dl;
        struct dm_list *pvh;
        struct pv_list *pvl;
+       struct lv_list *ll;
+       struct lv_segment *seg;
+
+       /*
+        * FIXME: code should remap missing segments to error segment.
+        * Also current mapping code allocates 1 segment per missing extent.
+        * For now bail out completely - allocated structures are not complete
+        */
+       dm_list_iterate_items(ll, &vg->lvs)
+               dm_list_iterate_items(seg, &ll->lv->segments) {
+
+                       /* area_count is always 1 here, s == 0 */
+                       if (seg_type(seg, 0) != AREA_PV)
+                               continue;
+
+                       if (seg_pv(seg, 0))
+                               continue;
+
+                       log_error("Partial mode support for missing lvm1 PVs and "
+                                 "partially available LVs is currently not implemented.");
+                       return 0;
+       }
 
        dm_list_iterate(pvh, pvs) {
                dl = dm_list_item(pvh, struct disk_list);
@@ -129,8 +151,10 @@ static int _fix_partial_vg(struct volume_group *vg, struct dm_list *pvs)
            !(pvl->pv = dm_pool_zalloc(vg->vgmem, sizeof(*pvl->pv))))
                return_0;
 
-       if (!id_create(&pvl->pv->id))
-               goto_out;
+       /* Use vg uuid with replaced first chars to "missing" as missing PV UUID */
+       memcpy(&pvl->pv->id.uuid, vg->id.uuid, sizeof(pvl->pv->id.uuid));
+       memcpy(&pvl->pv->id.uuid, "missing", 7);
+
        if (!(pvl->pv->vg_name = dm_pool_strdup(vg->vgmem, vg->name)))
                goto_out;
        memcpy(&pvl->pv->vgid, &vg->id, sizeof(vg->id));

diff --git a/test/t-vgcfgbackup-usage.sh b/test/t-vgcfgbackup-usage.sh
index 38efa9c5311b613ea13db67affc0af81d92a9845..72b37bb620160fe213f69ae3ada567a11dcf2e72 100644 (file)
--- a/test/t-vgcfgbackup-usage.sh
+++ b/test/t-vgcfgbackup-usage.sh
@@ -43,6 +43,9 @@ vgcfgrestore -f "$(pwd)/backup.$$1" $vg
 vgremove -ff $vg
 
 # vgcfgbackup correctly stores metadata LVM1 with missing PVs
+# FIXME: clvmd seems to have problem with metadata format change here
+# fix it and remove this vgscan
+vgscan
 pvcreate -M1 $devs
 vgcreate -M1 -c n $vg $devs
 lvcreate -l1 -n $lv1 $vg $dev1