x/quark
Code Issues Proposed changes

Added exception handlers and rollbacks to fix any resource lock contension due to failures when calling the Unicorn (Floating IP) API

Browse Source
This commit is contained in:
Alan Quillin
2016-03-10 11:31:49 -05:00
parent 80d5e71af2
commit 5ca2a752b3
2 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
quark/plugin_modules/floating_ips.py
View File

@@ -125,7 +125,8 @@ def create_floatingip(context, content):
flip = new_addresses[0]
if fixed_ip and port:
with context.session.begin():
context.session.begin()
try:
flip = db_api.port_associate_ip(context, [port], flip, [port_id])
flip = db_api.floating_ip_associate_fixed_ip(context, flip,
fixed_ip)
@@ -133,6 +134,10 @@ def create_floatingip(context, content):
flip_driver = registry.DRIVER_REGISTRY.get_driver()
flip_driver.register_floating_ip(flip, port, fixed_ip)
context.session.commit()
except Exception:
context.session.rollback()
raise
return v._make_floating_ip_dict(flip, port_id)
@@ -164,7 +169,8 @@ def update_floatingip(context, id, content):
fixed_ip = None
current_port = None
with context.session.begin():
context.session.begin()
try:
flip = db_api.floating_ip_find(context, id=id, scope=db_api.ONE)
if not flip:
raise qex.FloatingIpNotFound(id=id)
@@ -207,6 +213,7 @@ def update_floatingip(context, id, content):
flip = db_api.port_associate_ip(context, [port], flip, [port_id])
flip = db_api.floating_ip_associate_fixed_ip(context, flip,
fixed_ip)
flip_driver = registry.DRIVER_REGISTRY.get_driver()
if port:
@@ -217,6 +224,11 @@ def update_floatingip(context, id, content):
else:
flip_driver.remove_floating_ip(flip)
context.session.commit()
except (qex.RegisterFloatingIpFailure, qex.RemoveFloatingIpFailure):
context.session.rollback()
raise
# Note(alanquillin) The ports parameters on the model is not
# properly getting cleaned up when removed. Manually cleaning them up.
# Need to fix the db api to correctly update the model.
@@ -247,7 +259,8 @@ def delete_floatingip(context, id):
if current_ports and len(current_ports) > 0:
current_port = current_ports[0]
with context.session.begin():
context.session.begin()
try:
strategy_name = flip.network.get('ipam_strategy')
ipam_driver = ipam.IPAM_REGISTRY.get_strategy(strategy_name)
ipam_driver.deallocate_ip_address(context, flip)
@@ -260,9 +273,13 @@ def delete_floatingip(context, id):
db_api.ip_address_deallocate(context, flip)
if flip.fixed_ip:
driver = registry.DRIVER_REGISTRY.get_driver()
driver.remove_floating_ip(flip)
if flip.fixed_ip:
driver = registry.DRIVER_REGISTRY.get_driver()
driver.remove_floating_ip(flip)
context.session.commit()
except Exception:
context.session.rollback()
raise
def get_floatingip(context, id, fields=None):