gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mgr/volumes: accept unit with subvolume resize

Browse Source 
Specifying the quota or resize for a subvolume requires the value in bytes.
This value can now be accepted as <num><unit>. Also allows floating point numbers.

Fixes: https://tracker.ceph.com/issues/62673
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
This commit is contained in:
Dhairya Parmar 2025-03-17 20:23:22 +05:30
parent 75a23253a2
commit efe11565b8
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py
View File

@ -371,7 +371,37 @@ class SubvolumeBase(object):
raise VolumeException(-errno.EINVAL,
"invalid fscrypt_file specified: '{0}'".format(fscrypt_file))
def convert_to_bytes(self, subvol_size):
import re
unit_map = {"B": 1,
"K": pow(1024, 1),
"M": pow(1024, 2),
"G": pow(1024, 3),
"T": pow(1024, 4),
"P": pow(1024, 5),
"E": pow(1024, 6)}
pattern = r'^(\d+\.\d+|\d+)([KMGTPE]i?B?|B)$'
match = re.match(pattern, subvol_size)
if match:
value = match.group(1)
unit = match.group(2)
if unit[0] == "B" and "." in value:
raise VolumeException(-errno.EINVAL,
f"Invalid byte value: {value}")
multiplier = unit_map.get(unit[0])
if multiplier is None:
raise VolumeException(-errno.EINVAL,
f"Invalid subvolume unit: {unit}")
else:
return float(value) * multiplier
else:
return None
def _resize(self, path, newsize, noshrink):
num = self.convert_to_bytes(newsize)
if num is not None:
newsize = num
try:
newsize = int(newsize)
if newsize <= 0: