summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-05-23 18:58:47 +0000
committerGerrit Code Review <review@openstack.org>2019-05-23 18:58:47 +0000
commita4fc781e7bccd9a0a7d27d32c167c9e2c056df10 (patch)
tree5be9fe6c6e199116b10774cd90447a27fe861e51
parent8023c090b427104927dad0d71274d961616928a4 (diff)
parent8ab042a6a0baa4682b201dfa310baf67540bcc5e (diff)
downloadheat-a4fc781e7bccd9a0a7d27d32c167c9e2c056df10.tar.gz
Merge "Retry on DB deadlock in event_create()" into stable/stein
-rw-r--r--heat/db/sqlalchemy/api.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py
index a92a6fbeb..1642c33e6 100644
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -1118,6 +1118,8 @@ def _delete_event_rows(context, stack_id, limit):
return retval
+@oslo_db_api.wrap_db_retry(max_retries=3, retry_on_deadlock=True,
+ retry_interval=0.5, inc_retry_interval=True)
def event_create(context, values):
if 'stack_id' in values and cfg.CONF.max_events_per_stack:
# only count events and purge on average