openstack
/
neutron
Code Issues Proposed changes

Merge "Removed is_deadlock from db/api"

This commit is contained in:
Jenkins 2016-11-03 19:43:09 +00:00 committed by Gerrit Code Review
parent 592886bafa 322c1ee3bc
commit 41bf03f927
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/db/api.py
View File

@ -16,7 +16,6 @@
import contextlib
import copy
from debtcollector import moves
from debtcollector import removals
from neutron_lib import exceptions
from oslo_config import cfg
@ -60,9 +59,6 @@ def is_retriable(e):
# looking savepoints mangled by deadlocks. see bug/1590298 for details.
return _is_nested_instance(e, db_exc.DBError) and '1305' in str(e)
is_deadlock = moves.moved_function(is_retriable, 'is_deadlock', __name__,
message='use "is_retriable" instead',
version='newton', removal_version='ocata')
_retry_db_errors = oslo_db_api.wrap_db_retry(
max_retries=MAX_RETRIES,
retry_interval=0.1,