shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

pvmove: require LV name in a shared VG

Browse Source 
In a shared VG, only allow pvmove with a named LV,
so that only PE's used by the LV will be moved.
The LV is then activated exclusively, ensuring that
the PE's being moved are not used from another host.

Previously, pvmove was mistakenly allowed on a full PV.
This won't work when LVs using that PV are active on
other hosts.
This commit is contained in:
David Teigland 2017-09-19 13:08:41 -05:00
parent 518a8e8cfb
commit f2ee0e7aca
4 changed files with 28 additions and 18 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.175 - Version 2.02.175 -
====================================== ======================================
Require LV name with pvmove in a shared VG.
Allow shared active mirror LVs with lvmlockd, dlm, and cmirrord. Allow shared active mirror LVs with lvmlockd, dlm, and cmirrord.
Support lvconvert --repair with cache and cachepool volumes. Support lvconvert --repair with cache and cachepool volumes.
lvconvert --repair respects --poolmetadataspare option. lvconvert --repair respects --poolmetadataspare option.

2
lib/metadata/mirror.c
View File

@ -2145,7 +2145,7 @@ int lv_add_mirrors(struct cmd_context *cmd, struct logical_volume *lv,
} }
} }
if (lv->vg->lock_type && !strcmp(lv->vg->lock_type, "dlm")) { if (lv->vg->lock_type && !strcmp(lv->vg->lock_type, "dlm") && cmd->lockd_lv_sh) {
if (!cluster_mirror_is_available(cmd)) { if (!cluster_mirror_is_available(cmd)) {
log_error("Shared cluster mirrors are not available."); log_error("Shared cluster mirrors are not available.");
return 0; return 0;

3
man/lvmlockd.8_main
View File

@ -826,6 +826,9 @@ using external origins for thin LVs
splitting mirrors and snapshots from LVs splitting mirrors and snapshots from LVs
.br .br
\[bu] \[bu]
pvmove of entire PVs, or under LVs activated with shared locks
.br
\[bu]
vgsplit vgsplit
.br .br
\[bu] \[bu]

40
tools/pvmove.c
View File

@ -480,7 +480,7 @@ static struct logical_volume *_set_up_pvmove_lv(struct cmd_context *cmd,
* If the VG is clustered, we are unable to handle * If the VG is clustered, we are unable to handle
* snapshots, origins, thin types, RAID or mirror * snapshots, origins, thin types, RAID or mirror
*/ */
if (vg_is_clustered(vg) && if ((vg_is_clustered(vg) || is_lockd_type(vg->lock_type)) &&
(lv_is_origin(lv) || lv_is_cow(lv) || (lv_is_origin(lv) || lv_is_cow(lv) ||
lv_is_thin_type(lv) || lv_is_raid_type(lv))) { lv_is_thin_type(lv) || lv_is_raid_type(lv))) {
log_print_unless_silent("Skipping %s LV %s", log_print_unless_silent("Skipping %s LV %s",
@ -692,6 +692,7 @@ static int _pvmove_setup_single(struct cmd_context *cmd,
struct dm_list *allocatable_pvs; struct dm_list *allocatable_pvs;
struct dm_list *lvs_changed; struct dm_list *lvs_changed;
struct logical_volume *lv_mirr; struct logical_volume *lv_mirr;
struct logical_volume *lv = NULL;
const char *pv_name = pv_dev_name(pv); const char *pv_name = pv_dev_name(pv);
unsigned flags = PVMOVE_FIRST_TIME; unsigned flags = PVMOVE_FIRST_TIME;
unsigned exclusive; unsigned exclusive;
@ -712,27 +713,32 @@ static int _pvmove_setup_single(struct cmd_context *cmd,
pp->setup_result = EINVALID_CMD_LINE; pp->setup_result = EINVALID_CMD_LINE;
return ECMD_FAILED; return ECMD_FAILED;
} }
if (!(lv = find_lv(vg, lv_name))) {
log_error("Failed to find LV with name %s", lv_name);
return ECMD_FAILED;
}
} }
/* /*
* We cannot move blocks from under the sanlock leases, so disallow * We would need to avoid any PEs used by LVs that are active (ex) on
* pvmoving any PVs used by the lvmlock LV. * other hosts. For LVs that are active on multiple hosts (sh), we
* would need to used cluster mirrors.
*/ */
if (vg->lock_type && !strcmp(vg->lock_type, "sanlock")) { if (is_lockd_type(vg->lock_type)) {
struct lv_segment *lvseg; if (!lv) {
struct physical_volume *sanlock_pv; log_error("pvmove in a shared VG requires a named LV.");
unsigned s; return ECMD_FAILED;
}
dm_list_iterate_items(lvseg, &vg->sanlock_lv->segments) { if (lv_is_lockd_sanlock_lv(lv)) {
for (s = 0; s < lvseg->area_count; s++) { log_error("pvmove not allowed on internal sanlock LV.");
if (seg_type(lvseg, s) == AREA_PV) { return ECMD_FAILED;
sanlock_pv = seg_pv(lvseg, s); }
if (sanlock_pv->dev == pv->dev) {
log_error("Cannot pvmove device %s used for sanlock leases.", pv_name); if (!lockd_lv(cmd, lv, "ex", LDLV_PERSISTENT)) {
return ECMD_FAILED; log_error("pvmove in a shared VG requires exclusive lock on named LV.");
} return ECMD_FAILED;
}
}
} }
} }