summaryrefslogtreecommitdiff
path: root/nova/db
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-11 23:07:34 +0000
committerGerrit Code Review <review@openstack.org>2016-05-11 23:07:36 +0000
commit92aaa4d40bcd291e9d354e16c9986a057ee42c73 (patch)
tree728d94f3a89d51ddd1108d24cf31a8588762df93 /nova/db
parent9282b99b8ec8fef0189a2677c143ae96c48afd50 (diff)
parent51d46d38a1d0b5ee7023acc627d4694a0d67cce3 (diff)
downloadnova-92aaa4d40bcd291e9d354e16c9986a057ee42c73.tar.gz
Merge "db: retry instance_info_cache_update() on deadlock"
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/sqlalchemy/api.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 5e88770d37..2cf64cc585 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -3008,6 +3008,7 @@ def instance_info_cache_get(context, instance_uuid):
@require_context
+@oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
@pick_context_manager_writer
def instance_info_cache_update(context, instance_uuid, values):
"""Update an instance info cache record in the table.