Skip to content

Commit 5934f85

Browse files
committed
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
1 parent d892905 commit 5934f85

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

nova/compute/manager.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1610,12 +1610,6 @@ def init_host(self, service_ref):
16101610
# NOTE(gibi): At this point the compute_nodes of the resource tracker
16111611
# has not been populated yet so we cannot rely on the resource tracker
16121612
# here.
1613-
# NOTE(gibi): If ironic and vcenter virt driver slow start time
1614-
# becomes problematic here then we should consider adding a config
1615-
# option or a driver flag to tell us if we should thread
1616-
# _destroy_evacuated_instances and
1617-
# _error_out_instances_whose_build_was_interrupted out in the
1618-
# background on startup
16191613
context = nova.context.get_admin_context()
16201614
nodes_by_uuid = self._get_nodes(context)
16211615

@@ -1633,6 +1627,12 @@ def init_host(self, service_ref):
16331627
self._validate_pinning_configuration(instances)
16341628
self._validate_vtpm_configuration(instances)
16351629

1630+
# NOTE(gibi): If ironic and vcenter virt driver slow start time
1631+
# becomes problematic here then we should consider adding a config
1632+
# option or a driver flag to tell us if we should thread
1633+
# _destroy_evacuated_instances and
1634+
# _error_out_instances_whose_build_was_interrupted out in the
1635+
# background on startup
16361636
try:
16371637
# checking that instance was not already evacuated to other host
16381638
evacuated_instances = self._destroy_evacuated_instances(

0 commit comments

Comments
 (0)