summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Smith <dansmith@redhat.com>2023-01-31 11:30:35 -0800
committerDan Smith <dansmith@redhat.com>2023-02-01 09:20:59 -0800
commit5934f85fb9e7d18a05ef7e8a6217697bed753d4f (patch)
treedce3e93c5e068930993d6f380a8f9de4671ab0c7
parentd892905904fd8ed7b5bb916ca4a119997ea0c9a7 (diff)
downloadnova-5934f85fb9e7d18a05ef7e8a6217697bed753d4f.tar.gz
Move comment about _destroy_evacuated_instances()
Per feedback in I595b27a57516cffe1f172cf2fb736e1b11373a1d, this moves a comment about _destroy_evacuated_instances() further down closer to where that method is called. Change-Id: I72812918b26bf20d6ab5289f5eb855b23cc83881
-rw-r--r--nova/compute/manager.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 2aad5c77fb..c4537cd9a2 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -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(