openstack/heat
Code Issues Proposed changes

Merge "Don't eager load raw_template in a few places"

Browse Source
This commit is contained in:
Jenkins
2017-03-02 17:35:39 +00:00
committed by Gerrit Code Review
parent ab267e763a 02e7f70619
commit cfbc624b75
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -685,7 +685,7 @@ def stack_update(context, stack_id, values, exp_trvsl=None):
def stack_delete(context, stack_id): def stack_delete(context, stack_id):
s = stack_get(context, stack_id) s = stack_get(context, stack_id, eager_load=False)
if not s: if not s:
raise exception.NotFound(_('Attempt to delete a stack with id: ' raise exception.NotFound(_('Attempt to delete a stack with id: '
'%(id)s %(msg)s') % { '%(id)s %(msg)s') % {
@@ -752,11 +752,11 @@ def stack_lock_release(context, stack_id, engine_id):
def stack_get_root_id(context, stack_id): def stack_get_root_id(context, stack_id):
s = stack_get(context, stack_id) s = stack_get(context, stack_id, eager_load=False)
if not s: if not s:
return None return None
while s.owner_id: while s.owner_id:
s = stack_get(context, s.owner_id) s = stack_get(context, s.owner_id, eager_load=False)
return s.id return s.id