openstack/neutron
Code Issues Proposed changes

Merge "Catch DBReferenceError in IPAM and convert to SubnetNotFound"

Browse Source
This commit is contained in:
Jenkins 2016-09-16 07:09:25 +00:00 committed by Gerrit Code Review
commit b731e68e30
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/ipam/drivers/neutrondb_ipam/driver.py
View File

@ -18,6 +18,7 @@ import random
import netaddr import netaddr
from neutron_lib import exceptions as n_exc from neutron_lib import exceptions as n_exc
from oslo_db import exception as db_exc
from oslo_log import log from oslo_log import log
from oslo_utils import uuidutils from oslo_utils import uuidutils
@ -200,7 +201,16 @@ class NeutronDbSubnet(ipam_base.Subnet):
# Create IP allocation request object # Create IP allocation request object
# The only defined status at this stage is 'ALLOCATED'. # The only defined status at this stage is 'ALLOCATED'.
# More states will be available in the future - e.g.: RECYCLABLE # More states will be available in the future - e.g.: RECYCLABLE
self.subnet_manager.create_allocation(session, ip_address) try:
with session.begin(subtransactions=True):
# NOTE(kevinbenton): we use a subtransaction to force
# a flush here so we can capture DBReferenceErrors due
# to concurrent subnet deletions. (galera would deadlock
# later on final commit)
self.subnet_manager.create_allocation(session, ip_address)
except db_exc.DBReferenceError:
raise n_exc.SubnetNotFound(
subnet_id=self.subnet_manager.neutron_id)
return ip_address return ip_address
def deallocate(self, address): def deallocate(self, address):