commit b627d7cf725b095f18e10728e9adc21abba1cdc9 Author: Michael Johnson Date: Tue Jul 14 09:03:57 2020 -0700 Remove unnecessary joinedload This patch removes an unnecessary joinedload when looking up a load balancer from an amphora ID. This should reduce the database load when this method is called. Change-Id: I04bb38c657c87ace941eb6e332f58f7218980ad1 diff --git a/octavia/db/repositories.py b/octavia/db/repositories.py index 29af916..db34d0c 100644 --- a/octavia/db/repositories.py +++ b/octavia/db/repositories.py @@ -27,7 +27,6 @@ from oslo_log import log as logging from oslo_serialization import jsonutils from oslo_utils import excutils from oslo_utils import uuidutils -from sqlalchemy.orm import joinedload from sqlalchemy.orm import noload from sqlalchemy.orm import subqueryload from sqlalchemy.sql import func @@ -1368,10 +1367,7 @@ class AmphoraRepository(BaseRepository): .filter(models.Amphora.status != consts.DELETED) # And the LB is also not DELETED .filter(models.LoadBalancer.provisioning_status != - consts.DELETED) - # And what does this do? Some SQLAlchemy magic? - .options(joinedload('*')) - ).first() + consts.DELETED)).first() if db_lb: return db_lb.to_data_model() return None