openstack
/
nova
Code Issues Proposed changes

Merge "Set server status to ERROR if rebuild failed" into stable/ocata

This commit is contained in:
Zuul 2018-02-05 19:36:05 +00:00 committed by Gerrit Code Review
parent 475f352327 83fd8ac0bf
commit a20ac620d2
5 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/conductor/manager.py
View File

@ -16,6 +16,7 @@
import contextlib
import copy
import sys
from oslo_config import cfg
from oslo_log import log as logging
@ -735,19 +736,23 @@ class ComputeTaskManager(base.Base):
with excutils.save_and_reraise_exception():
self._set_vm_state_and_notify(context, instance.uuid,
'rebuild_server',
{'vm_state': instance.vm_state,
{'vm_state': vm_states.ERROR,
'task_state': None}, ex, request_spec)
LOG.warning(_LW("No valid host found for rebuild"),
instance=instance)
compute_utils.add_instance_fault_from_exc(context,
instance, ex, sys.exc_info())
except exception.UnsupportedPolicyException as ex:
with excutils.save_and_reraise_exception():
self._set_vm_state_and_notify(context, instance.uuid,
'rebuild_server',
{'vm_state': instance.vm_state,
{'vm_state': vm_states.ERROR,
'task_state': None}, ex, request_spec)
LOG.warning(_LW("Server with unsupported policy "
"cannot be rebuilt"),
instance=instance)
compute_utils.add_instance_fault_from_exc(context,
instance, ex, sys.exc_info())
try:
migration = objects.Migration.get_by_instance_and_status(

8
nova/tests/functional/test_server_group.py
View File

@ -455,7 +455,7 @@ class ServerGroupTestV21(ServerGroupTestBase):
self.admin_api.post_server_action(servers[1]['id'], post)
server_after_failed_evac = self._wait_for_state_change(
self.admin_api, servers[1], 'ACTIVE')
self.admin_api, servers[1], 'ERROR')
# assert that after a failed evac the server active on the same host
# as before
@ -479,7 +479,7 @@ class ServerGroupTestV21(ServerGroupTestBase):
self.admin_api.post_server_action(servers[1]['id'], post)
server_after_failed_evac = self._wait_for_state_change(
self.admin_api, servers[1], 'ACTIVE')
self.admin_api, servers[1], 'ERROR')
# assert that after a failed evac the server active on the same host
# as before
@ -653,7 +653,7 @@ class ServerGroupTestV215(ServerGroupTestV21):
self.admin_api.post_server_action(servers[1]['id'], post)
server_after_failed_evac = self._wait_for_state_change(
self.admin_api, servers[1], 'ACTIVE')
self.admin_api, servers[1], 'ERROR')
# assert that after a failed evac the server active on the same host
# as before
@ -677,7 +677,7 @@ class ServerGroupTestV215(ServerGroupTestV21):
self.admin_api.post_server_action(servers[1]['id'], post)
server_after_failed_evac = self._wait_for_state_change(
self.admin_api, servers[1], 'ACTIVE')
self.admin_api, servers[1], 'ERROR')
# assert that after a failed evac the server active on the same host
# as before

4
nova/tests/functional/test_servers.py
View File

@ -1004,3 +1004,7 @@ class ServerRebuildTestCase(integrated_helpers._IntegratedTestBase,
# even though the rebuild should not work.
server = self.api.get_server(server['id'])
self.assertEqual(rebuild_image_ref, server['image']['id'])
# The server should be in ERROR state
self.assertEqual('ERROR', server['status'])
self.assertIn('No valid host', server['fault']['message'])

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

@ -1268,8 +1268,10 @@ class _BaseTaskTestCase(object):
'select_destinations',
side_effect=exc.NoValidHost(reason='')),
mock.patch('nova.scheduler.utils.build_request_spec',
return_value=request_spec)
) as (rebuild_mock, sig_mock, fp_mock, select_dest_mock, bs_mock):
return_value=request_spec),
mock.patch.object(scheduler_utils, 'set_vm_state_and_notify')
) as (rebuild_mock, sig_mock, fp_mock,
select_dest_mock, bs_mock, set_vm_state_and_notify_mock):
self.assertRaises(exc.NoValidHost,
self.conductor_manager.rebuild_instance,
context=self.context, instance=inst_obj,
@ -1277,7 +1279,11 @@ class _BaseTaskTestCase(object):
fp_mock.assert_called_once_with(self.context, request_spec,
filter_properties)
select_dest_mock.assert_called_once_with(self.context, fake_spec)
self.assertEqual(
set_vm_state_and_notify_mock.call_args[0][4]['vm_state'],
vm_states.ERROR)
self.assertFalse(rebuild_mock.called)
self.assertIn('No valid host', inst_obj.fault.message)
@mock.patch.object(conductor_manager.compute_rpcapi.ComputeAPI,
'rebuild_instance')
@ -1309,12 +1315,14 @@ class _BaseTaskTestCase(object):
self.context,
inst_obj,
**rebuild_args)
updates = {'vm_state': vm_states.ACTIVE, 'task_state': None}
updates = {'vm_state': vm_states.ERROR, 'task_state': None}
state_mock.assert_called_once_with(self.context, inst_obj.uuid,
'rebuild_server', updates,
exception, request_spec)
self.assertFalse(select_dest_mock.called)
self.assertFalse(rebuild_mock.called)
self.assertIn('ServerGroup policy is not supported',
inst_obj.fault.message)
def test_rebuild_instance_evacuate_migration_record(self):
inst_obj = self._create_fake_instance_obj()

7
releasenotes/notes/bug-1744325-rebuild-error-status-9e2da03f3f81fd6e.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
If scheduling fails during rebuild the server instance will go to ERROR
state and a fault will be recorded. `Bug 1744325`_
.. _Bug 1744325: https://bugs.launchpad.net/nova/+bug/1744325