From 4a727233dc2b7d1021ed7932d2cd27d8053dca31 Mon Sep 17 00:00:00 2001 From: chenghuiyu Date: Fri, 1 Sep 2017 16:47:15 +0800 Subject: [PATCH] Remove kwarg retry_on_request in wrap_db_retry As Retry on request is always enabled, so the kwarg retry_on_request is deprecated for removal. Change-Id: I9c918828ce9f7075a4e33a6fbadd9613c81fa2eb Closes-Bug: #1714440 --- oslo_db/api.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/oslo_db/api.py b/oslo_db/api.py index 621631b6..62cf8891 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__()