diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2022-05-31 22:48:38 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2022-06-07 17:14:08 +0200 |
| commit | 1b070f366ba57a6eb24df03241284732db5047e9 (patch) | |
| tree | 3318b759bf5c76d436888f96de1433ea36c6b9cf /scripts | |
| parent | c302903dbab1d5fd05b344c654bed83c9ecb69f8 (diff) | |
| download | lvm2-1b070f366ba57a6eb24df03241284732db5047e9.tar.gz | |
vdo: fix conversion of vdo_slab_size_mb
When converting VDO volume, the parameter vdo_slabSize was
incorrectly copied as vdo_blockMapCacheSize, however this parameter
is then no longer used for any table line creation so the wrong
value was only stored in metadata.
Also use just single get_kb_size_with_unit_ and remove it's duplicate
functionality with get_mb_size_with_unit_.
Use $VERB for vdo remove call.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/lvm_import_vdo.sh | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/scripts/lvm_import_vdo.sh b/scripts/lvm_import_vdo.sh index d01766743..c10b3b050 100755 --- a/scripts/lvm_import_vdo.sh +++ b/scripts/lvm_import_vdo.sh @@ -125,15 +125,6 @@ get_kb_size_with_unit_() { esac } -get_mb_size_with_unit_() { - case "$1" in - *[mM]) echo $(( ${1%[mM]} )) ;; - *[gG]) echo $(( ${1%[gG]} * 1024 )) ;; - *[tT]) echo $(( ${1%[tT]} * 1024 * 1024 )) ;; - *[pP]) echo $(( ${1%[pP]} * 1024 * 1024 * 1024 )) ;; - esac -} - # Figure out largest possible extent size usable for VG # $1 physical size # $2 logical size @@ -328,12 +319,12 @@ allocation { vdo_use_deduplication = $(get_enabled_value_ "$vdo_deduplication") vdo_use_metadata_hints=1 vdo_minimum_io_size = $vdo_logicalBlockSize - vdo_block_map_cache_size_mb = $(get_mb_size_with_unit_ "$vdo_blockMapCacheSize") + vdo_block_map_cache_size_mb = $(( $(get_kb_size_with_unit_ "$vdo_blockMapCacheSize") / 1024 )) vdo_block_map_period = $vdo_blockMapPeriod vdo_check_point_frequency = $vdo_indexCfreq vdo_use_sparse_index = $(get_enabled_value_ "$vdo_indexSparse") vdo_index_memory_size_mb = $(awk "BEGIN {print $vdo_indexMemory * 1024}") - vdo_slab_size_mb = $(get_mb_size_with_unit_ "$vdo_blockMapCacheSize") + vdo_slab_size_mb = $(( $(get_kb_size_with_unit_ "$vdo_blockMapCacheSize") / 1024 )) vdo_ack_threads = $vdo_ackThreads vdo_bio_threads = $vdo_bioThreads vdo_bio_rotation = $vdo_bioRotationInterval @@ -417,7 +408,7 @@ EOF # Note: that this is spelled OPPOSITE the other $IS_LV checks. if [ "$IS_LV" = "1" ]; then verbose "Removing now-unused VDO entry from VDO config." - dry "$VDO" remove $VDOCONF --force --verbose --name "$VDONAME" + dry "$VDO" remove $VDOCONF $VERB --force --name "$VDONAME" fi rm -fr "$TEMPDIR" |