diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-09 14:13:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-09 14:13:19 +0000 |
| commit | df12b86b8076a5f0c1070a4ae53b2c84fd9703c9 (patch) | |
| tree | 1881940e3d16f5d6219b62484ed1409d66bb597d | |
| parent | dd9c38d9c80e0226f62760564ffadcae00086060 (diff) | |
| parent | e919b723bc6f6604d3165d143de51715fbf057e7 (diff) | |
| download | heat-df12b86b8076a5f0c1070a4ae53b2c84fd9703c9.tar.gz | |
Merge "Retry on DB deadlock when updating resource"
| -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 d00933e88..71be6badb 100644 --- a/heat/db/sqlalchemy/api.py +++ b/heat/db/sqlalchemy/api.py @@ -254,6 +254,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 |