x/vmware-nsx
Code Issues Proposed changes

Merge "_update_router_db: don't hold open transactions"

Browse Source
This commit is contained in:
Jenkins
2014-10-27 16:02:04 +00:00
committed by Gerrit Code Review
parent e2be33f3b1 13aa67952c
commit c59b1820f3
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
neutron/db/l3_db.py
View File

@@ -169,10 +169,8 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase):
return self._make_router_dict(router_db) return self._make_router_dict(router_db)
def _update_router_db(self, context, router_id, data, gw_info): def _update_router_db(self, context, router_id, data, gw_info):
"""Update the DB object and related gw info, if available.""" """Update the DB object."""
with context.session.begin(subtransactions=True): with context.session.begin(subtransactions=True):
if gw_info != attributes.ATTR_NOT_SPECIFIED:
self._update_router_gw_info(context, router_id, gw_info)
router_db = self._get_router(context, router_id) router_db = self._get_router(context, router_id)
if data: if data:
router_db.update(data) router_db.update(data)
@@ -188,6 +186,10 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase):
if gw_info != attributes.ATTR_NOT_SPECIFIED: if gw_info != attributes.ATTR_NOT_SPECIFIED:
candidates = self._check_router_needs_rescheduling( candidates = self._check_router_needs_rescheduling(
context, id, gw_info) context, id, gw_info)
# Update the gateway outside of the DB update since it involves L2
# calls that don't make sense to rollback and may cause deadlocks
# in a transaction.
self._update_router_gw_info(context, id, gw_info)
else: else:
candidates = None candidates = None
router_db = self._update_router_db(context, id, r, gw_info) router_db = self._update_router_db(context, id, r, gw_info)
@@ -316,10 +318,10 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase):
router.gw_port = None router.gw_port = None
context.session.add(router) context.session.add(router)
context.session.expire(gw_port) context.session.expire(gw_port)
vpnservice = manager.NeutronManager.get_service_plugins().get( vpnservice = manager.NeutronManager.get_service_plugins().get(
constants.VPN) constants.VPN)
if vpnservice: if vpnservice:
vpnservice.check_router_in_use(context, router_id) vpnservice.check_router_in_use(context, router_id)
self._core_plugin.delete_port( self._core_plugin.delete_port(
admin_ctx, gw_port['id'], l3_port_check=False) admin_ctx, gw_port['id'], l3_port_check=False)