78da9a698d
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/lvm2.git#d2cc5b0434310d77f9ef21e3da5220677753e81e
108 lines
4.2 KiB
Diff
108 lines
4.2 KiB
Diff
lib/metadata/cache_manip.c | 40 ++++++++++++++--------------------------
|
|
lib/metadata/metadata-exported.h | 1 +
|
|
tools/lvconvert.c | 1 +
|
|
tools/lvcreate.c | 1 +
|
|
4 files changed, 17 insertions(+), 26 deletions(-)
|
|
|
|
diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c
|
|
index 2c4cc92..90ebd94 100644
|
|
--- a/lib/metadata/cache_manip.c
|
|
+++ b/lib/metadata/cache_manip.c
|
|
@@ -204,6 +204,7 @@ int update_cache_pool_params(struct cmd_context *cmd,
|
|
unsigned attr,
|
|
uint32_t pool_data_extents,
|
|
uint32_t *pool_metadata_extents,
|
|
+ struct logical_volume *metadata_lv,
|
|
int *chunk_size_calc_method, uint32_t *chunk_size)
|
|
{
|
|
uint64_t min_meta_size;
|
|
@@ -252,39 +253,26 @@ int update_cache_pool_params(struct cmd_context *cmd,
|
|
if (!validate_cache_chunk_size(cmd, *chunk_size))
|
|
return_0;
|
|
|
|
- min_meta_size = _cache_min_metadata_size((uint64_t) pool_data_extents * extent_size, *chunk_size);
|
|
+ if ((uint64_t) *chunk_size > (uint64_t) pool_data_extents * extent_size) {
|
|
+ log_error("Size of %s data volume cannot be smaller than chunk size %s.",
|
|
+ segtype->name, display_size(cmd, *chunk_size));
|
|
+ return 0;
|
|
+ }
|
|
|
|
- /* Round up to extent size */
|
|
- if (min_meta_size % extent_size)
|
|
- min_meta_size += extent_size - min_meta_size % extent_size;
|
|
+ min_meta_size = _cache_min_metadata_size((uint64_t) pool_data_extents * extent_size, *chunk_size);
|
|
+ min_meta_size = dm_round_up(min_meta_size, extent_size);
|
|
|
|
if (!pool_metadata_size)
|
|
pool_metadata_size = min_meta_size;
|
|
|
|
- if (pool_metadata_size > (2 * DEFAULT_CACHE_POOL_MAX_METADATA_SIZE)) {
|
|
- pool_metadata_size = 2 * DEFAULT_CACHE_POOL_MAX_METADATA_SIZE;
|
|
- if (*pool_metadata_extents)
|
|
- log_warn("WARNING: Maximum supported pool metadata size is %s.",
|
|
- display_size(cmd, pool_metadata_size));
|
|
- } else if (pool_metadata_size < min_meta_size) {
|
|
- if (*pool_metadata_extents)
|
|
- log_warn("WARNING: Minimum required pool metadata size is %s "
|
|
- "(needs extra %s).",
|
|
- display_size(cmd, min_meta_size),
|
|
- display_size(cmd, min_meta_size - pool_metadata_size));
|
|
- pool_metadata_size = min_meta_size;
|
|
- }
|
|
-
|
|
- if (!(*pool_metadata_extents =
|
|
- extents_from_size(cmd, pool_metadata_size, extent_size)))
|
|
+ if (!update_pool_metadata_min_max(cmd, extent_size,
|
|
+ min_meta_size,
|
|
+ (2 * DEFAULT_CACHE_POOL_MAX_METADATA_SIZE),
|
|
+ &pool_metadata_size,
|
|
+ metadata_lv,
|
|
+ pool_metadata_extents))
|
|
return_0;
|
|
|
|
- if ((uint64_t) *chunk_size > (uint64_t) pool_data_extents * extent_size) {
|
|
- log_error("Size of %s data volume cannot be smaller than chunk size %s.",
|
|
- segtype->name, display_size(cmd, *chunk_size));
|
|
- return 0;
|
|
- }
|
|
-
|
|
log_verbose("Preferred pool metadata size %s.",
|
|
display_size(cmd, (uint64_t)*pool_metadata_extents * extent_size));
|
|
|
|
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
|
|
index 0e57722..c0fa564 100644
|
|
--- a/lib/metadata/metadata-exported.h
|
|
+++ b/lib/metadata/metadata-exported.h
|
|
@@ -1319,6 +1319,7 @@ int update_cache_pool_params(struct cmd_context *cmd,
|
|
unsigned attr,
|
|
uint32_t pool_data_extents,
|
|
uint32_t *pool_metadata_extents,
|
|
+ struct logical_volume *metadata_lv,
|
|
int *chunk_size_calc_method, uint32_t *chunk_size);
|
|
int validate_lv_cache_chunk_size(struct logical_volume *pool_lv, uint32_t chunk_size);
|
|
int validate_lv_cache_create_pool(const struct logical_volume *pool_lv);
|
|
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
|
|
index ce90279..416e8a7 100644
|
|
--- a/tools/lvconvert.c
|
|
+++ b/tools/lvconvert.c
|
|
@@ -3189,6 +3189,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd,
|
|
pool_segtype, target_attr,
|
|
lv->le_count,
|
|
&meta_extents,
|
|
+ metadata_lv,
|
|
&chunk_calc,
|
|
&chunk_size))
|
|
goto_bad;
|
|
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
|
|
index 1ee9e14..1ce561f 100644
|
|
--- a/tools/lvcreate.c
|
|
+++ b/tools/lvcreate.c
|
|
@@ -403,6 +403,7 @@ static int _update_extents_params(struct volume_group *vg,
|
|
lp->segtype, lp->target_attr,
|
|
lp->extents,
|
|
&lp->pool_metadata_extents,
|
|
+ NULL,
|
|
&lp->thin_chunk_size_calc_policy,
|
|
&lp->chunk_size))
|
|
return_0;
|