1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00

Patch to fix bug 586021 and mantain historical behavior of

being able to remove more images from a mirror than the
number of PVs directly specified for removal.

The effort to fix bug 581611 corrected a bug that was unnoticed
at the time.  The loop in _remove_mirror_images that looks over
the specified PVs was allowing devices that were previously
counted and moved to the end of the list to be double-counted.
This resulted in the number of devices needed for removal always
being satisfied - even if the user did not specify enough PVs
for removal to satisfy the request.  When 581611 was fixed, this
double-counting no longer took place and the result was to remove
only the minimum of the number of PVs specified or the number
that was asked to be removed.

By simply always setting 'new_area_count' (as used to be done
only in the else statement), we return to the previous behavior.
Indeed, this is exactly what the double-counting was allowing
to happen before the fix of 581611.
This commit is contained in:
Jonathan Earl Brassow 2010-04-27 14:57:49 +00:00
parent b9c4fc2498
commit d7c9d72390
2 changed files with 10 additions and 2 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.64 -
=================================
Fix regression in down-convert of mirror images with partial PV specification.
Fix lvconvert error message when existing mirrored LV is not found.
Disallow the direct removal of a merging snapshot.
Set appropriate udev flags for reserved LVs.

View File

@ -805,7 +805,14 @@ static int _remove_mirror_images(struct logical_volume *lv,
}
if (num_removed && old_area_count == new_area_count)
return 1;
} else
}
/*
* If removable_pvs were specified, then they have been shifted
* to the end to ensure they are removed. The remaining balance
* of images left to remove will be taken from the unspecified.
* This may not be correct behavior, but it is historical.
*/
new_area_count = old_area_count - num_removed;
/* Remove mimage LVs from the segment */