summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-07-26 16:06:19 +0000
committerGerrit Code Review <review@openstack.org>2019-07-26 16:06:19 +0000
commit3735796c20430f8a1be1e66929f130bb43c8d617 (patch)
tree091e0cb5e65c5829c413fcd595f8859380ab1c8f
parent478f752ee4a01bc9f03d99af7e15980b9e45c2db (diff)
parentf391082428e18a8d87104e053893fddd0a4b9832 (diff)
downloadheat-3735796c20430f8a1be1e66929f130bb43c8d617.tar.gz
Merge "Retry on DB deadlock in event_create()" into stable/queens
-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 698c448b1..1120c1bec 100644
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -1056,6 +1056,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