openstack/neutron
Code Issues Proposed changes

Merge "Call _allocate_vr_id outside of transaction"

Browse Source
This commit is contained in:
Jenkins 2016-01-12 08:42:00 +00:00 committed by Gerrit Code Review
commit 4c2136cea0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/db/l3_hamode_db.py
View File

@ -191,7 +191,9 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
def _allocate_vr_id(self, context, network_id, router_id): def _allocate_vr_id(self, context, network_id, router_id):
for count in range(MAX_ALLOCATION_TRIES): for count in range(MAX_ALLOCATION_TRIES):
try: try:
with context.session.begin(subtransactions=True): # NOTE(kevinbenton): we disallow subtransactions because the
# retry logic will bust any parent transactions
with context.session.begin():
allocated_vr_ids = self._get_allocated_vr_id(context, allocated_vr_ids = self._get_allocated_vr_id(context,
network_id) network_id)
available_vr_ids = VR_ID_RANGE - allocated_vr_ids available_vr_ids = VR_ID_RANGE - allocated_vr_ids
@ -224,9 +226,8 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
vr_id=vr_id).delete() vr_id=vr_id).delete()
def _set_vr_id(self, context, router, ha_network): def _set_vr_id(self, context, router, ha_network):
with context.session.begin(subtransactions=True): router.extra_attributes.ha_vr_id = self._allocate_vr_id(
router.extra_attributes.ha_vr_id = self._allocate_vr_id( context, ha_network.network_id, router.id)
context, ha_network.network_id, router.id)
def _create_ha_subnet(self, context, network_id, tenant_id): def _create_ha_subnet(self, context, network_id, tenant_id):
args = {'network_id': network_id, args = {'network_id': network_id,