openstack/nova
Code Issues Proposed changes

Merge "Update instance node on rebuild only when it is recreate"

Browse Source
This commit is contained in:
Jenkins 2016-09-24 14:38:35 +00:00 committed by Gerrit Code Review
commit c983a6a2bc
2 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nova/compute/manager.py
View File

@ -2669,12 +2669,15 @@ class ComputeManager(manager.Manager):
# the instance's host and node properties to reflect it's
# destination node for the recreate.
if not scheduled_node:
try:
compute_node = self._get_compute_info(context, self.host)
scheduled_node = compute_node.hypervisor_hostname
except exception.ComputeHostNotFound:
LOG.exception(_LE('Failed to get compute_info for %s'),
self.host)
if recreate:
try:
compute_node = self._get_compute_info(context, self.host)
scheduled_node = compute_node.hypervisor_hostname
except exception.ComputeHostNotFound:
LOG.exception(_LE('Failed to get compute_info for %s'),
self.host)
else:
scheduled_node = instance.node
with self._error_out_instance_on_exception(context, instance):
try:

38
nova/tests/unit/compute/test_compute_mgr.py
View File

@ -2913,16 +2913,50 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
'rebuild.error', fault=ex)
def test_rebuild_deleting(self):
instance = objects.Instance(uuid=uuids.instance)
instance = fake_instance.fake_instance_obj(self.context)
ex = exception.UnexpectedDeletingTaskStateError(
instance_uuid=instance.uuid, expected='expected', actual='actual')
self._test_rebuild_ex(instance, ex)
def test_rebuild_notfound(self):
instance = objects.Instance(uuid=uuids.instance)
instance = fake_instance.fake_instance_obj(self.context)
ex = exception.InstanceNotFound(instance_id=instance.uuid)
self._test_rebuild_ex(instance, ex)
def test_rebuild_node_not_updated_if_not_recreate(self):
node = uuidutils.generate_uuid() # ironic node uuid
instance = fake_instance.fake_instance_obj(self.context, node=node)
instance.migration_context = None
with test.nested(
mock.patch.object(self.compute, '_get_compute_info'),
mock.patch.object(self.compute, '_do_rebuild_instance_with_claim'),
mock.patch.object(objects.Instance, 'save'),
mock.patch.object(self.compute, '_set_migration_status'),
) as (mock_get, mock_rebuild, mock_save, mock_set):
self.compute.rebuild_instance(self.context, instance, None, None,
None, None, None, None, False)
self.assertFalse(mock_get.called)
self.assertEqual(node, instance.node)
mock_set.assert_called_once_with(None, 'done')
def test_rebuild_node_updated_if_recreate(self):
dead_node = uuidutils.generate_uuid()
instance = fake_instance.fake_instance_obj(self.context,
node=dead_node)
instance.migration_context = None
with test.nested(
mock.patch.object(self.compute, '_get_compute_info'),
mock.patch.object(self.compute, '_do_rebuild_instance_with_claim'),
mock.patch.object(objects.Instance, 'save'),
mock.patch.object(self.compute, '_set_migration_status'),
) as (mock_get, mock_rebuild, mock_save, mock_set):
mock_get.return_value.hypervisor_hostname = 'new-node'
self.compute.rebuild_instance(self.context, instance, None, None,
None, None, None, None, True)
mock_get.assert_called_once_with(mock.ANY, self.compute.host)
self.assertEqual('new-node', instance.node)
mock_set.assert_called_once_with(None, 'done')
def test_rebuild_default_impl(self):
def _detach(context, bdms):
# NOTE(rpodolyaka): check that instance has been powered off by