parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 15 Pull Requests Projects Releases 106 Wiki Activity

Handle non-RBD disks and non-RBD errors better

This commit is contained in:
Joshua Boniface 2021-07-09 15:48:57 -04:00
parent 2138f2f59f
commit 4832245d9c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemon-common/vm.py
View File

@ -455,10 +455,17 @@ def remove_vm(zkhandler, domain):
# Remove disks # Remove disks
for disk in disk_list: for disk in disk_list:
# vmpool/vmname_volume # vmpool/vmname_volume
disk_pool, disk_name = disk.split('/') try:
disk_pool, disk_name = disk.split('/')
except ValueError:
continue
retcode, message = ceph.remove_volume(zkhandler, disk_pool, disk_name) retcode, message = ceph.remove_volume(zkhandler, disk_pool, disk_name)
if not retcode: if not retcode:
return False, message if re.match('^ERROR: No volume with name', message):
continue
else:
return False, message
# Gracefully terminate the class instances # Gracefully terminate the class instances
change_state(zkhandler, dom_uuid, 'delete') change_state(zkhandler, dom_uuid, 'delete')