zuul
/
nodepool
Code Issues Proposed changes

Merge "Cleanup failed upload records"

This commit is contained in:
Jenkins 2017-06-27 17:31:40 +00:00 committed by Gerrit Code Review
parent 44bbd16aee 18eca9b2ea
commit fde5d0ac20
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nodepool/builder.py
View File

@ -370,7 +370,9 @@ class CleanupWorker(BaseWorker):
marked for deleting.
'''
cruft = self._zk.getUploads(image, build_id, provider,
states=[zk.UPLOADING, zk.DELETING])
states=[zk.UPLOADING,
zk.DELETING,
zk.FAILED])
for upload in cruft:
if (upload.state == zk.UPLOADING and
not self._inProgressUpload(upload)
@ -388,6 +390,9 @@ class CleanupWorker(BaseWorker):
elif upload.state == zk.DELETING:
self.log.info("Removing deleted upload and record: %s" % upload)
self._deleteUpload(upload)
elif upload.state == zk.FAILED:
self.log.info("Removing failed upload and record: %s" % upload)
self._deleteUpload(upload)
def _cleanupImage(self, known_providers, image):
'''