openstack
/
placement
Code Issues Proposed changes

Merge "Add lock on API layer delete floating IP"

This commit is contained in:
Jenkins 2014-05-13 06:52:18 +00:00 committed by Gerrit Code Review
parent 79a82ff3c7 78307cd273
commit 44cae9cff8
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nova/db/sqlalchemy/api.py
View File

@ -891,12 +891,24 @@ def floating_ip_fixed_ip_associate(context, floating_address,
@require_context
@_retry_on_deadlock
def floating_ip_deallocate(context, address):
model_query(context, models.FloatingIp).\
filter_by(address=address).\
update({'project_id': None,
'host': None,
'auto_assigned': False})
session = get_session()
with session.begin():
floating_ip_ref = model_query(context, models.FloatingIp,
session=session).\
filter_by(address=address).\
filter(models.FloatingIp.project_id != None).\
with_lockmode('update').\
first()
if floating_ip_ref:
floating_ip_ref.update({'project_id': None,
'host': None,
'auto_assigned': False})
return floating_ip_ref
@require_context