summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-04-26 09:20:15 +0000
committerGerrit Code Review <review@openstack.org>2020-04-26 09:20:15 +0000
commite0b7b6116aba1a2204b5e3967c76644cfb8415ac (patch)
tree97adf6c693850e0a819767443815d25566c5bf58
parent056d0c9d3fcf2cefcdce587649075d9c89a43ab7 (diff)
parent56f6e583d19ef4dd0c1462bfece677a6ec2fa756 (diff)
downloadheat-e0b7b6116aba1a2204b5e3967c76644cfb8415ac.tar.gz
Merge "Use random exponential delay"
-rw-r--r--heat/objects/resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/heat/objects/resource.py b/heat/objects/resource.py
index 3aba3405f..315f7f0a6 100644
--- a/heat/objects/resource.py
+++ b/heat/objects/resource.py
@@ -41,7 +41,7 @@ LOG = logging.getLogger(__name__)
def retry_on_conflict(func):
wrapper = tenacity.retry(
stop=tenacity.stop_after_attempt(11),
- wait=tenacity.wait_random(max=2),
+ wait=tenacity.wait_random_exponential(multiplier=0.5, max=60),
retry=tenacity.retry_if_exception_type(
exception.ConcurrentTransaction),
reraise=True)