openstack
/
nova
Code Issues Proposed changes

Merge "Log the operation when updating generation in ProviderTree"

This commit is contained in:
Zuul 2018-10-22 16:20:59 +00:00 committed by Gerrit Code Review
parent 6cb5b22516 9c842d1aa6
commit dbc365ba45
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nova/compute/provider_tree.py
View File

@ -148,15 +148,17 @@ class _Provider(object):
return True return True
return False return False
def _update_generation(self, generation): def _update_generation(self, generation, operation):
if generation is not None and generation != self.generation: if generation is not None and generation != self.generation:
msg_args = { msg_args = {
'rp_uuid': self.uuid, 'rp_uuid': self.uuid,
'old': self.generation, 'old': self.generation,
'new': generation, 'new': generation,
'op': operation
} }
LOG.debug("Updating resource provider %(rp_uuid)s generation " LOG.debug("Updating resource provider %(rp_uuid)s generation "
"from %(old)s to %(new)s", msg_args) "from %(old)s to %(new)s during operation: %(op)s",
msg_args)
self.generation = generation self.generation = generation
def update_inventory(self, inventory, generation): def update_inventory(self, inventory, generation):
@ -164,7 +166,7 @@ class _Provider(object):
provider generation to set the provider to. The method returns whether provider generation to set the provider to. The method returns whether
the inventory has changed. the inventory has changed.
""" """
self._update_generation(generation) self._update_generation(generation, 'update_inventory')
if self.has_inventory_changed(inventory): if self.has_inventory_changed(inventory):
self.inventory = copy.deepcopy(inventory) self.inventory = copy.deepcopy(inventory)
return True return True
@ -179,7 +181,7 @@ class _Provider(object):
provider generation to set the provider to. The method returns whether provider generation to set the provider to. The method returns whether
the traits have changed. the traits have changed.
""" """
self._update_generation(generation) self._update_generation(generation, 'update_traits')
if self.have_traits_changed(new): if self.have_traits_changed(new):
self.traits = set(new) # create a copy of the new traits self.traits = set(new) # create a copy of the new traits
return True return True
@ -204,7 +206,7 @@ class _Provider(object):
provider generation to set the provider to. The method returns whether provider generation to set the provider to. The method returns whether
the aggregates have changed. the aggregates have changed.
""" """
self._update_generation(generation) self._update_generation(generation, 'update_aggregates')
if self.have_aggregates_changed(new): if self.have_aggregates_changed(new):
self.aggregates = set(new) # create a copy of the new aggregates self.aggregates = set(new) # create a copy of the new aggregates
return True return True