openstack
/
neutron
Code Issues Proposed changes

Merge "Get rid of custom wrap_db_retry call in sync_allocations"

This commit is contained in:
Jenkins 2017-03-21 01:24:47 +00:00 committed by Gerrit Code Review
parent cd947ac4d0 99e5f4fb46
commit eebcee4316
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

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