Merge "Enable compute_node_update to tolerate deadlocks" into stable/havana

2 files changed, 4 insertions, 0 deletions

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 04a77bb46a..1a2c07dd7e 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -658,6 +658,7 @@ def _update_stats(context, new_stats, compute_id, session, prune_stats=False):
 
 
 @require_admin_context
+@_retry_on_deadlock
 def compute_node_update(context, compute_id, values, prune_stats=False):
     """Updates the ComputeNode record with the most recent data."""
     stats = values.pop('stats', {})
diff --git a/nova/tests/db/test_db_api.py b/nova/tests/db/test_db_api.py
index a9a34542d6..e6c4a80bdf 100644
--- a/nova/tests/db/test_db_api.py
+++ b/nova/tests/db/test_db_api.py
@@ -156,6 +156,9 @@ class DecoratorTestCase(test.TestCase):
     def test_require_admin_context_decorator_wraps_functions_properly(self):
         self._test_decorator_wraps_helper(sqlalchemy_api.require_admin_context)
 
+    def test_require_deadlock_retry_wraps_functions_properly(self):
+        self._test_decorator_wraps_helper(sqlalchemy_api._retry_on_deadlock)
+
 
 def _get_fake_aggr_values():
     return {'name': 'fake_aggregate'}