zuul/nodepool
Code Issues Proposed changes

Fix exception in image cleanup

Browse Source 
Fix the following Traceback:
Traceback (most recent call last):
  File "/opt/nodepool/lib/python3.11/site-packages/nodepool/builder.py", line 402, in _cleanup
    self._pruneLocalBuildFormats(
  File "/opt/nodepool/lib/python3.11/site-packages/nodepool/builder.py", line 434, in _pruneLocalBuildFormats
    if not diskimage.delete_after_upload:
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AttributeError: 'NoneType' object has no attribute 'delete_after_upload'

Change-Id: Idb6c9be905f12aa81fe309c88625b0efd4cbc8ad
This commit is contained in:
Dong Zhang 2025-03-05 12:41:55 +01:00
parent 454f1edb39
commit 58be304264
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nodepool/builder.py
View File

@ -430,6 +430,11 @@ class CleanupWorker(BaseWorker):
''' '''
images_dir = self._config.images_dir images_dir = self._config.images_dir
diskimage = self._config.diskimages.get(image_name) diskimage = self._config.diskimages.get(image_name)
# If the diskimage is not in the config, it can be deleted.
if not diskimage:
to_keep = set()
else:
if not diskimage.delete_after_upload: if not diskimage.delete_after_upload:
return return
to_keep = set(diskimage.keep_image_types) to_keep = set(diskimage.keep_image_types)