11#!/usr/bin/python
2+ # Assisted by OpenCode using model GPT-6.1 Sol
23from __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):
23302338def 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 ,
0 commit comments