openstack/nova
Code Issues Proposed changes

Merge "Delete orphan compute nodes before updating resources"

Browse Source
This commit is contained in:
Zuul 2018-08-01 01:41:40 +00:00 committed by Gerrit Code Review
commit 372f624893
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/compute/manager.py
View File

@ -7756,9 +7756,6 @@ class ComputeManager(manager.Manager):
LOG.warning("Virt driver is not ready.")
return
for nodename in nodenames:
self._update_available_resource_for_node(context, nodename)
# Delete orphan compute node not reported by driver but still in db
for cn in compute_nodes_in_db:
if cn.hypervisor_hostname not in nodenames:
@ -7774,6 +7771,9 @@ class ComputeManager(manager.Manager):
self.scheduler_client.reportclient.delete_resource_provider(
context, cn, cascade=True)
for nodename in nodenames:
self._update_available_resource_for_node(context, nodename)
def _get_compute_nodes_in_db(self, context, use_slave=False,
startup=False):
try: