zuul
/
nodepool
Code Issues Proposed changes

Fix awkward merging of code 

The code from reviews https://review.openstack.org/536295 and
https://review.openstack.org/545867 somehow did not merge quite
like expected. Fix that by moving the method call into the tasks
list.

Change-Id: I01538b79b115acf20081a92161d788e47dd1ac13
This commit is contained in:
David Shrewsbury 2018-04-24 14:43:12 -04:00 committed by Clark Boylan
parent badb7e48ad
commit 148d624aac
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nodepool/launcher.py
View File

@ -377,6 +377,7 @@ class CleanupWorker(BaseCleanupWorker):
(self._cleanupLeakedInstances, 'leaked instance cleanup'),
(self._cleanupLostRequests, 'lost request cleanup'),
(self._cleanupMaxReadyAge, 'max ready age cleanup'),
(self._cleanupMaxHoldAge, 'max hold age cleanup'),
]
def _resetLostRequest(self, zk_conn, req):
@ -626,12 +627,6 @@ class CleanupWorker(BaseCleanupWorker):
self.log.exception(
"Exception in %s (%s)", self.name, description)
try:
self._cleanupMaxHoldAge()
except Exception:
self.log.exception(
"Exception in CleanupWorker (max hold age cleanup):")
class DeletedNodeWorker(BaseCleanupWorker):
'''