openstack/nova
Code Issues Proposed changes

Merge "Revert "Modify _poll_shelved_instances periodic task call _shelve_offload_instance()""

Browse Source
This commit is contained in:
Zuul 2018-01-04 17:48:55 +00:00 committed by Gerrit Code Review
commit 7aa2ffa65d
2 changed files with 7 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nova/compute/manager.py
View File

@ -6735,31 +6735,12 @@ class ComputeManager(manager.Manager):
if timeutils.is_older_than(shelved_at, CONF.shelved_offload_time):
to_gc.append(instance)
@wrap_exception()
@reverts_task_state
@wrap_instance_fault
def shelve_offload_instance(_self, ctxt, instance):
@utils.synchronized(instance.uuid)
def do_shelve_offload_instance():
self._shelve_offload_instance(ctxt, instance,
clean_shutdown=False)
do_shelve_offload_instance()
for instance in to_gc:
try:
instance.task_state = task_states.SHELVING_OFFLOADING
instance.save(expected_task_state=(None,))
# NOTE(Kevin Zheng): We use the _shelve_offload_instance
# method to avoid issues with instance actions/events since
# the context used in this periodic task will not have a
# valid request ID. The inner method used here uses the same
# exception and fault handlers and locking scheme as the
# top-level shelve_offload_instance method
# NOTE(mriedem): This looks weird, but we need to pass self
# through to the inner method for the decorators to work
# properly.
shelve_offload_instance(self, context, instance)
self.shelve_offload_instance(context, instance,
clean_shutdown=False)
except Exception:
LOG.exception('Periodic task failed to offload instance.',
instance=instance)

48
nova/tests/unit/compute/test_shelve.py
View File

@ -466,8 +466,7 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase):
self.flags(shelved_offload_time=1)
mock_older.return_value = False
with mock.patch.object(self.compute,
'_shelve_offload_instance') as soi:
with mock.patch.object(self.compute, 'shelve_offload_instance') as soi:
self.compute._poll_shelved_instances(self.context)
self.assertFalse(soi.called)
@ -486,8 +485,7 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase):
sys_meta['shelved_at'] = shelved_time.isoformat()
instance.save()
with mock.patch.object(self.compute,
'_shelve_offload_instance') as soi:
with mock.patch.object(self.compute, 'shelve_offload_instance') as soi:
self.compute._poll_shelved_instances(self.context)
self.assertFalse(soi.called)
self.assertTrue(mock_older.called)
@ -510,8 +508,7 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase):
def fake_soi(context, instance, **kwargs):
data.append(instance.uuid)
with mock.patch.object(self.compute,
'_shelve_offload_instance') as soi:
with mock.patch.object(self.compute, 'shelve_offload_instance') as soi:
soi.side_effect = fake_soi
self.compute._poll_shelved_instances(self.context)
self.assertTrue(soi.called)
@ -540,8 +537,7 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase):
def fake_soi(context, instance, **kwargs):
data.append(instance.uuid)
with mock.patch.object(self.compute,
'_shelve_offload_instance') as soi:
with mock.patch.object(self.compute, 'shelve_offload_instance') as soi:
soi.side_effect = fake_soi
self.compute._poll_shelved_instances(self.context)
self.assertTrue(soi.called)
@ -566,44 +562,10 @@ class ShelveComputeManagerTestCase(test_compute.BaseTestCase):
mock_parse.side_effect = fake_parse_hook
with mock.patch.object(self.compute,
'_shelve_offload_instance') as soi:
with mock.patch.object(self.compute, 'shelve_offload_instance') as soi:
self.compute._poll_shelved_instances(self.context)
self.assertFalse(soi.called)
@mock.patch('nova.exception_wrapper._emit_exception_notification')
@mock.patch('oslo_utils.timeutils.is_older_than')
@mock.patch('oslo_utils.timeutils.parse_strtime')
def test_shelved_poll_revert_task_state_on_exception(self, mock_parse,
mock_older, exc_mock):
self.flags(shelved_offload_time=1)
mock_older.return_value = True
instance = self._create_fake_instance_obj()
instance.task_state = None
instance.vm_state = vm_states.SHELVED
instance.host = self.compute.host
instance.system_metadata = {'shelved_at': ''}
instance.save()
def fake__shelve_offload_instance(ctxt, inst, *args, **kwargs):
self.assertEqual(task_states.SHELVING_OFFLOADING,
inst.task_state)
raise test.TestingException()
with mock.patch.object(
self.compute, '_shelve_offload_instance',
side_effect=fake__shelve_offload_instance) as soi:
self.compute._poll_shelved_instances(self.context)
# Make sure @reverts_task_state was used.
self.assertIsNone(instance.task_state)
self.assertEqual(1, soi.call_count)
# Make sure we sent a notification for the error.
self.assertEqual(1, exc_mock.call_count)
# And recorded a fault.
fault = objects.InstanceFault.get_latest_for_instance(
self.context, instance.uuid)
self.assertIsNotNone(fault)
class ShelveComputeAPITestCase(test_compute.BaseTestCase):
def _get_vm_states(self, exclude_states=None):