openstack/heat
Code Issues Proposed changes

Merge "Release resource lock when executing reset_stack_status"

Browse Source
This commit is contained in:
Jenkins 2016-09-16 05:28:50 +00:00 committed by Gerrit Code Review
commit 4ec6192e76
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/db/sqlalchemy/api.py
View File

@ -1558,7 +1558,8 @@ def reset_stack_status(context, stack_id, stack=None):
query = context.session.query(models.Resource).filter_by( query = context.session.query(models.Resource).filter_by(
status='IN_PROGRESS', stack_id=stack_id) status='IN_PROGRESS', stack_id=stack_id)
query.update({'status': 'FAILED', query.update({'status': 'FAILED',
'status_reason': 'Stack status manually reset'}) 'status_reason': 'Stack status manually reset',
'engine_id': None})
query = context.session.query(models.ResourceData) query = context.session.query(models.ResourceData)
query = query.join(models.Resource) query = query.join(models.Resource)

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

@ -3620,7 +3620,8 @@ class ResetStackStatusTests(common.HeatTestCase):
def test_resource_reset(self): def test_resource_reset(self):
resource_progress = create_resource(self.ctx, self.stack, resource_progress = create_resource(self.ctx, self.stack,
status='IN_PROGRESS') status='IN_PROGRESS',
engine_id=UUID2)
resource_complete = create_resource(self.ctx, self.stack) resource_complete = create_resource(self.ctx, self.stack)
db_api.reset_stack_status(self.ctx, self.stack.id) db_api.reset_stack_status(self.ctx, self.stack.id)
@ -3628,6 +3629,7 @@ class ResetStackStatusTests(common.HeatTestCase):
resource_progress = db_api.resource_get(self.ctx, resource_progress.id) resource_progress = db_api.resource_get(self.ctx, resource_progress.id)
self.assertEqual('complete', resource_complete.status) self.assertEqual('complete', resource_complete.status)
self.assertEqual('FAILED', resource_progress.status) self.assertEqual('FAILED', resource_progress.status)
self.assertIsNone(resource_progress.engine_id)
def test_hook_reset(self): def test_hook_reset(self):
resource = create_resource(self.ctx, self.stack) resource = create_resource(self.ctx, self.stack)
@ -3645,7 +3647,8 @@ class ResetStackStatusTests(common.HeatTestCase):
owner_id=self.stack.id) owner_id=self.stack.id)
grandchild = create_stack(self.ctx, self.template, self.user_creds, grandchild = create_stack(self.ctx, self.template, self.user_creds,
owner_id=child.id, status='IN_PROGRESS') owner_id=child.id, status='IN_PROGRESS')
resource = create_resource(self.ctx, grandchild, status='IN_PROGRESS') resource = create_resource(self.ctx, grandchild, status='IN_PROGRESS',
engine_id=UUID2)
db_api.reset_stack_status(self.ctx, self.stack.id) db_api.reset_stack_status(self.ctx, self.stack.id)
grandchild = db_api.stack_get(self.ctx, grandchild.id) grandchild = db_api.stack_get(self.ctx, grandchild.id)
@ -3653,4 +3656,5 @@ class ResetStackStatusTests(common.HeatTestCase):
resource = db_api.resource_get(self.ctx, resource.id) resource = db_api.resource_get(self.ctx, resource.id)
self.assertEqual('FAILED', grandchild.status) self.assertEqual('FAILED', grandchild.status)
self.assertEqual('FAILED', resource.status) self.assertEqual('FAILED', resource.status)
self.assertIsNone(resource.engine_id)
self.assertEqual('FAILED', self.stack.status) self.assertEqual('FAILED', self.stack.status)