openstack/nova
Code Issues Proposed changes

Merge "Use targeted context when burying instances in cell0"

Browse Source
This commit is contained in:
Jenkins 2017-05-28 23:41:32 +00:00 committed by Gerrit Code Review
commit 0d31fb303e
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nova/conductor/manager.py
View File

@ -883,12 +883,16 @@ class ComputeTaskManager(base.Base):
updates = {'vm_state': vm_states.ERROR, 'task_state': None} updates = {'vm_state': vm_states.ERROR, 'task_state': None}
legacy_spec = request_spec.to_legacy_request_spec_dict() legacy_spec = request_spec.to_legacy_request_spec_dict()
for instance in instances_by_uuid.values(): for instance in instances_by_uuid.values():
with obj_target_cell(instance, cell0): with obj_target_cell(instance, cell0) as cctxt:
instance.create() instance.create()
# Use the context targeted to cell0 here since the instance is
# now in cell0.
self._set_vm_state_and_notify( self._set_vm_state_and_notify(
context, instance.uuid, 'build_instances', updates, cctxt, instance.uuid, 'build_instances', updates,
exc, legacy_spec) exc, legacy_spec)
try: try:
# We don't need the cell0-targeted context here because the
# instance mapping is in the API DB.
inst_mapping = \ inst_mapping = \
objects.InstanceMapping.get_by_instance_uuid( objects.InstanceMapping.get_by_instance_uuid(
context, instance.uuid) context, instance.uuid)
@ -988,7 +992,7 @@ class ComputeTaskManager(base.Base):
inst_mapping.save() inst_mapping.save()
if not self._delete_build_request( if not self._delete_build_request(
context, build_request, instance, cell, instance_bdms): build_request, instance, cell, instance_bdms):
# The build request was deleted before/during scheduling so # The build request was deleted before/during scheduling so
# the instance is gone and we don't have anything to build for # the instance is gone and we don't have anything to build for
# this one. # this one.
@ -1013,15 +1017,13 @@ class ComputeTaskManager(base.Base):
host=host['host'], node=host['nodename'], host=host['host'], node=host['nodename'],
limits=host['limits']) limits=host['limits'])
def _delete_build_request(self, context, build_request, instance, cell, def _delete_build_request(self, build_request, instance, cell,
instance_bdms): instance_bdms):
"""Delete a build request after creating the instance in the cell. """Delete a build request after creating the instance in the cell.
This method handles cleaning up the instance in case the build request This method handles cleaning up the instance in case the build request
is already deleted by the time we try to delete it. is already deleted by the time we try to delete it.
:param context: the context of the request being handled
:type context: nova.context.RequestContext'
:param build_request: the build request to delete :param build_request: the build request to delete
:type build_request: nova.objects.BuildRequest :type build_request: nova.objects.BuildRequest
:param instance: the instance created from the build_request :param instance: the instance created from the build_request
@ -1039,9 +1041,9 @@ class ComputeTaskManager(base.Base):
# This indicates an instance deletion request has been # This indicates an instance deletion request has been
# processed, and the build should halt here. Clean up the # processed, and the build should halt here. Clean up the
# bdm and instance record. # bdm and instance record.
with obj_target_cell(instance, cell): with obj_target_cell(instance, cell) as cctxt:
with compute_utils.notify_about_instance_delete( with compute_utils.notify_about_instance_delete(
self.notifier, context, instance): self.notifier, cctxt, instance):
try: try:
instance.destroy() instance.destroy()
except exception.InstanceNotFound: except exception.InstanceNotFound:

29
nova/tests/unit/conductor/test_conductor.py
View File

@ -1571,7 +1571,9 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
@mock.patch('nova.scheduler.rpcapi.SchedulerAPI.select_destinations') @mock.patch('nova.scheduler.rpcapi.SchedulerAPI.select_destinations')
@mock.patch('nova.objects.BuildRequest.destroy') @mock.patch('nova.objects.BuildRequest.destroy')
@mock.patch('nova.conductor.manager.ComputeTaskManager._bury_in_cell0') @mock.patch('nova.conductor.manager.ComputeTaskManager._bury_in_cell0')
def test_schedule_and_build_delete_during_scheduling(self, bury, @mock.patch('nova.conductor.manager.obj_target_cell')
def test_schedule_and_build_delete_during_scheduling(self, target_cell,
bury,
br_destroy, br_destroy,
select_destinations, select_destinations,
build_and_run, build_and_run,
@ -1582,6 +1584,9 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
select_destinations.return_value = [{'host': 'fake-host', select_destinations.return_value = [{'host': 'fake-host',
'nodename': 'nodesarestupid', 'nodename': 'nodesarestupid',
'limits': None}] 'limits': None}]
targeted_context = mock.MagicMock(
autospec='nova.context.RequestContext')
target_cell.return_value.__enter__.return_value = targeted_context
self.conductor.schedule_and_build_instances(**self.params) self.conductor.schedule_and_build_instances(**self.params)
self.assertFalse(build_and_run.called) self.assertFalse(build_and_run.called)
self.assertFalse(bury.called) self.assertFalse(bury.called)
@ -1589,7 +1594,7 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
test_utils.assert_instance_delete_notification_by_uuid( test_utils.assert_instance_delete_notification_by_uuid(
notify, self.params['build_requests'][0].instance_uuid, notify, self.params['build_requests'][0].instance_uuid,
self.conductor.notifier, self.ctxt) self.conductor.notifier, targeted_context)
@mock.patch('nova.objects.Instance.destroy') @mock.patch('nova.objects.Instance.destroy')
@mock.patch('nova.compute.utils.notify_about_instance_usage') @mock.patch('nova.compute.utils.notify_about_instance_usage')
@ -1597,9 +1602,10 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
@mock.patch('nova.scheduler.rpcapi.SchedulerAPI.select_destinations') @mock.patch('nova.scheduler.rpcapi.SchedulerAPI.select_destinations')
@mock.patch('nova.objects.BuildRequest.destroy') @mock.patch('nova.objects.BuildRequest.destroy')
@mock.patch('nova.conductor.manager.ComputeTaskManager._bury_in_cell0') @mock.patch('nova.conductor.manager.ComputeTaskManager._bury_in_cell0')
@mock.patch('nova.conductor.manager.obj_target_cell')
def test_schedule_and_build_delete_during_scheduling_host_changed( def test_schedule_and_build_delete_during_scheduling_host_changed(
self, bury, br_destroy, select_destinations, build_and_run, self, target_cell, bury, br_destroy, select_destinations,
notify, instance_destroy): build_and_run, notify, instance_destroy):
br_destroy.side_effect = exc.BuildRequestNotFound(uuid='foo') br_destroy.side_effect = exc.BuildRequestNotFound(uuid='foo')
instance_destroy.side_effect = [ instance_destroy.side_effect = [
@ -1612,6 +1618,9 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
select_destinations.return_value = [{'host': 'fake-host', select_destinations.return_value = [{'host': 'fake-host',
'nodename': 'nodesarestupid', 'nodename': 'nodesarestupid',
'limits': None}] 'limits': None}]
targeted_context = mock.MagicMock(
autospec='nova.context.RequestContext')
target_cell.return_value.__enter__.return_value = targeted_context
self.conductor.schedule_and_build_instances(**self.params) self.conductor.schedule_and_build_instances(**self.params)
self.assertFalse(build_and_run.called) self.assertFalse(build_and_run.called)
self.assertFalse(bury.called) self.assertFalse(bury.called)
@ -1619,7 +1628,7 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
self.assertEqual(2, instance_destroy.call_count) self.assertEqual(2, instance_destroy.call_count)
test_utils.assert_instance_delete_notification_by_uuid( test_utils.assert_instance_delete_notification_by_uuid(
notify, self.params['build_requests'][0].instance_uuid, notify, self.params['build_requests'][0].instance_uuid,
self.conductor.notifier, self.ctxt) self.conductor.notifier, targeted_context)
@mock.patch('nova.objects.Instance.destroy') @mock.patch('nova.objects.Instance.destroy')
@mock.patch('nova.compute.utils.notify_about_instance_usage') @mock.patch('nova.compute.utils.notify_about_instance_usage')
@ -1627,9 +1636,10 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
@mock.patch('nova.scheduler.rpcapi.SchedulerAPI.select_destinations') @mock.patch('nova.scheduler.rpcapi.SchedulerAPI.select_destinations')
@mock.patch('nova.objects.BuildRequest.destroy') @mock.patch('nova.objects.BuildRequest.destroy')
@mock.patch('nova.conductor.manager.ComputeTaskManager._bury_in_cell0') @mock.patch('nova.conductor.manager.ComputeTaskManager._bury_in_cell0')
@mock.patch('nova.conductor.manager.obj_target_cell')
def test_schedule_and_build_delete_during_scheduling_instance_not_found( def test_schedule_and_build_delete_during_scheduling_instance_not_found(
self, bury, br_destroy, select_destinations, build_and_run, self, target_cell, bury, br_destroy, select_destinations,
notify, instance_destroy): build_and_run, notify, instance_destroy):
br_destroy.side_effect = exc.BuildRequestNotFound(uuid='foo') br_destroy.side_effect = exc.BuildRequestNotFound(uuid='foo')
instance_destroy.side_effect = [ instance_destroy.side_effect = [
@ -1641,6 +1651,9 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
select_destinations.return_value = [{'host': 'fake-host', select_destinations.return_value = [{'host': 'fake-host',
'nodename': 'nodesarestupid', 'nodename': 'nodesarestupid',
'limits': None}] 'limits': None}]
targeted_context = mock.MagicMock(
autospec='nova.context.RequestContext')
target_cell.return_value.__enter__.return_value = targeted_context
self.conductor.schedule_and_build_instances(**self.params) self.conductor.schedule_and_build_instances(**self.params)
self.assertFalse(build_and_run.called) self.assertFalse(build_and_run.called)
self.assertFalse(bury.called) self.assertFalse(bury.called)
@ -1648,7 +1661,7 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
self.assertEqual(1, instance_destroy.call_count) self.assertEqual(1, instance_destroy.call_count)
test_utils.assert_instance_delete_notification_by_uuid( test_utils.assert_instance_delete_notification_by_uuid(
notify, self.params['build_requests'][0].instance_uuid, notify, self.params['build_requests'][0].instance_uuid,
self.conductor.notifier, self.ctxt) self.conductor.notifier, targeted_context)
@mock.patch('nova.compute.rpcapi.ComputeAPI.build_and_run_instance') @mock.patch('nova.compute.rpcapi.ComputeAPI.build_and_run_instance')
@mock.patch('nova.scheduler.rpcapi.SchedulerAPI.select_destinations') @mock.patch('nova.scheduler.rpcapi.SchedulerAPI.select_destinations')