diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-01-12 15:58:07 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-01-13 12:54:45 +0100 |
| commit | 0b6ee6a9121c688af491692cab65bd6f17cf49d0 (patch) | |
| tree | 79a7bd0d3075d38b0e58b490739e74926f9ddbb6 | |
| parent | a4c56a3bc342ab42fdfc9c9538b3fa7feba49412 (diff) | |
| download | lvm2-0b6ee6a9121c688af491692cab65bd6f17cf49d0.tar.gz | |
alloc: enhance estimation of sufficient_pes_free
Since commit 77fdc17d70e62cab75efaaf0dad02493b948610d always include
log_len size into needed extents - however now we may need sometimes
more extents then necessary - mainly when multiple PVs are involved
into allocation.
Add logs_still_needed into calculation of sufficient_pes_free()
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | lib/metadata/lv_manip.c | 10 |
2 files changed, 8 insertions, 3 deletions
@@ -1,5 +1,6 @@ Version 2.03.12 - =================================== + Fix corner case allocation for thin-pools. Version 2.03.11 - 08th January 2021 =================================== diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 70464362e..443d32c57 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -1850,11 +1850,13 @@ static uint32_t _mirror_log_extents(uint32_t region_size, uint32_t pe_size, uint /* Is there enough total space or should we give up immediately? */ static int _sufficient_pes_free(struct alloc_handle *ah, struct dm_list *pvms, - uint32_t allocated, uint32_t extents_still_needed) + uint32_t allocated, uint32_t log_still_needed, + uint32_t extents_still_needed) { uint32_t area_extents_needed = (extents_still_needed - allocated) * ah->area_count / ah->area_multiple; uint32_t parity_extents_needed = (extents_still_needed - allocated) * ah->parity_count / ah->area_multiple; - uint32_t metadata_extents_needed = ah->alloc_and_split_meta ? 0 : ah->metadata_area_count * RAID_METADATA_AREA_LEN + ah->log_len; /* One each */ + uint32_t metadata_extents_needed = (ah->alloc_and_split_meta ? 0 : ah->metadata_area_count * RAID_METADATA_AREA_LEN) + + (log_still_needed ? ah->log_len : 0); /* One each */ uint64_t total_extents_needed = (uint64_t)area_extents_needed + parity_extents_needed + metadata_extents_needed; uint32_t free_pes = pv_maps_size(pvms); @@ -3359,7 +3361,9 @@ static int _allocate(struct alloc_handle *ah, old_allocated = alloc_state.allocated; log_debug_alloc("Trying allocation using %s policy.", get_alloc_string(alloc)); - if (!ah->approx_alloc && !_sufficient_pes_free(ah, pvms, alloc_state.allocated, ah->new_extents)) + if (!ah->approx_alloc && !_sufficient_pes_free(ah, pvms, alloc_state.allocated, + alloc_state.log_area_count_still_needed, + ah->new_extents)) goto_out; _init_alloc_parms(ah, &alloc_parms, alloc, prev_lvseg, |