mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Call explicitly suspend for temporary mirror layer.
The memlock_inc() fix is wrong, memlock count is not propagated to long living process (clvmd) and just it underflow there. Also suspend is needed to pre-load precommited metadata on other nodes (remapping to error taget in this case). With explicit suspend we generate lock request and code can update memlock count. (Infinitely "locked" memory caused that fs_unlock() was not called properly and on cluster nodes remains old links in /dev/mapper for not active devices.) (N.B. failing of suspend call here is not handled as fatal error - the LV is going to be removed later anyway.)
This commit is contained in:
parent
adee669441
commit
34de60e4d4
@ -1,5 +1,6 @@
|
||||
Version 2.02.57 -
|
||||
====================================
|
||||
Explicitly call suspend for temporary mirror layer.
|
||||
Allow use precommited metadata when a PV is missing.
|
||||
Add memlock information to do_lock_lv debug output.
|
||||
Never use distributed lock for LV in non-clustered VG.
|
||||
|
@ -603,6 +603,16 @@ static int _remove_mirror_images(struct logical_volume *lv,
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* FIXME: second suspend should not be needed
|
||||
* Explicitly suspend temporary LV
|
||||
* This balance memlock_inc() calls with memlock_dec() in resume
|
||||
* (both localy and in cluster) and also properly propagates precommited
|
||||
* metadata into dm table on other nodes.
|
||||
* (visible flag set causes the suspend is not properly propagated?)
|
||||
*/
|
||||
if (temp_layer_lv && !suspend_lv(temp_layer_lv->vg->cmd, temp_layer_lv))
|
||||
log_error("Problem suspending temporary LV %s", temp_layer_lv->name);
|
||||
|
||||
if (!vg_commit(mirrored_seg->lv->vg)) {
|
||||
resume_lv(mirrored_seg->lv->vg->cmd, mirrored_seg->lv);
|
||||
return 0;
|
||||
@ -616,23 +626,9 @@ static int _remove_mirror_images(struct logical_volume *lv,
|
||||
* As it's now detached from mirrored_seg->lv we must resume it
|
||||
* explicitly.
|
||||
*/
|
||||
if (temp_layer_lv) {
|
||||
if (!resume_lv(temp_layer_lv->vg->cmd, temp_layer_lv)) {
|
||||
log_error("Problem resuming temporary LV, %s", temp_layer_lv->name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* The code above calls a suspend_lv once, however we now need
|
||||
* to resume 2 LVs, due to image removal: the mirror image
|
||||
* itself here, and now the remaining mirror LV. Since
|
||||
* suspend_lv/resume_lv call memlock_inc/memlock_dec and these
|
||||
* need to be balanced, we need to call an extra memlock_inc()
|
||||
* here to balance for the this extra resume -- the following
|
||||
* one could otherwise either deadlock due to suspended
|
||||
* devices, or alternatively drop memlock_count below 0.
|
||||
*/
|
||||
memlock_inc();
|
||||
if (temp_layer_lv && !resume_lv(temp_layer_lv->vg->cmd, temp_layer_lv)) {
|
||||
log_error("Problem resuming temporary LV, %s", temp_layer_lv->name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!resume_lv(mirrored_seg->lv->vg->cmd, mirrored_seg->lv)) {
|
||||
|
Loading…
Reference in New Issue
Block a user