Skip to content

Commit 022df68

Browse files
committed
fix: resize existing encrypted volumes through their backing devices
Refresh LUKS and filesystem size information and pass backing-volume targets to Blivet's native resize planner. Infer omitted sizes in the same domain and reject unsupported mismatches instead of silently ignoring them. Only LUKS create/destroy format actions should update crypttab; resize and configure actions must not be treated as removals. Document encrypted size semantics and add focused regressions and a full-role LUKS2/XFS test covering exact sizes, percentages, check mode and preservation. Assisted-by: OpenCode using GPT-6.1 Sol (OpenAI) Signed-off-by: Bata Roland Krisztián <batarolandkrisztian@gmail.com>
1 parent b77f298 commit 022df68

7 files changed

Lines changed: 629 additions & 30 deletions

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,10 @@ variables:
193193

194194
- `size`
195195

196-
The `size` specifies the size of the file system. The format for this is intended to
196+
The `size` specifies the size of the volume. For an encrypted volume, this
197+
includes the encryption metadata; the usable file system is smaller.
198+
Creation and resizing use the same backing-volume size.
199+
The format for this is intended to
197200
be human-readable, e.g.: "10g", "50 GiB". The size of LVM volumes can be specified as a
198201
percentage of the pool/VG size, eg: "50%" as of v1.4.2.
199202

‎library/blivet.py‎

Lines changed: 38 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/python
2+
# Assisted by OpenCode using model GPT-6.1 Sol
23
from __future__ import absolute_import, division, print_function
34

45
__metaclass__ = type
@@ -696,7 +697,7 @@ def _update_from_device(self, param_name):
696697
luks_fmt = self._device.format
697698

698699
if param_name == 'size':
699-
self._volume['size'] = int(self._device.size.convert_to())
700+
self._volume['size'] = int(self._device.raw_device.size.convert_to())
700701
elif param_name == 'fs_type' and (self._device.format.type or self._device.format.name != get_format(None).name):
701702
self._volume['fs_type'] = self._device.format.type
702703
elif param_name == 'fs_label':
@@ -795,41 +796,51 @@ def _manage_cache(self):
795796
def _resize(self):
796797
""" Schedule actions as needed to ensure the device has the desired size. """
797798
size = self._get_size()
799+
# Match creation: size describes the backing volume, not the LUKS payload.
800+
device = self._device.raw_device
798801

799-
if size and self._device.size != size:
802+
if size and device.size != size:
803+
if device != self._device:
804+
# LUKS resizability depends on size information for both layers.
805+
device.format.update_size_info()
800806
try:
801807
self._device.format.update_size_info()
802808
except AttributeError:
803809
# Error handling is done next.
804810
pass
805811

806-
if not self._device.resizable:
807-
return
808-
809-
if size > self._device.size:
810-
trim_percent = abs((1.0 - float(self._device.max_size / size)) * 100)
811-
log.debug("resize: size=%s->%s ; trim=%s", self._device.size, size, trim_percent)
812-
if size > self._device.max_size and trim_percent <= MAX_TRIM_PERCENT:
812+
if not device.resizable or not self._device.resizable:
813+
raise BlivetAnsibleError("volume '%s' cannot be resized from %s to %s" %
814+
(self._volume['name'], device.size, size))
815+
816+
# Keep filesystem limits in the same size domain as the raw target.
817+
metadata_size = device.size - self._device.size
818+
min_size = max(device.min_size, self._device.min_size + metadata_size)
819+
max_size = min(device.max_size, self._device.max_size + metadata_size)
820+
if size > device.size:
821+
trim_percent = abs((1.0 - float(max_size / size)) * 100)
822+
log.debug("resize: size=%s->%s ; trim=%s", device.size, size, trim_percent)
823+
if size > max_size and trim_percent <= MAX_TRIM_PERCENT:
813824
log.info("adjusting %s resize target from %s to %s to fit in free space",
814825
self._volume['name'],
815826
size,
816-
self._device.max_size)
817-
size = self._device.max_size
818-
if size == self._device.size:
827+
max_size)
828+
size = max_size
829+
if size == device.size:
819830
return
820-
elif size < self._device.size:
821-
trim_percent = abs((1.0 - float(self._device.min_size / size)) * 100)
822-
log.debug("resize: size=%s->%s ; trim=%s", self._device.size, size, trim_percent)
823-
if size < self._device.min_size and trim_percent <= MAX_TRIM_PERCENT:
831+
elif size < device.size:
832+
trim_percent = abs((1.0 - float(min_size / size)) * 100)
833+
log.debug("resize: size=%s->%s ; trim=%s", device.size, size, trim_percent)
834+
if size < min_size and trim_percent <= MAX_TRIM_PERCENT:
824835
log.info("adjusting %s resize target from %s to %s match device min size",
825836
self._volume['name'],
826837
size,
827-
self._device.min_size)
828-
size = self._device.min_size
829-
if size == self._device.size:
838+
min_size)
839+
size = min_size
840+
if size == device.size:
830841
return
831842

832-
if not self._device.min_size <= size <= self._device.max_size:
843+
if not min_size <= size <= max_size:
833844
raise BlivetAnsibleError("volume '%s' cannot be resized to '%s'" % (self._volume['name'], size))
834845

835846
def _fs_unmount():
@@ -846,15 +857,15 @@ def _fs_unmount():
846857

847858
if self._device.format.status and self._device.format.mountable:
848859
if hasattr(self._device.format, "_resize_support") and hasattr(fslib, "FSResize"):
849-
if size > self._device.size:
860+
if size > device.size:
850861
# online grow
851862
if self._device.format._resize_support & fslib.FSResize.ONLINE_GROW:
852863
log.debug("filesystem '%s' supports online grow, will attempt to resize '%s' while mounted",
853864
self._device.format.type, self._device.name)
854865
else:
855866
# online grow not supported, try unmount the device
856867
_fs_unmount()
857-
elif size < self._device.size:
868+
elif size < device.size:
858869
# online shrink
859870
if self._device.format._resize_support & fslib.FSResize.ONLINE_SHRINK:
860871
log.debug("filesystem '%s' supports online shrink, will attempt to resize '%s' while mounted",
@@ -867,13 +878,10 @@ def _fs_unmount():
867878
_fs_unmount()
868879

869880
try:
870-
self._blivet.resize_device(self._device, size)
881+
self._blivet.resize_device(device, size)
871882
except ValueError as e:
872-
raise BlivetAnsibleError("volume '%s' cannot be resized from %s to %s: %s" % (self._device.name,
873-
self._device.size,
874-
size, str(e)))
875-
elif size and self._device.exists and self._device.size != size and not self._device.resizable:
876-
raise BlivetAnsibleError("volume '%s' cannot be resized from %s to %s" % (self._device.name, self._device.size, size))
883+
raise BlivetAnsibleError("volume '%s' cannot be resized from %s to %s: %s" %
884+
(self._device.name, device.size, size, str(e)))
877885

878886
def _reformat(self):
879887
""" Schedule actions as needed to ensure the volume is formatted as specified. """
@@ -2330,7 +2338,8 @@ def mount_fstype(volume):
23302338
def get_crypt_info(actions):
23312339
info = list()
23322340
for action in actions:
2333-
if not (action.is_format and action.format.type == 'luks'):
2341+
if not (action.is_format and action.format.type == 'luks'
2342+
and (action.is_create or action.is_destroy)):
23342343
continue
23352344

23362345
info.append(dict(backing_device=action.device.path,
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
# Assisted by OpenCode using model GPT-6.1 Sol
3+
- name: Gather the interpreter fact after expected role failures clear facts
4+
ansible.builtin.setup:
5+
gather_subset:
6+
- "!all"
7+
- "!min"
8+
- python
9+
10+
- name: Read exact LV, mapper, XFS and encryption state
11+
ansible.builtin.command:
12+
argv:
13+
- "{{ ansible_facts['python']['executable'] }}"
14+
- -c
15+
- |
16+
from __future__ import print_function
17+
import hashlib
18+
import json
19+
import re
20+
import subprocess
21+
import sys
22+
raw, mapped, mount = sys.argv[1:]
23+
def run(*args):
24+
return subprocess.check_output(args).decode().strip()
25+
metadata = json.loads(run("cryptsetup", "luksDump",
26+
"--dump-json-metadata", raw))
27+
offset = int(metadata["segments"]["0"]["offset"])
28+
with open(raw, "rb") as stream:
29+
header = hashlib.sha256(stream.read(offset)).hexdigest()
30+
with open(mount + "/sentinel", "rb") as stream:
31+
sentinel = hashlib.sha256(stream.read()).hexdigest()
32+
geometry = re.search(r"data\s*=\s*bsize=(\d+)\s+blocks=(\d+)",
33+
run("xfs_info", mount))
34+
print(json.dumps(dict(
35+
raw_bytes=int(run("blockdev", "--getsize64", raw)),
36+
mapper_bytes=int(run("blockdev", "--getsize64", mapped)),
37+
fs_bytes=int(geometry.group(1)) * int(geometry.group(2)),
38+
offset=offset, header_sha256=header,
39+
metadata_sha256=hashlib.sha256(
40+
json.dumps(metadata, sort_keys=True).encode()).hexdigest(),
41+
uuid=run("blkid", "-s", "UUID", "-o", "value", mapped),
42+
lv_uuid=run("lvs", "--noheadings", "-o", "lv_uuid", raw),
43+
sentinel_sha256=sentinel)))
44+
- "{{ storage_test_resize_raw }}"
45+
- "/dev/mapper/{{ storage_test_resize_mapper }}"
46+
- "{{ storage_test_resize_mount }}"
47+
register: storage_test_resize_state_command
48+
changed_when: false
49+
check_mode: false
50+
51+
- name: Store credential-free size snapshot
52+
ansible.builtin.set_fact:
53+
storage_test_resize_state: "{{ storage_test_resize_state_command.stdout | from_json }}"
54+
55+
- name: Verify the entire mapper and filesystem fill the LV payload
56+
ansible.builtin.assert:
57+
that:
58+
- storage_test_resize_state.mapper_bytes ==
59+
storage_test_resize_state.raw_bytes - storage_test_resize_state.offset
60+
- storage_test_resize_state.fs_bytes == storage_test_resize_state.mapper_bytes

0 commit comments

Comments
 (0)