openstack
/
nova
Code Issues Proposed changes

Merge "rp: Move RP._get|set_aggregates() to module scope"

This commit is contained in:
Jenkins 2017-10-10 06:27:52 +00:00 committed by Gerrit Code Review
parent 650c9f3f08 9d400c3a0a
commit 232458ae4e
2 changed files with 75 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
nova/objects/resource_provider.py
View File

@ -412,6 +412,77 @@ def _get_provider_by_uuid(context, uuid):
return dict(res)
@db_api.api_context_manager.reader
def _get_aggregates_by_provider_id(context, rp_id):
conn = context.session.connection()
join_statement = sa.join(
_AGG_TBL, _RP_AGG_TBL, sa.and_(
_AGG_TBL.c.id == _RP_AGG_TBL.c.aggregate_id,
_RP_AGG_TBL.c.resource_provider_id == rp_id))
sel = sa.select([_AGG_TBL.c.uuid]).select_from(join_statement)
return [r[0] for r in conn.execute(sel).fetchall()]
@db_api.api_context_manager.writer
def _set_aggregates(context, rp_id, provided_aggregates):
# When aggregate uuids are persisted no validation is done
# to ensure that they refer to something that has meaning
# elsewhere. It is assumed that code which makes use of the
# aggregates, later, will validate their fitness.
# TODO(cdent): At the moment we do not delete
# a PlacementAggregate that no longer has any associations
# with at least one resource provider. We may wish to do that
# to avoid bloat if it turns out we're creating a lot of noise.
# Not doing now to move things along.
provided_aggregates = set(provided_aggregates)
existing_aggregates = set(_get_aggregates_by_provider_id(context, rp_id))
to_add = provided_aggregates - existing_aggregates
target_aggregates = list(provided_aggregates)
# Create any aggregates that do not yet exist in
# PlacementAggregates. This is different from
# the set in existing_aggregates; those are aggregates for
# which there are associations for the resource provider
# at rp_id. The following loop checks for the existence of any
# aggregate with the provided uuid. In this way we only
# create a new row in the PlacementAggregate table if the
# aggregate uuid has never been seen before. Code further
# below will update the associations.
for agg_uuid in to_add:
found_agg = context.session.query(models.PlacementAggregate.uuid).\
filter_by(uuid=agg_uuid).first()
if not found_agg:
new_aggregate = models.PlacementAggregate(uuid=agg_uuid)
try:
context.session.add(new_aggregate)
# Flush each aggregate to explicitly call the INSERT
# statement that could result in an integrity error
# if some other thread has added this agg_uuid. This
# also makes sure that the new aggregates have
# ids when the SELECT below happens.
context.session.flush()
except db_exc.DBDuplicateEntry:
# Something else has already added this agg_uuid
pass
# Remove all aggregate associations so we can refresh them
# below. This means that all associations are added, but the
# aggregates themselves stay around.
context.session.query(models.ResourceProviderAggregate).filter_by(
resource_provider_id=rp_id).delete()
# Set resource_provider_id, aggregate_id pairs to
# ResourceProviderAggregate table.
if target_aggregates:
select_agg_id = sa.select([rp_id, models.PlacementAggregate.id]).\
where(models.PlacementAggregate.uuid.in_(target_aggregates))
insert_aggregates = models.ResourceProviderAggregate.__table__.\
insert().from_select(['resource_provider_id', 'aggregate_id'],
select_agg_id)
conn = context.session.connection()
conn.execute(insert_aggregates)
@base.NovaObjectRegistry.register_if(False)
class ResourceProvider(base.NovaObject):
@ -494,7 +565,7 @@ class ResourceProvider(base.NovaObject):
def get_aggregates(self):
"""Get the aggregate uuids associated with this resource provider."""
return self._get_aggregates(self._context, self.id)
return _get_aggregates_by_provider_id(self._context, self.id)
def set_aggregates(self, aggregate_uuids):
"""Set the aggregate uuids associated with this resource provider.
@ -502,7 +573,7 @@ class ResourceProvider(base.NovaObject):
If an aggregate does not exist, one will be created using the
provided uuid.
"""
self._set_aggregates(self._context, self.id, aggregate_uuids)
_set_aggregates(self._context, self.id, aggregate_uuids)
@staticmethod
@db_api.api_context_manager.writer
@ -550,77 +621,6 @@ class ResourceProvider(base.NovaObject):
resource_provider.obj_reset_changes()
return resource_provider
@staticmethod
@db_api.api_context_manager.reader
def _get_aggregates(context, rp_id):
conn = context.session.connection()
join_statement = sa.join(
_AGG_TBL, _RP_AGG_TBL, sa.and_(
_AGG_TBL.c.id == _RP_AGG_TBL.c.aggregate_id,
_RP_AGG_TBL.c.resource_provider_id == rp_id))
sel = sa.select([_AGG_TBL.c.uuid]).select_from(join_statement)
return [r[0] for r in conn.execute(sel).fetchall()]
@classmethod
@db_api.api_context_manager.writer
def _set_aggregates(cls, context, rp_id, provided_aggregates):
# When aggregate uuids are persisted no validation is done
# to ensure that they refer to something that has meaning
# elsewhere. It is assumed that code which makes use of the
# aggregates, later, will validate their fitness.
# TODO(cdent): At the moment we do not delete
# a PlacementAggregate that no longer has any associations
# with at least one resource provider. We may wish to do that
# to avoid bloat if it turns out we're creating a lot of noise.
# Not doing now to move things along.
provided_aggregates = set(provided_aggregates)
existing_aggregates = set(cls._get_aggregates(context, rp_id))
to_add = provided_aggregates - existing_aggregates
target_aggregates = list(provided_aggregates)
# Create any aggregates that do not yet exist in
# PlacementAggregates. This is different from
# the set in existing_aggregates; those are aggregates for
# which there are associations for the resource provider
# at rp_id. The following loop checks for the existence of any
# aggregate with the provided uuid. In this way we only
# create a new row in the PlacementAggregate table if the
# aggregate uuid has never been seen before. Code further
# below will update the associations.
for agg_uuid in to_add:
found_agg = context.session.query(models.PlacementAggregate.uuid).\
filter_by(uuid=agg_uuid).first()
if not found_agg:
new_aggregate = models.PlacementAggregate(uuid=agg_uuid)
try:
context.session.add(new_aggregate)
# Flush each aggregate to explicitly call the INSERT
# statement that could result in an integrity error
# if some other thread has added this agg_uuid. This
# also makes sure that the new aggregates have
# ids when the SELECT below happens.
context.session.flush()
except db_exc.DBDuplicateEntry:
# Something else has already added this agg_uuid
pass
# Remove all aggregate associations so we can refresh them
# below. This means that all associations are added, but the
# aggregates themselves stay around.
context.session.query(models.ResourceProviderAggregate).filter_by(
resource_provider_id=rp_id).delete()
# Set resource_provider_id, aggregate_id pairs to
# ResourceProviderAggregate table.
if target_aggregates:
select_agg_id = sa.select([rp_id, models.PlacementAggregate.id]).\
where(models.PlacementAggregate.uuid.in_(target_aggregates))
insert_aggregates = models.ResourceProviderAggregate.__table__.\
insert().from_select(['resource_provider_id', 'aggregate_id'],
select_agg_id)
conn = context.session.connection()
conn.execute(insert_aggregates)
@staticmethod
@db_api.api_context_manager.reader
def _get_traits_from_db(context, _id):

5
nova/tests/functional/db/test_resource_provider.py
View File

@ -801,13 +801,12 @@ class TestResourceProviderAggregates(test.NoDBTestCase):
name=uuidsentinel.rp_name
)
rp.create()
rp_id = rp.id
start_aggregate_uuids = [uuidsentinel.agg_a, uuidsentinel.agg_b]
rp.set_aggregates(start_aggregate_uuids)
aggs = rp_obj.ResourceProvider._get_aggregates(self.ctx, rp_id)
aggs = rp.get_aggregates()
self.assertEqual(2, len(aggs))
rp.destroy()
aggs = rp_obj.ResourceProvider._get_aggregates(self.ctx, rp_id)
aggs = rp.get_aggregates()
self.assertEqual(0, len(aggs))