From 148d624aace55479ee350fb561a9d92d01643d5d Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Tue, 24 Apr 2018 14:43:12 -0400 Subject: [PATCH] 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 --- nodepool/launcher.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nodepool/launcher.py b/nodepool/launcher.py index 7eb2a20b1..4d4bc6455 100755 --- a/nodepool/launcher.py +++ b/nodepool/launcher.py @@ -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): '''