openstack/nova
Code Issues Proposed changes

Split out the core of the ironic flavor migration

Browse Source 
This is split out to a staticmethod so we can call it externally
and push the migration offline.

Change-Id: Iec45e4a48d2c3893a999cb0570feb6874acca3eb
This commit is contained in:
Dan Smith 2017-09-05 14:50:18 -07:00
parent d83e9c0b17
commit 10661dc5e2
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nova/virt/ironic/driver.py
View File

@ -513,6 +513,21 @@ class IronicDriver(virt_driver.ComputeDriver):
"""
self._refresh_hash_ring(nova_context.get_admin_context())
@staticmethod
def _pike_flavor_migration_for_node(ctx, node_rc, instance_uuid):
normalized_rc = obj_fields.ResourceClass.normalize_name(node_rc)
instance = objects.Instance.get_by_uuid(ctx, instance_uuid,
expected_attrs=["flavor"])
specs = instance.flavor.extra_specs
resource_key = "resources:%s" % normalized_rc
if resource_key in specs:
# The compute must have been restarted, and the instance.flavor
# has already been migrated
return False
specs[resource_key] = "1"
instance.save()
return True
def _pike_flavor_migration(self, node_uuids):
"""This code is needed in Pike to prevent problems where an operator
has already adjusted their flavors to add the custom resource class to
@ -539,21 +554,12 @@ class IronicDriver(virt_driver.ComputeDriver):
continue
if node.instance_uuid in self._migrated_instance_uuids:
continue
normalized_rc = obj_fields.ResourceClass.normalize_name(node_rc)
instance = objects.Instance.get_by_uuid(ctx, node.instance_uuid,
expected_attrs=["flavor"])
specs = instance.flavor.extra_specs
resource_key = "resources:%s" % normalized_rc
self._pike_flavor_migration_for_node(ctx, node_rc,
node.instance_uuid)
self._migrated_instance_uuids.add(node.instance_uuid)
if resource_key in specs:
# The compute must have been restarted, and the instance.flavor
# has already been migrated
continue
specs[resource_key] = "1"
instance.save()
LOG.debug("The flavor extra_specs for Ironic instance %(inst)s "
"have been updated for custom resource class '%(rc)s'.",
{"inst": instance.uuid, "rc": node_rc})
{"inst": node.instance_uuid, "rc": node_rc})
return
def _get_hypervisor_type(self):