ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

lvol - bug fix - Convert units to lowercase when using LVS or VGS command (#2369)

Browse source 
* Added lower call for units when checking lvs/vgs size

* Changelog

* Size roudning correction

* Rounding

* Changelog

* Remove whitespace
This commit is contained in:
zigaSRC 2021-05-03 21:25:52 +02:00 committed by GitHub
parent 7007c68ab7
commit 06bdabcad9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/2369-lvol_size_bug_fixes.yml Normal file
View file

@ -0,0 +1,3 @@
bugfixes:
- lvol - fixed size unit capitalization to match units used between different tools for comparison (https://github.com/ansible-collections/community.general/issues/2360).
- lvol - fixed rounding errors (https://github.com/ansible-collections/community.general/issues/2370).

13
plugins/modules/system/lvol.py
View file

@ -389,7 +389,7 @@ def main():
# Get information on volume group requested # Get information on volume group requested
vgs_cmd = module.get_bin_path("vgs", required=True) vgs_cmd = module.get_bin_path("vgs", required=True)
rc, current_vgs, err = module.run_command( rc, current_vgs, err = module.run_command(
"%s --noheadings --nosuffix -o vg_name,size,free,vg_extent_size --units %s --separator ';' %s" % (vgs_cmd, unit, vg)) "%s --noheadings --nosuffix -o vg_name,size,free,vg_extent_size --units %s --separator ';' %s" % (vgs_cmd, unit.lower(), vg))
if rc != 0: if rc != 0:
if state == 'absent': if state == 'absent':
@ -403,7 +403,7 @@ def main():
# Get information on logical volume requested # Get information on logical volume requested
lvs_cmd = module.get_bin_path("lvs", required=True) lvs_cmd = module.get_bin_path("lvs", required=True)
rc, current_lvs, err = module.run_command( rc, current_lvs, err = module.run_command(
"%s -a --noheadings --nosuffix -o lv_name,size,lv_attr --units %s --separator ';' %s" % (lvs_cmd, unit, vg)) "%s -a --noheadings --nosuffix -o lv_name,size,lv_attr --units %s --separator ';' %s" % (lvs_cmd, unit.lower(), vg))
if rc != 0: if rc != 0:
if state == 'absent': if state == 'absent':
@ -505,16 +505,13 @@ def main():
else: # size_whole == 'FREE': else: # size_whole == 'FREE':
size_requested = size_percent * this_vg['free'] / 100 size_requested = size_percent * this_vg['free'] / 100
# from LVEXTEND(8) - The resulting value is rounded upward.
# from LVREDUCE(8) - The resulting value for the substraction is rounded downward, for the absolute size it is rounded upward.
if size_operator == '+': if size_operator == '+':
size_requested += this_lv['size'] size_requested += this_lv['size']
size_requested += this_vg['ext_size'] - (size_requested % this_vg['ext_size'])
elif size_operator == '-': elif size_operator == '-':
size_requested = this_lv['size'] - size_requested size_requested = this_lv['size'] - size_requested
size_requested -= (size_requested % this_vg['ext_size'])
else: # According to latest documentation (LVM2-2.03.11) all tools round down
size_requested += this_vg['ext_size'] - (size_requested % this_vg['ext_size']) size_requested -= (size_requested % this_vg['ext_size'])
if this_lv['size'] < size_requested: if this_lv['size'] < size_requested:
if (size_free > 0) and (size_free >= (size_requested - this_lv['size'])): if (size_free > 0) and (size_free >= (size_requested - this_lv['size'])):