diff --git a/ironic_inspector/common/ironic.py b/ironic_inspector/common/ironic.py index 7d8f4f922..f906129ff 100644 --- a/ironic_inspector/common/ironic.py +++ b/ironic_inspector/common/ironic.py @@ -18,7 +18,7 @@ import netaddr import openstack from openstack import exceptions as os_exc from oslo_config import cfg -import retrying +import tenacity from ironic_inspector.common.i18n import _ from ironic_inspector.common import keystone @@ -187,9 +187,11 @@ def get_node(node_id, ironic=None, **kwargs): return node -@retrying.retry( - retry_on_exception=lambda exc: isinstance(exc, os_exc.SDKException), - stop_max_attempt_number=5, wait_fixed=1000) +@tenacity.retry( + retry=tenacity.retry_if_exception_type(os_exc.SDKException), + stop=tenacity.stop_after_attempt(5), + wait=tenacity.wait_fixed(1), + reraise=True) def call_with_retries(func, *args, **kwargs): """Call an ironic client function retrying all errors. diff --git a/lower-constraints.txt b/lower-constraints.txt index 4f1c22864..fb3b66cde 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -100,7 +100,6 @@ repoze.lru==0.7 requests==2.23.0 requestsexceptions==1.4.0 restructuredtext-lint==1.3.0 -retrying==1.2.3 rfc3986==1.4.0 Routes==2.4.1 six==1.14.0 diff --git a/requirements.txt b/requirements.txt index a31f8d918..4945382d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -29,7 +29,7 @@ oslo.rootwrap>=5.8.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.service!=1.28.1,>=1.24.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 -retrying!=1.3.0,>=1.2.3 # Apache-2.0 +tenacity>=6.2.0 # Apache-2.0 stevedore>=1.20.0 # Apache-2.0 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT tooz>=1.64.0 # Apache-2.0