diff options
| author | Julien Danjou <julien@danjou.info> | 2016-05-18 16:27:34 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2016-06-29 13:38:02 +0200 |
| commit | 8e3b356680ecb6bb1f110c0b909edd002e19771b (patch) | |
| tree | 6ebe04ceaf0d6da81ae4cbd3e03f4fb573828a99 /oslo_db/api.py | |
| parent | 9904a1acd745ede7e7059354ee7765b97a3a62bc (diff) | |
| download | oslo-db-8e3b356680ecb6bb1f110c0b909edd002e19771b.tar.gz | |
api: use sane default in wrap_db_retry()
The current defaults do not make much sense: having max_retries set to 0
completely avoid any retry, which is the whole point of that wrapper.
This patch moves the correct default values from the DBAPI object to the
wrap_db_retry() function itself.
Change-Id: I89c2bd09e69b8b77b716573eb8b889c01f9d0f54
Diffstat (limited to 'oslo_db/api.py')
| -rw-r--r-- | oslo_db/api.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/oslo_db/api.py b/oslo_db/api.py index 93931f7..2f592e9 100644 --- a/oslo_db/api.py +++ b/oslo_db/api.py @@ -109,9 +109,9 @@ class wrap_db_retry(object): @removals.removed_kwarg("retry_on_request", "Retry on request is always enabled") - def __init__(self, retry_interval=0, max_retries=0, - inc_retry_interval=False, - max_retry_interval=0, retry_on_disconnect=False, + 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, exception_checker=lambda exc: False): super(wrap_db_retry, self).__init__() @@ -221,10 +221,11 @@ class DBAPI(object): self._load_backend() self.use_db_reconnect = kwargs.get('use_db_reconnect', False) - self.retry_interval = kwargs.get('retry_interval', 1) - self.inc_retry_interval = kwargs.get('inc_retry_interval', True) - self.max_retry_interval = kwargs.get('max_retry_interval', 10) - self.max_retries = kwargs.get('max_retries', 20) + self._wrap_db_kwargs = {k: v for k, v in kwargs.items() + if k in ('retry_interval', + 'inc_retry_interval', + 'max_retry_interval', + 'max_retries')} def _load_backend(self): with self._lock: @@ -256,12 +257,9 @@ class DBAPI(object): if retry_on_disconnect or retry_on_deadlock or retry_on_request: attr = wrap_db_retry( - retry_interval=self.retry_interval, - max_retries=self.max_retries, - inc_retry_interval=self.inc_retry_interval, - max_retry_interval=self.max_retry_interval, retry_on_disconnect=retry_on_disconnect, - retry_on_deadlock=retry_on_deadlock)(attr) + retry_on_deadlock=retry_on_deadlock, + **self._wrap_db_kwargs)(attr) return attr |