openstack
/
heat
Code Issues Proposed changes

Trivial refactor of session var in reset_stack_status 

Non-functional change.

Change-Id: I33580190cc52df53c6bb411b1c8ec9cfe8be6a9f
This commit is contained in:
Crag Wolfe 2016-09-19 23:05:05 -04:00
parent 3f37fa55e2
commit a5eb936d70
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1547,21 +1547,21 @@ def _get_batch(session, ctxt, query, model, batch_size=50):
def reset_stack_status(context, stack_id, stack=None):
session = context.session
if stack is None:
stack = context.session.query(models.Stack).get(stack_id)
stack = session.query(models.Stack).get(stack_id)
if stack is None:
raise exception.NotFound(_('Stack with id %s not found') % stack_id)
session = context.session
with session.begin():
query = context.session.query(models.Resource).filter_by(
query = session.query(models.Resource).filter_by(
status='IN_PROGRESS', stack_id=stack_id)
query.update({'status': 'FAILED',
'status_reason': 'Stack status manually reset',
'engine_id': None})
query = context.session.query(models.ResourceData)
query = session.query(models.ResourceData)
query = query.join(models.Resource)
query = query.filter_by(stack_id=stack_id)
query = query.filter(
@ -1569,11 +1569,11 @@ def reset_stack_status(context, stack_id, stack=None):
data_ids = [data.id for data in query]
if data_ids:
query = context.session.query(models.ResourceData)
query = session.query(models.ResourceData)
query = query.filter(models.ResourceData.id.in_(data_ids))
query.delete(synchronize_session='fetch')
query = context.session.query(models.Stack).filter_by(owner_id=stack_id)
query = session.query(models.Stack).filter_by(owner_id=stack_id)
for child in query:
reset_stack_status(context, child.id, child)