diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-20 18:19:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-20 18:19:55 +0000 |
| commit | 8dff6e58c3b8e3aa6602c7527ceda70531204dff (patch) | |
| tree | 4cd3a109b2256ccc021ba36df1b0678c86379741 | |
| parent | f3b6666d214f70cac4f93cac37e2ed96b82a6044 (diff) | |
| parent | da8972d5420054065b62e100e3cee33a52a491c3 (diff) | |
| download | heat-8dff6e58c3b8e3aa6602c7527ceda70531204dff.tar.gz | |
Merge "Retry on DB deadlock when updating resource" into stable/pike
| -rw-r--r-- | heat/db/sqlalchemy/api.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py index 50bfc37ae..05584e868 100644 --- a/heat/db/sqlalchemy/api.py +++ b/heat/db/sqlalchemy/api.py @@ -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 |