openstack
/
nova
Code Issues Proposed changes

Merge "Move comment about _destroy_evacuated_instances()"

This commit is contained in:
Zuul 2023-02-07 13:42:18 +00:00 committed by Gerrit Code Review
parent 8cbb241e01 5934f85fb9
commit 7ea9aac71c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nova/compute/manager.py
View File

@ -1610,12 +1610,6 @@ class ComputeManager(manager.Manager):
# NOTE(gibi): At this point the compute_nodes of the resource tracker
# has not been populated yet so we cannot rely on the resource tracker
# here.
# NOTE(gibi): If ironic and vcenter virt driver slow start time
# becomes problematic here then we should consider adding a config
# option or a driver flag to tell us if we should thread
# _destroy_evacuated_instances and
# _error_out_instances_whose_build_was_interrupted out in the
# background on startup
context = nova.context.get_admin_context()
nodes_by_uuid = self._get_nodes(context)
@ -1633,6 +1627,12 @@ class ComputeManager(manager.Manager):
self._validate_pinning_configuration(instances)
self._validate_vtpm_configuration(instances)
# NOTE(gibi): If ironic and vcenter virt driver slow start time
# becomes problematic here then we should consider adding a config
# option or a driver flag to tell us if we should thread
# _destroy_evacuated_instances and
# _error_out_instances_whose_build_was_interrupted out in the
# background on startup
try:
# checking that instance was not already evacuated to other host
evacuated_instances = self._destroy_evacuated_instances(