openstack
/
nova
Code Issues Proposed changes

Merge "Reformat _get_all_with_shared"

This commit is contained in:
Zuul 2017-12-09 06:54:34 +00:00 committed by Gerrit Code Review
parent ced5d0f323 55b6a2f5d3
commit 4784513b41
1 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
nova/objects/resource_provider.py
View File

@ -1335,31 +1335,21 @@ def _get_all_with_shared(ctx, resources):
joiner = sa.join
if sps:
joiner = sa.outerjoin
inv_join = joiner(
rp_link, it,
sa.and_(
jc,
# Add a join condition winnowing this copy of inventories table
# to only the resource class being analyzed in this loop...
it.c.resource_class_id == rc_id,
),
)
# Add a join condition winnowing this copy of inventories table
# to only the resource class being analyzed in this loop...
inv_join = joiner(rp_link, it,
sa.and_(jc, it.c.resource_class_id == rc_id))
lastij = it
usage_join = sa.outerjoin(
inv_join, ut,
it.c.resource_provider_id == ut.c.resource_provider_id,
)
usage_join = sa.outerjoin(inv_join, ut,
it.c.resource_provider_id == ut.c.resource_provider_id)
join_chain = usage_join
usage_cond = sa.and_(
(
(sql.func.coalesce(ut.c.used, 0) + amount) <=
(it.c.total - it.c.reserved) * it.c.allocation_ratio
),
((sql.func.coalesce(ut.c.used, 0) + amount) <=
(it.c.total - it.c.reserved) * it.c.allocation_ratio),
it.c.min_unit <= amount,
it.c.max_unit >= amount,
amount % it.c.step_size == 0,
)
amount % it.c.step_size == 0)
if not sps:
where_conds.append(usage_cond)
else:
@ -1370,24 +1360,19 @@ def _get_all_with_shared(ctx, resources):
it.c.resource_provider_id != sa.null(),
usage_cond,
),
sharing.c.resource_provider_id != sa.null(),
)
sharing.c.resource_provider_id != sa.null())
where_conds.append(cond)
# We need to add the "butterfly" join now that produces the set of
# resource providers associated with a provider that is sharing the
# resource via an aggregate
shared_join = sa.outerjoin(
join_chain, shared,
rpt.c.id == shared.c.resource_provider_id,
)
sharing_join = sa.outerjoin(
shared_join, sharing,
shared_join = sa.outerjoin(join_chain, shared,
rpt.c.id == shared.c.resource_provider_id)
sharing_join = sa.outerjoin(shared_join, sharing,
sa.and_(
shared.c.aggregate_id == sharing.c.aggregate_id,
sharing.c.resource_provider_id.in_(sps),
),
)
))
join_chain = sharing_join
sel = sel.select_from(join_chain)