openstack
/
nova
Code Issues Proposed changes

Merge "Allow deletion of compute service with no compute nodes" into stable/victoria

This commit is contained in:
Zuul 2021-09-05 05:13:08 +00:00 committed by Gerrit Code Review
parent 816c3e9d85 e238cc9cd6
commit e9b60776b4
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nova/api/openstack/compute/services.py
View File

@ -267,10 +267,25 @@ class ServiceController(wsgi.Controller):
# service delete since we could orphan resource providers and
# break the ability to do things like confirm/revert instances
# in VERIFY_RESIZE status.
compute_nodes = objects.ComputeNodeList.get_all_by_host(
context, service.host)
self._assert_no_in_progress_migrations(
context, id, compute_nodes)
compute_nodes = []
try:
compute_nodes = objects.ComputeNodeList.get_all_by_host(
context, service.host)
self._assert_no_in_progress_migrations(
context, id, compute_nodes)
except exception.ComputeHostNotFound:
# NOTE(artom) Consider the following situation:
# - Using the Ironic virt driver
# - Replacing (so removing and re-adding) all baremetal
# nodes associated with a single nova-compute service
# The update resources periodic will have destroyed the
# compute node records because they're no longer being
# reported by the virt driver. If we then attempt to
# manually delete the compute service record,
# get_all_host() above will raise, as there are no longer
# any compute node records for the host. Catch it here and
# continue to allow compute service deletion.
pass
aggrs = self.aggregate_api.get_aggregates_by_host(context,
service.host)

6
nova/tests/unit/api/openstack/compute/test_services.py
View File

@ -712,11 +712,7 @@ class ServicesTestV21(test.TestCase):
'topic': 'compute',
'report_count': 0})
compute.create()
# FIXME(artom) Until bug 1860312 is fixed, the ComputeHostNotFound
# error will get bubbled up to the API as an error 500.
self.assertRaises(
webob.exc.HTTPInternalServerError,
self.controller.delete, self.req, compute.id)
self.controller.delete(self.req, compute.id)
mock_get_all_by_host.assert_called_with(
self.req.environ['nova.context'], 'fake-compute-host')