Skip to content

fix: Allow small size differences to match the device min size #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vojtechtrefny merged 2 commits into from
May 16, 2025
Merged

fix: Allow small size differences to match the device min size #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c254097
fix: Allow small size differences to match the device min size
vojtechtrefny May 7, 2025
8efa482
tests: Add tests for size trim when resizing and XFS resize tests
vojtechtrefny May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions library/blivet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,16 +785,28 @@
if not self._device.resizable:
return

trim_percent = (1.0 - float(self._device.max_size / size)) * 100
log.debug("resize: size=%s->%s ; trim=%s", self._device.size, size, trim_percent)
if size > self._device.max_size and trim_percent <= MAX_TRIM_PERCENT:
log.info("adjusting %s resize target from %s to %s to fit in free space",
self._volume['name'],
size,
self._device.max_size)
size = self._device.max_size
if size == self._device.size:
return
if size > self._device.size:
trim_percent = abs((1.0 - float(self._device.max_size / size)) * 100)
log.debug("resize: size=%s->%s ; trim=%s", self._device.size, size, trim_percent)
if size > self._device.max_size and trim_percent <= MAX_TRIM_PERCENT:
log.info("adjusting %s resize target from %s to %s to fit in free space",

Check warning on line 792 in library/blivet.py

View check run for this annotation

Codecov / codecov/patch

library/blivet.py#L788-L792 

Added lines #L788 - L792 were not covered by tests
self._volume['name'],
size,
self._device.max_size)
size = self._device.max_size
if size == self._device.size:
return
elif size < self._device.size:
trim_percent = abs((1.0 - float(self._device.min_size / size)) * 100)
log.debug("resize: size=%s->%s ; trim=%s", self._device.size, size, trim_percent)
if size < self._device.min_size and trim_percent <= MAX_TRIM_PERCENT:
log.info("adjusting %s resize target from %s to %s match device min size",

Check warning on line 803 in library/blivet.py

View check run for this annotation

Codecov / codecov/patch

library/blivet.py#L796-L803 

Added lines #L796 - L803 were not covered by tests
self._volume['name'],
size,
self._device.min_size)
size = self._device.min_size
if size == self._device.size:
return

Check warning on line 809 in library/blivet.py

View check run for this annotation

Codecov / codecov/patch

library/blivet.py#L807-L809 

Added lines #L807 - L809 were not covered by tests

if not self._device.min_size <= size <= self._device.max_size:
raise BlivetAnsibleError("volume '%s' cannot be resized to '%s'" % (self._volume['name'], size))
Expand Down
137 changes: 137 additions & 0 deletions tests/tests_resize.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
invalid_size2: none
unused_disk_subfact: '{{ ansible_devices[unused_disks[0]] }}'
too_large_size: '{{ unused_disk_subfact.sectors | int * 1.2 * 512 }}'
acc_large_size: '{{ unused_disk_subfact.sectors | int * 1.015 * 512 }}'
acc_small_size: '{{ unused_disk_subfact.sectors | int * 0.985 * 512 }}'
disk_size: '{{ unused_disk_subfact.sectors | int * 512 }}'
tags:
- tests::lvm
Expand Down Expand Up @@ -129,6 +131,26 @@
- name: Verify role results
include_tasks: verify-role-results.yml

- name: Test for correct handling of acceptable size difference (slightly bigger than max)
block:
- name: >-
Try to resize LVM volume size to disk size + 1.5 % (less than 2 % than
maximum size should be tolerated)
include_role:
name: linux-system-roles.storage
vars:
storage_pools:
- name: foo
disks: "{{ unused_disks }}"
volumes:
- name: test1
fs_type: ext4
size: "{{ acc_large_size }}"
mount_point: "{{ mount_location }}"

- name: Verify role results
include_tasks: verify-role-results.yml

- name: Test for correct handling of invalid size specification
include_tasks: verify-role-failed.yml
vars:
Expand Down Expand Up @@ -428,3 +450,118 @@

- name: Verify role results
include_tasks: verify-role-results.yml

# For XFS

- name: Test xfs
block:
- name: Run test on supported platforms
when: ((is_fedora and blivet_pkg_version is version("3.12.1-3", ">=")) or
Copy link
Copy Markdown
Collaborator Author

@vojtechtrefny vojtechtrefny May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This version is not yet available, keeping the PR as draft for now.

Copy link
Copy Markdown
Collaborator Author

@vojtechtrefny vojtechtrefny May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

python-blivet-3.12.1-3 is now available in rawhide and should be available in F42 repos soon.

(is_rhel8 and blivet_pkg_version is version("3.4.0-1", ">=")) or
is_rhel9 or is_rhel10)
block:
- name: >-
Create a LVM logical volume with for XFS size
{{ volume_size_before }}
include_role:
name: linux-system-roles.storage
vars:
storage_pools:
- name: foo
type: lvm
disks: "{{ unused_disks }}"
volumes:
- name: test1
fs_type: xfs
size: "{{ volume_size_before }}"
mount_point: "{{ mount_location }}"

- name: Verify role results
include_tasks: verify-role-results.yml

- name: Change volume size to {{ volume_size_after }}
include_role:
name: linux-system-roles.storage
vars:
storage_pools:
- name: foo
type: lvm
disks: "{{ unused_disks }}"
volumes:
- name: test1
fs_type: xfs
size: "{{ volume_size_after }}"
mount_point: "{{ mount_location }}"

- name: Verify role results
include_tasks: verify-role-results.yml

- name: Repeat for idempotency test
include_role:
name: linux-system-roles.storage
vars:
storage_pools:
- name: foo
type: lvm
disks: "{{ unused_disks }}"
volumes:
- name: test1
fs_type: xfs
size: "{{ volume_size_after }}"
mount_point: "{{ mount_location }}"

- name: Verify role results
include_tasks: verify-role-results.yml

- name: Test for correct handling of shrinking (not supported by XFS)
include_tasks: verify-role-failed.yml
vars:
__storage_failed_regex: volume.+cannot be resized.+
__storage_failed_msg: >-
Unexpected behavior w/ invalid volume size
__storage_failed_params:
storage_pools:
- name: foo
disks: "{{ unused_disks }}"
volumes:
- name: test1
fs_type: xfs
size: "{{ volume_size_before }}"
mount_point: "{{ mount_location }}"

- name: Test for correct handling of acceptable size difference (slightly smaller than min)
block:
- name: >-
Try to resize LVM volume size to disk size - 1.5 % (less than 2 % than
minimum size should be tolerated)
include_role:
name: linux-system-roles.storage
vars:
storage_pools:
- name: foo
disks: "{{ unused_disks }}"
volumes:
- name: test1
fs_type: xfs
size: "{{ acc_small_size }}"
mount_point: "{{ mount_location }}"

- name: Verify role results
include_tasks: verify-role-results.yml

always:
- name: Clean up
include_role:
name: linux-system-roles.storage
vars:
storage_pools:
- name: foo
disks: "{{ unused_disks }}"
state: absent
volumes:
- name: test1
size: "{{ volume_size_before }}"
mount_point: "{{ mount_location }}"

- name: Verify role results
include_tasks: verify-role-results.yml
Loading