zuul/nodepool
Code Issues Proposed changes

Merge "Add additional builder debug logging"

Browse Source
This commit is contained in:
Zuul 2018-03-07 16:47:27 +00:00 committed by Gerrit Code Review
commit f73eb18b3e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nodepool/builder.py
View File

@ -192,6 +192,8 @@ class CleanupWorker(BaseWorker):
self._rtable[i][p].sort(key=lambda x: x[2], reverse=True) self._rtable[i][p].sort(key=lambda x: x[2], reverse=True)
self._rtable[i][p] = self._rtable[i][p][:2] self._rtable[i][p] = self._rtable[i][p][:2]
self.log.debug("Upload recency table: %s", self._rtable)
def _isRecentUpload(self, image, provider, build_id, upload_id): def _isRecentUpload(self, image, provider, build_id, upload_id):
''' '''
Search for an upload for a build within the recency table. Search for an upload for a build within the recency table.
@ -322,6 +324,7 @@ class CleanupWorker(BaseWorker):
"Unable to delete image %s from %s:", "Unable to delete image %s from %s:",
upload.external_name, upload.provider_name) upload.external_name, upload.provider_name)
else: else:
self.log.debug("Deleting image upload: %s", upload)
self._zk.deleteUpload(upload.image_name, upload.build_id, self._zk.deleteUpload(upload.image_name, upload.build_id,
upload.provider_name, upload.id) upload.provider_name, upload.id)

1
nodepool/zk.py
View File

@ -284,7 +284,6 @@ class ImageUpload(BaseModel):
d['provider_name'] = self.provider_name d['provider_name'] = self.provider_name
d['image_name'] = self.image_name d['image_name'] = self.image_name
d['format'] = self.format d['format'] = self.format
d['stat'] = self.stat
return '<ImageUpload %s>' % d return '<ImageUpload %s>' % d
def __eq__(self, other): def __eq__(self, other):