parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Ensure script cleanup is done in chroot

This commit is contained in:
Joshua Boniface 2023-11-16 18:27:23 -05:00
parent 712a50ca27
commit c1c22c81e7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api-daemon/pvcapid/vmbuilder.py
View File

@ -681,9 +681,15 @@ def create_vm(
def fail_clean(celery, msg, exception=ProvisioningError): def fail_clean(celery, msg, exception=ProvisioningError):
try: try:
vm_builder.cleanup() with chroot(temp_dir):
vm_builder.cleanup()
except Exception:
# We're already failing, do the best we can
pass
try:
general_cleanup() general_cleanup()
except Exception: except Exception:
# We're already failing, do the best we can
pass pass
fail(celery, msg, exception=exception) fail(celery, msg, exception=exception)