openstack
/
octavia
Code Issues Proposed changes

Merge "Pick stale amphora randomly" into stable/stein

This commit is contained in:
Zuul 2020-06-11 10:56:03 +00:00 committed by Gerrit Code Review
parent d3df7e4356 ae03653afc
commit 22f8deab03
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octavia/db/repositories.py
View File

@ -30,6 +30,7 @@ from oslo_utils import uuidutils
from sqlalchemy.orm import joinedload from sqlalchemy.orm import joinedload
from sqlalchemy.orm import noload from sqlalchemy.orm import noload
from sqlalchemy.orm import subqueryload from sqlalchemy.orm import subqueryload
from sqlalchemy.sql import func
from octavia.common import constants as consts from octavia.common import constants as consts
from octavia.common import data_models from octavia.common import data_models
@ -1466,7 +1467,8 @@ class AmphoraHealthRepository(BaseRepository):
amp = session.query(self.model_class).with_for_update().filter_by( amp = session.query(self.model_class).with_for_update().filter_by(
busy=False).filter( busy=False).filter(
self.model_class.last_update < expired_time).first() self.model_class.last_update < expired_time).order_by(
func.random()).first()
if amp is None: if amp is None:
return None return None