From 978df9981ff47d95222bee7841e738c64a386ad3 Mon Sep 17 00:00:00 2001 From: Adam Harwell Date: Wed, 14 Jun 2017 11:58:04 -0700 Subject: [PATCH] Also remove amphora_health entry during house_keeping amps Change-Id: I1d46e5b34b98f920525d38c54288bdc96526bc10 --- octavia/controller/housekeeping/house_keeping.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/octavia/controller/housekeeping/house_keeping.py b/octavia/controller/housekeeping/house_keeping.py index 84516ccc42..81a589fbaf 100644 --- a/octavia/controller/housekeeping/house_keeping.py +++ b/octavia/controller/housekeeping/house_keeping.py @@ -17,6 +17,7 @@ import datetime from concurrent import futures from oslo_config import cfg from oslo_log import log as logging +from sqlalchemy.orm import exc as sqlalchemy_exceptions from octavia.common import constants from octavia.controller.worker import controller_worker as cw @@ -76,6 +77,10 @@ class DatabaseCleanup(object): exp_age): LOG.info('Attempting to delete Amphora id : %s', amp.id) self.amp_repo.delete(session, id=amp.id) + try: + self.amp_health_repo.delete(session, amphora_id=amp.id) + except sqlalchemy_exceptions.NoResultFound: + pass # Best effort delete, this record might not exist LOG.info('Deleted Amphora id : %s' % amp.id) def cleanup_load_balancers(self):