openstack
/
heat
Code Issues Proposed changes

Merge "Retry on DB deadlock when updating resource" into stable/pike

This commit is contained in:
Zuul 2019-03-20 18:19:55 +00:00 committed by Gerrit Code Review
parent f3b6666d21 da8972d542
commit 8dff6e58c3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/db/sqlalchemy/api.py
View File

@ -249,6 +249,8 @@ def _add_atomic_key_to_values(values, atomic_key):
values['atomic_key'] = atomic_key + 1
@oslo_db_api.wrap_db_retry(max_retries=3, retry_on_deadlock=True,
retry_interval=0.5, inc_retry_interval=True)
def resource_update(context, resource_id, values, atomic_key,
expected_engine_id=None):
session = context.session