openstack/diskimage-builder
Code Issues Proposed changes

Merge "Add block device rollback for lvm volumes and groups"

Browse Source
This commit is contained in:
Zuul 2024-09-05 18:04:15 +00:00 committed by Gerrit Code Review
commit 4b90051ce9
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
diskimage_builder/block_device/level1/lvm.py
View File

@ -20,7 +20,6 @@ from diskimage_builder.block_device.plugin import NodeBase
from diskimage_builder.block_device.plugin import PluginBase from diskimage_builder.block_device.plugin import PluginBase
from diskimage_builder.block_device.utils import exec_sudo from diskimage_builder.block_device.utils import exec_sudo
from diskimage_builder.block_device.utils import parse_abs_size_spec from diskimage_builder.block_device.utils import parse_abs_size_spec
from diskimage_builder.block_device.utils import remove_device
PHYSICAL_EXTENT_BYTES = parse_abs_size_spec('4MiB') PHYSICAL_EXTENT_BYTES = parse_abs_size_spec('4MiB')
LVS_TYPES = ['thin', 'thin-pool'] LVS_TYPES = ['thin', 'thin-pool']
@ -70,6 +69,27 @@ logger = logging.getLogger(__name__)
# call that is driven by the LVSNode object. # call that is driven by the LVSNode object.
def lvremove(device_name):
logger.debug('Removing logical volume %s', device_name)
try:
exec_sudo(["lvchange", "--activate", "n", device_name])
exec_sudo(["lvremove", "--yes", "/dev/%s" % device_name])
except BlockDeviceSetupException as e:
# Do not raise an error - maybe other cleanup methods
# can at least do some more work.
logger.warning("Removing logical volume failed (%s)", e.returncode)
def vgremove(vg_name):
logger.debug('Removing volume group %s', vg_name)
try:
exec_sudo(["vgremove", "--yes", "--force", vg_name])
except BlockDeviceSetupException as e:
# Do not raise an error - maybe other cleanup methods
# can at least do some more work.
logger.warning("Removing volume group failed (%s)", e.returncode)
class PvsNode(NodeBase): class PvsNode(NodeBase):
def __init__(self, name, state, base, options): def __init__(self, name, state, base, options):
"""Physical volume """Physical volume
@ -150,6 +170,7 @@ class VgsNode(NodeBase):
logger.debug("Creating vg command [%s]", cmd) logger.debug("Creating vg command [%s]", cmd)
exec_sudo(cmd) exec_sudo(cmd)
self.add_rollback(vgremove, self.name)
# save state # save state
if 'vgs' not in self.state: if 'vgs' not in self.state:
self.state['vgs'] = {} self.state['vgs'] = {}
@ -232,7 +253,7 @@ class LvsNode(NodeBase):
'opts': self.options, 'opts': self.options,
'device': '/dev/mapper/%s' % device_name 'device': '/dev/mapper/%s' % device_name
} }
self.add_rollback(remove_device, device_name) self.add_rollback(lvremove, "%s/%s" % (self.base, self.name))
def _umount(self): def _umount(self):
exec_sudo(['lvchange', '-an', exec_sudo(['lvchange', '-an',