Skip to content

Fix efidisk including discard=on #46

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

Open
jclab-joseph wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix efidisk including discard=on #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions proxmove
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ PROXMOX_VOLUME_TYPES = (
'efidisk', 'ide', 'sata', 'scsi', 'virtio')
PROXMOX_VOLUME_TYPES_RE = re.compile( # "scsi0", but not "scsihw"
r'^({})\d+$'.format('|'.join(PROXMOX_VOLUME_TYPES)))
PROXMOX_VOLUME_TYPES_EFIDISK_RE = re.compile(
r'^(efidisk)\d+$')
PROXMOVE_VOLUME_NAME_FMT = 'vm-{vmid}-disk-{diskidx}' # dst volume name


Expand Down Expand Up @@ -1598,6 +1600,10 @@ class ProxmoxVolume(object):
if not PROXMOX_VOLUME_TYPES_RE.match(slot):
return None

no_discard = False
if PROXMOX_VOLUME_TYPES_EFIDISK_RE.match(slot):
no_discard = True

# cluster = <...>
# node = 'pveX'
# slot = 'ide2', 'virtio0'
Expand All @@ -1623,12 +1629,13 @@ class ProxmoxVolume(object):
# Might raise exception if not found.
storage = cluster.get_storage(node, storage)

return ProxmoxVolume(location, properties, storage=storage)
return ProxmoxVolume(location, properties, storage=storage, no_discard=no_discard)

def __init__(self, location, properties, storage=None):
def __init__(self, location, properties, storage=None, no_discard=False):
self.location = location
self.properties = properties
self.storage = storage
self.no_discard = no_discard

def is_removable(self):
parts = self.properties.split(',')
Expand Down Expand Up @@ -1733,7 +1740,8 @@ class ProxmoxVolume(object):
log.info('Volume transferring/conversion 100% (is/was) complete!')
return ProxmoxVolume(
new_path, self.get_properties(format=new_format),
storage=new_storage)
storage=new_storage,
no_discard=self.no_discard)

def as_properties(self):
"""
Expand Down Expand Up @@ -1864,7 +1872,7 @@ class AddDiscardOnTranslator(object):
"""
props = super().volume_properties(new_volume)

if new_volume.storage and new_volume.storage.has_discard_support:
if not new_volume.no_discard and new_volume.storage and new_volume.storage.has_discard_support:
values = props.split(',')
name, rest = values[0], values[1:]
rest = [
Expand Down