openstack
/
heat
Code Issues Proposed changes

Merge "Always eager load the raw_template for a stack"

This commit is contained in:
Jenkins 2016-08-16 06:36:17 +00:00 committed by Gerrit Code Review
parent b67d76d68b 3ab0ede98c
commit b412c2793a
9 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/db/api.py
View File

@ -156,11 +156,9 @@ def resource_get_by_physical_resource_id(context, physical_resource_id):
physical_resource_id)
def stack_get(context, stack_id, show_deleted=False, tenant_safe=True,
eager_load=False):
def stack_get(context, stack_id, show_deleted=False, tenant_safe=True):
return IMPL.stack_get(context, stack_id, show_deleted=show_deleted,
tenant_safe=tenant_safe,
eager_load=eager_load)
tenant_safe=tenant_safe)
def stack_get_status(context, stack_id):

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

@ -415,28 +415,26 @@ def resource_get_all_by_root_stack(context, stack_id, filters=None):
def stack_get_by_name_and_owner_id(context, stack_name, owner_id):
query = soft_delete_aware_query(
context, models.Stack
).filter(sqlalchemy.or_(
models.Stack.tenant == context.tenant_id,
models.Stack.stack_user_project_id == context.tenant_id)
).filter_by(name=stack_name).filter_by(owner_id=owner_id)
).options(orm.joinedload("raw_template")).filter(sqlalchemy.or_(
models.Stack.tenant == context.tenant_id,
models.Stack.stack_user_project_id == context.tenant_id)
).filter_by(name=stack_name).filter_by(owner_id=owner_id)
return query.first()
def stack_get_by_name(context, stack_name):
query = soft_delete_aware_query(
context, models.Stack
).filter(sqlalchemy.or_(
models.Stack.tenant == context.tenant_id,
models.Stack.stack_user_project_id == context.tenant_id)
).filter_by(name=stack_name)
).options(orm.joinedload("raw_template")).filter(sqlalchemy.or_(
models.Stack.tenant == context.tenant_id,
models.Stack.stack_user_project_id == context.tenant_id)
).filter_by(name=stack_name)
return query.first()
def stack_get(context, stack_id, show_deleted=False, tenant_safe=True,
eager_load=False):
query = context.session.query(models.Stack)
if eager_load:
query = query.options(orm.joinedload("raw_template"))
def stack_get(context, stack_id, show_deleted=False, tenant_safe=True):
query = context.session.query(models.Stack).options(
orm.joinedload("raw_template"))
result = query.get(stack_id)
deleted_ok = show_deleted or context.show_deleted
@ -569,6 +567,7 @@ def stack_get_all(context, limit=None, sort_keys=None, marker=None,
show_hidden=show_hidden, tags=tags,
tags_any=tags_any, not_tags=not_tags,
not_tags_any=not_tags_any)
query = query.options(orm.joinedload("raw_template"))
return _filter_and_page_query(context, query, limit, sort_keys,
marker, sort_dir, filters).all()

6
heat/engine/service.py
View File

@ -481,8 +481,7 @@ class EngineService(service.Service):
s = stack_object.Stack.get_by_id(
cnxt,
identity.stack_id,
show_deleted=show_deleted,
eager_load=True)
show_deleted=show_deleted)
if s is None:
raise exception.EntityNotFound(entity='Stack',
@ -2292,8 +2291,7 @@ class EngineService(service.Service):
s = stack_object.Stack.get_by_id(
cnxt,
stack_id,
tenant_safe=False,
eager_load=True)
tenant_safe=False)
if s.status != parser.Stack.IN_PROGRESS:
lock.release()
continue

3
heat/engine/service_stack_watch.py
View File

@ -69,8 +69,7 @@ class StackWatch(object):
admin_context = context.get_admin_context()
db_stack = stack_object.Stack.get_by_id(admin_context,
sid,
tenant_safe=False,
eager_load=True)
tenant_safe=False)
if not db_stack:
LOG.error(_LE("Unable to retrieve stack %s for periodic task"),
sid)

3
heat/engine/stack.py
View File

@ -487,8 +487,7 @@ class Stack(collections.Mapping):
stack = stack_object.Stack.get_by_id(
context,
stack_id,
show_deleted=show_deleted,
eager_load=True)
show_deleted=show_deleted)
if stack is None:
message = _('No stack exists with id "%s"') % str(stack_id)
raise exception.NotFound(message)

3
heat/engine/watchrule.py
View File

@ -265,8 +265,7 @@ class WatchRule(object):
else:
s = stack_object.Stack.get_by_id(
self.context,
self.stack_id,
eager_load=True)
self.stack_id)
stk = stack.Stack.load(self.context, stack=s)
if (stk.action != stk.DELETE
and stk.status == stk.COMPLETE):

10
heat/objects/raw_template.py
View File

@ -52,7 +52,7 @@ class RawTemplate(
}
@staticmethod
def _from_db_object(context, tpl, db_tpl):
def from_db_object(context, tpl, db_tpl):
for field in tpl.fields:
tpl[field] = db_tpl[field]
@ -85,7 +85,7 @@ class RawTemplate(
@classmethod
def get_by_id(cls, context, template_id):
raw_template_db = db_api.raw_template_get(context, template_id)
return cls._from_db_object(context, cls(), raw_template_db)
return cls.from_db_object(context, cls(), raw_template_db)
@classmethod
def encrypt_hidden_parameters(cls, tmpl):
@ -100,8 +100,8 @@ class RawTemplate(
@classmethod
def create(cls, context, values):
return cls._from_db_object(context, cls(),
db_api.raw_template_create(context, values))
return cls.from_db_object(context, cls(),
db_api.raw_template_create(context, values))
@classmethod
def update_by_id(cls, context, template_id, values):
@ -109,7 +109,7 @@ class RawTemplate(
# table, not in the old location of raw_template.files
if 'files_id' in values and values['files_id']:
values['files'] = None
return cls._from_db_object(
return cls.from_db_object(
context, cls(),
db_api.raw_template_update(context, template_id, values))

6
heat/objects/stack.py
View File

@ -68,8 +68,10 @@ class Stack(
for field in stack.fields:
if field == 'raw_template':
stack['raw_template'] = (
raw_template.RawTemplate.get_by_id(
context, db_stack['raw_template_id']))
raw_template.RawTemplate.from_db_object(
context,
raw_template.RawTemplate(),
db_stack['raw_template']))
else:
stack[field] = db_stack.__dict__.get(field)
stack._context = context

4
heat/tests/test_engine_service.py
View File

@ -1385,8 +1385,8 @@ class StackServiceTest(common.HeatTestCase):
tenant_safe=False,
show_nested=True)
mock_get_by_id.assert_has_calls([
mock.call(self.ctx, 'foo', tenant_safe=False, eager_load=True),
mock.call(self.ctx, 'bar', tenant_safe=False, eager_load=True),
mock.call(self.ctx, 'foo', tenant_safe=False),
mock.call(self.ctx, 'bar', tenant_safe=False),
])
mock_stack_load.assert_called_once_with(self.ctx,
stack=db_stack,