openstack/placement
Code Issues Proposed changes

Fixes LP bug #907898.

Browse Source 
Update DB api so that fixed_ip_disassociate_all_by_timeout uses two
separate commands (a query then an update). Fixes LP bug #907898.

Change-Id: I60d7e7ba6bb3d3542ccf5b595d0c0de944e499a3
This commit is contained in:
Dan Prince 2011-12-22 19:54:03 -05:00
parent faa6d169f0
commit 7e02b831c3
1 changed files with 4 additions and 4 deletions

8
nova/db/sqlalchemy/api.py

@ -777,12 +777,12 @@ def fixed_ip_disassociate_all_by_timeout(context, host, time):
session = get_session()
# NOTE(vish): only update fixed ips that "belong" to this
# host; i.e. the network host or the instance
# host matches. Inner queries necessary because
# host matches. Two queries necessary because
# join with update doesn't work.
host_filter = or_(and_(models.Instance.host == host,
models.Network.multi_host == True),
models.Network.host == host)
subq = model_query(context, models.FixedIp.id, session=session,
fixed_ips = model_query(context, models.FixedIp.id, session=session,
read_deleted="yes").\
filter(models.FixedIp.updated_at < time).\
filter(models.FixedIp.instance_id != None).\
@ -790,10 +790,10 @@ def fixed_ip_disassociate_all_by_timeout(context, host, time):
join(models.FixedIp.instance).\
join(models.FixedIp.network).\
filter(host_filter).\
subquery()
all()
result = model_query(context, models.FixedIp, session=session,
read_deleted="yes").\
filter(models.FixedIp.id.in_(subq)).\
filter(models.FixedIp.id.in_(fixed_ips)).\
update({'instance_id': None,
'leased': False,
'updated_at': utils.utcnow()},