openstack
/
octavia
Code Issues Proposed changes

Merge "Remove unnecessary joinedload" into stable/victoria

This commit is contained in:
Zuul 2020-10-30 17:14:23 +00:00 committed by Gerrit Code Review
parent a8de5f8d04 a5fd413d0c
commit b28743c22a
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octavia/db/repositories.py
View File

@ -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.expression import false
@ -1369,10 +1368,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