From 322c1ee3bc9d87397e561c17145707e709309caa Mon Sep 17 00:00:00 2001 From: Dariusz Smigiel Date: Thu, 29 Sep 2016 18:47:10 +0000 Subject: [PATCH] Removed is_deadlock from db/api Marked as deprecated in Change I151ffcf47926f5ac66e452974f87e8bc2a906151 Use is_retriable instead of is_deadlock. Change-Id: I895d288c2fcbb225ac2c116f378fbbb43b052549 --- neutron/db/api.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/neutron/db/api.py b/neutron/db/api.py index 7612bf85091..b1373db39fe 100644 --- a/neutron/db/api.py +++ b/neutron/db/api.py @@ -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 @@ -61,9 +60,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,