shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

vgsplit: Fix VG component of lvid.

Browse Source 
Fix VG component of lvid in vgsplit and vgmerge
Update vg_validate() to detect the error.
Call lv_is_active() before moving LV into new VG, not after.
This commit is contained in:
Alasdair G Kergon 2014-07-03 19:06:04 +01:00
parent 64ce3a8066
commit 1e1c2769a7
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.108 - Version 2.02.108 -
================================= =================================
Fix VG component of lvid in vgsplit/vgmerge and check in vg_validate.
Add lv_full_name and lv_dm_path fields to reports. Add lv_full_name and lv_dm_path fields to reports.
Change lv_path field to suppress devices that never appear in /dev/vg. Change lv_path field to suppress devices that never appear in /dev/vg.
Postpone thin pool lvconvert prompts (2.02.107). Postpone thin pool lvconvert prompts (2.02.107).

12
lib/metadata/metadata.c
View File

@ -2331,6 +2331,7 @@ int vg_validate(struct volume_group *vg)
struct lv_segment *seg; struct lv_segment *seg;
struct dm_str_list *sl; struct dm_str_list *sl;
char uuid[64] __attribute__((aligned(8))); char uuid[64] __attribute__((aligned(8)));
char uuid2[64] __attribute__((aligned(8)));
int r = 1; int r = 1;
unsigned hidden_lv_count = 0, lv_count = 0, lv_visible_count = 0; unsigned hidden_lv_count = 0, lv_count = 0, lv_visible_count = 0;
unsigned pv_count = 0; unsigned pv_count = 0;
@ -2427,6 +2428,17 @@ int vg_validate(struct volume_group *vg)
r = 0; r = 0;
} }
if (!id_equal(&lvl->lv->lvid.id[0], &lvl->lv->vg->id)) {
if (!id_write_format(&lvl->lv->lvid.id[0], uuid,
sizeof(uuid)))
stack;
if (!id_write_format(&lvl->lv->vg->id, uuid2,
sizeof(uuid2)))
stack;
log_error(INTERNAL_ERROR "LV %s has VG UUID %s but its VG %s has UUID %s",
lvl->lv->name, uuid, lvl->lv->vg->name, uuid2);
r = 0;
}
if (lv_is_cow(lvl->lv)) if (lv_is_cow(lvl->lv))
num_snapshots++; num_snapshots++;

1
tools/vgmerge.c
View File

@ -133,6 +133,7 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to,
dm_list_iterate_items(lvl1, &vg_from->lvs) { dm_list_iterate_items(lvl1, &vg_from->lvs) {
lvl1->lv->vg = vg_to; lvl1->lv->vg = vg_to;
lvl1->lv->lvid.id[0] = lvl1->lv->vg->id;
} }
while (!dm_list_empty(&vg_from->lvs)) { while (!dm_list_empty(&vg_from->lvs)) {

14
tools/vgsplit.c
View File

@ -16,13 +16,9 @@
#include "tools.h" #include "tools.h"
#include "metadata.h" /* for 'get_only_segment_using_this_lv' */ #include "metadata.h" /* for 'get_only_segment_using_this_lv' */
/* FIXME Why not (lv->vg == vg) ? */
static int _lv_is_in_vg(struct volume_group *vg, struct logical_volume *lv) static int _lv_is_in_vg(struct volume_group *vg, struct logical_volume *lv)
{ {
struct lv_list *lvl; if (lv->vg == vg)
dm_list_iterate_items(lvl, &vg->lvs)
if (lv == lvl->lv)
return 1; return 1;
return 0; return 0;
@ -34,14 +30,16 @@ static int _move_one_lv(struct volume_group *vg_from,
{ {
struct logical_volume *lv = dm_list_item(lvh, struct lv_list)->lv; struct logical_volume *lv = dm_list_item(lvh, struct lv_list)->lv;
dm_list_move(&vg_to->lvs, lvh);
lv->vg = vg_to;
if (lv_is_active(lv)) { if (lv_is_active(lv)) {
log_error("Logical volume \"%s\" must be inactive", lv->name); log_error("Logical volume \"%s\" must be inactive", lv->name);
return 0; return 0;
} }
dm_list_move(&vg_to->lvs, lvh);
lv->vg = vg_to;
lv->lvid.id[0] = lv->vg->id;
/* Moved pool metadata spare LV */ /* Moved pool metadata spare LV */
if (vg_from->pool_metadata_spare_lv == lv) { if (vg_from->pool_metadata_spare_lv == lv) {
vg_to->pool_metadata_spare_lv = lv; vg_to->pool_metadata_spare_lv = lv;