diff options
| author | Zuul <zuul@review.opendev.org> | 2021-06-30 10:38:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-06-30 10:38:29 +0000 |
| commit | 14922b71d2eebcf939963d010904525b01b2897e (patch) | |
| tree | c6d8afb98304862ddfaabab6fdffe882002e6725 | |
| parent | 62bb51e269e513f17c67711b5bbc1fbead962ebf (diff) | |
| parent | b664d4ea01c4a94254601ea5af4ea7d1da70a941 (diff) | |
| download | ceilometer-14922b71d2eebcf939963d010904525b01b2897e.tar.gz | |
Merge "Ceilometer compute `retry_on_disconnect` using `no-wait`"
| -rw-r--r-- | ceilometer/compute/virt/libvirt/utils.py | 3 | ||||
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ceilometer/compute/virt/libvirt/utils.py b/ceilometer/compute/virt/libvirt/utils.py index e3aa4b6a..3dd238d6 100644 --- a/ceilometer/compute/virt/libvirt/utils.py +++ b/ceilometer/compute/virt/libvirt/utils.py @@ -108,7 +108,8 @@ def is_disconnection_exception(e): retry_on_disconnect = tenacity.retry( retry=tenacity.retry_if_exception(is_disconnection_exception), - stop=tenacity.stop_after_attempt(2)) + stop=tenacity.stop_after_attempt(3), + wait=tenacity.wait_exponential(multiplier=3, min=1, max=60)) def raise_nodata_if_unsupported(method): diff --git a/lower-constraints.txt b/lower-constraints.txt index 4152887d..946422a6 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -39,7 +39,7 @@ requests-aws==0.1.4 six==1.10.0 stestr==2.0.0 stevedore==3.0.0 -tenacity==4.12.0 +tenacity==6.3.1 testresources==2.0.1 testscenarios==0.4 testtools==2.2.0 diff --git a/requirements.txt b/requirements.txt index 461cc088..cd83aa38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,7 @@ python-cinderclient>=3.3.0 # Apache-2.0 PyYAML>=5.1 # MIT requests!=2.9.0,>=2.8.1 # Apache-2.0 stevedore>=1.20.0 # Apache-2.0 -tenacity>=4.12.0 # Apache-2.0 +tenacity>=6.3.1,<7.0.0 # Apache-2.0 tooz[zake]>=1.47.0 # Apache-2.0 oslo.cache>=1.26.0 # Apache-2.0 gnocchiclient>=7.0.0 # Apache-2.0 |