summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-07-23 02:21:22 +0000
committerGerrit Code Review <review@openstack.org>2019-07-23 02:21:23 +0000
commitc04827e892ba37690c891e98c874c34600f0011c (patch)
tree6a928722ae6050c2d9a56d86e4feedeaad5f5a0f
parentec50bb8fa46f909d642f1f3af4f3c3d558d11de8 (diff)
parent92d59678b31e48c26ab04a357519ea0fa36a6454 (diff)
downloadheat-c04827e892ba37690c891e98c874c34600f0011c.tar.gz
Merge "Retry on DB deadlock in event_create()" into stable/rocky
-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 e7dae5e19..030501bb4 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