openstack
/
neutron
Code Issues Proposed changes

Merge "Get rid of custom wrap_db_retry call in sync_allocations" into stable/newton

This commit is contained in:
Jenkins 2017-05-26 01:43:54 +00:00 committed by Gerrit Code Review
parent 280b6176db 3567667f51
commit fa7071c4be
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/plugins/ml2/drivers/type_tunnel.py
View File

@ -19,7 +19,6 @@ import operator
import netaddr
from neutron_lib import exceptions as exc
from oslo_config import cfg
from oslo_db import api as oslo_db_api
from oslo_db import exception as db_exc
from oslo_log import log
import six
@ -139,9 +138,7 @@ class TunnelTypeDriver(helpers.SegmentTypeDriver):
LOG.info(_LI("%(type)s ID ranges: %(range)s"),
{'type': self.get_type(), 'range': current_range})
@oslo_db_api.wrap_db_retry(
max_retries=db_api.MAX_RETRIES,
exception_checker=db_api.is_retriable)
@db_api.retry_db_errors
def sync_allocations(self):
# determine current configured allocatable tunnel ids
tunnel_ids = set()