openstack
/
heat
Code Issues Proposed changes

Fix DBDeadlock error in stack update 

Fix the DBDeadlock error encounter occasionally when stack is being
updated in DB.

Change-Id: I24a929d88d87c5c6d6b410ad990d8d027f4c5b1b
Closes-Bug: #1578615
This commit is contained in:
Anant Patil 2016-05-05 18:35:38 +05:30 committed by Anant Patil
parent fed92fdd6e
commit 6f361f7da3
2 changed files with 11 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

@ -529,6 +529,8 @@ def stack_create(context, values):
return stack_ref
@oslo_db_api.wrap_db_retry(max_retries=3, retry_on_deadlock=True,
retry_interval=0.5, inc_retry_interval=True)
def stack_update(context, stack_id, values, exp_trvsl=None):
stack = stack_get(context, stack_id)

9
heat/tests/db/test_sqlalchemy_api.py
View File

@ -1750,6 +1750,15 @@ class DBAPIStackTest(common.HeatTestCase):
exp_trvsl=diff_uuid)
self.assertFalse(updated)
@mock.patch.object(time, 'sleep')
def test_stack_update_retries_on_deadlock(self, sleep):
stack = create_stack(self.ctx, self.template, self.user_creds)
with mock.patch('sqlalchemy.orm.query.Query.update',
side_effect=db_exception.DBDeadlock) as mock_update:
self.assertRaises(db_exception.DBDeadlock,
db_api.stack_update, self.ctx, stack.id, {})
self.assertEqual(4, mock_update.call_count)
def test_stack_set_status_release_lock(self):
stack = create_stack(self.ctx, self.template, self.user_creds)
values = {