summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-16 18:13:48 +0000
committerGerrit Code Review <review@openstack.org>2017-11-16 18:13:48 +0000
commita0a8c993766dde463da0d252d5ca7b24c562b15f (patch)
tree0b44ff686cb8eadcf866bb012d6079cb9de39bb7
parent4ebb0c69cace49e3cd95de0bc06da24fa745a651 (diff)
parent4a727233dc2b7d1021ed7932d2cd27d8053dca31 (diff)
downloadoslo-db-a0a8c993766dde463da0d252d5ca7b24c562b15f.tar.gz
Merge "Remove kwarg retry_on_request in wrap_db_retry"
-rw-r--r--oslo_db/api.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/oslo_db/api.py b/oslo_db/api.py
index 621631b..62cf889 100644
--- a/oslo_db/api.py
+++ b/oslo_db/api.py
@@ -27,7 +27,6 @@ import logging
import threading
import time
-from debtcollector import removals
from oslo_utils import excutils
from oslo_utils import importutils
from oslo_utils import reflection
@@ -106,12 +105,10 @@ class wrap_db_retry(object):
:type exception_checker: callable
"""
- @removals.removed_kwarg("retry_on_request",
- "Retry on request is always enabled")
def __init__(self, retry_interval=1, max_retries=20,
inc_retry_interval=True,
max_retry_interval=10, retry_on_disconnect=False,
- retry_on_deadlock=False, retry_on_request=False,
+ retry_on_deadlock=False,
exception_checker=lambda exc: False):
super(wrap_db_retry, self).__init__()