openstack/nova
Code Issues Proposed changes

Isolate request spec handling from _cold_migrate

Browse Source 
The compat code for the request spec in _cold_migrate is
nearly as big as the rest of the method. This moves that to
another method and also slides the image meta handling within
the first condition where it's needed and renames the 'image'
variable to 'image_meta' to stop shadowing the 'image' module
import.

Change-Id: I83e1a1eba594897f4610e1f9074a24d79443a025
This commit is contained in:
Matt Riedemann 2019-09-06 15:38:57 -04:00
parent b36c44c449
commit 1024941c0d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nova/conductor/manager.py
View File

@ -300,11 +300,9 @@ class ComputeTaskManager(base.Base):
else: else:
raise NotImplementedError() raise NotImplementedError()
def _cold_migrate(self, context, instance, flavor, filter_properties, @staticmethod
clean_shutdown, request_spec, host_list): def _get_request_spec_for_cold_migrate(context, instance, flavor,
image = utils.get_image_from_system_metadata( filter_properties, request_spec):
instance.system_metadata)
# NOTE(sbauza): If a reschedule occurs when prep_resize(), then # NOTE(sbauza): If a reschedule occurs when prep_resize(), then
# it only provides filter_properties legacy dict back to the # it only provides filter_properties legacy dict back to the
# conductor with no RequestSpec part of the payload for <Stein # conductor with no RequestSpec part of the payload for <Stein
@ -312,10 +310,12 @@ class ComputeTaskManager(base.Base):
# TODO(mriedem): We can remove this compat code for no request spec # TODO(mriedem): We can remove this compat code for no request spec
# coming to conductor in ComputeTaskAPI RPC API version 2.0 # coming to conductor in ComputeTaskAPI RPC API version 2.0
if not request_spec: if not request_spec:
image_meta = utils.get_image_from_system_metadata(
instance.system_metadata)
# Make sure we hydrate a new RequestSpec object with the new flavor # Make sure we hydrate a new RequestSpec object with the new flavor
# and not the nested one from the instance # and not the nested one from the instance
request_spec = objects.RequestSpec.from_components( request_spec = objects.RequestSpec.from_components(
context, instance.uuid, image, context, instance.uuid, image_meta,
flavor, instance.numa_topology, instance.pci_requests, flavor, instance.numa_topology, instance.pci_requests,
filter_properties, None, instance.availability_zone, filter_properties, None, instance.availability_zone,
project_id=instance.project_id, user_id=instance.user_id) project_id=instance.project_id, user_id=instance.user_id)
@ -337,6 +337,12 @@ class ComputeTaskManager(base.Base):
# original RequestSpec object for make sure the scheduler verifies # original RequestSpec object for make sure the scheduler verifies
# the right one and not the original flavor # the right one and not the original flavor
request_spec.flavor = flavor request_spec.flavor = flavor
return request_spec
def _cold_migrate(self, context, instance, flavor, filter_properties,
clean_shutdown, request_spec, host_list):
request_spec = self._get_request_spec_for_cold_migrate(
context, instance, flavor, filter_properties, request_spec)
task = self._build_cold_migrate_task(context, instance, flavor, task = self._build_cold_migrate_task(context, instance, flavor,
request_spec, clean_shutdown, host_list) request_spec, clean_shutdown, host_list)