openstack
/
nova
Code Issues Proposed changes

Merge "Remove host filter for _cleanup_running_deleted_instances periodic task" into stable/pike

This commit is contained in:
Jenkins 2017-08-30 16:03:23 +00:00 committed by Gerrit Code Review
parent 8b162ba21f c95f00aebf
commit 4828dac900
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/compute/manager.py
View File

@ -610,6 +610,9 @@ class ComputeManager(manager.Manager):
# The driver doesn't support uuids listing, so we'll have
# to brute force.
driver_instances = self.driver.list_instances()
# NOTE(mjozefcz): In this case we need to apply host filter.
# Without this all instance data would be fetched from db.
filters['host'] = self.host
instances = objects.InstanceList.get_by_filters(context, filters,
use_slave=True)
name_map = {instance.name: instance for instance in instances}
@ -6779,8 +6782,7 @@ class ComputeManager(manager.Manager):
"""
timeout = CONF.running_deleted_instance_timeout
filters = {'deleted': True,
'soft_deleted': False,
'host': self.host}
'soft_deleted': False}
instances = self._get_instances_on_driver(context, filters)
return [i for i in instances if self._deleted_old_enough(i, timeout)]

15
nova/tests/unit/compute/test_compute.py
View File

@ -6613,8 +6613,7 @@ class ComputeTestCase(BaseTestCase,
mock.call(ctxt, inst2.uuid, use_slave=True)])
mock_get_inst.assert_called_once_with(ctxt,
{'deleted': True,
'soft_deleted': False,
'host': self.compute.host})
'soft_deleted': False})
@mock.patch.object(compute_manager.ComputeManager,
'_get_instances_on_driver')
@ -6629,8 +6628,7 @@ class ComputeTestCase(BaseTestCase,
mock_get.assert_called_once_with(ctxt,
{'deleted': True,
'soft_deleted': False,
'host': self.compute.host})
'soft_deleted': False})
mock_power.assert_has_calls([mock.call(inst1), mock.call(inst2)])
mock_set.assert_has_calls([mock.call(inst1, False),
mock.call(inst2, False)])
@ -6649,8 +6647,7 @@ class ComputeTestCase(BaseTestCase,
mock_get.assert_called_once_with(ctxt,
{'deleted': True,
'soft_deleted': False,
'host': self.compute.host})
'soft_deleted': False})
mock_set.assert_has_calls([mock.call(inst1, False),
mock.call(inst2, False)])
mock_power.assert_has_calls([mock.call(inst1), mock.call(inst2)])
@ -6670,8 +6667,7 @@ class ComputeTestCase(BaseTestCase,
mock_get.assert_called_once_with(ctxt,
{'deleted': True,
'soft_deleted': False,
'host': self.compute.host})
'soft_deleted': False})
mock_power.assert_has_calls([mock.call(inst1), mock.call(inst2)])
mock_set.assert_has_calls([mock.call(inst1, False),
mock.call(inst2, False)])
@ -6694,8 +6690,7 @@ class ComputeTestCase(BaseTestCase,
self.assertEqual(val, [instance])
mock_get.assert_called_once_with(
admin_context, {'deleted': True,
'soft_deleted': False,
'host': self.compute.host})
'soft_deleted': False})
mock_is_older.assert_called_once_with(now,
CONF.running_deleted_instance_timeout)

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

@ -1433,6 +1433,9 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
self.assertEqual([x['uuid'] for x in driver_instances],
[x['uuid'] for x in result])
expected_filters = {'uuid': driver_uuids}
mock_instance_list.assert_called_with(self.context, expected_filters,
use_slave=True)
@mock.patch('nova.objects.InstanceList.get_by_filters')
def test_get_instances_on_driver_empty(self, mock_instance_list):
@ -1451,7 +1454,7 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
# Test getting instances when driver doesn't support
# 'list_instance_uuids'
self.compute.host = 'host'
filters = {'host': self.compute.host}
filters = {}
self.flags(instance_name_template='inst-%i')
@ -1485,6 +1488,9 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
self.assertEqual([x['uuid'] for x in driver_instances],
[x['uuid'] for x in result])
expected_filters = {'host': self.compute.host}
mock_instance_list.assert_called_with(self.context, expected_filters,
use_slave=True)
def test_instance_usage_audit(self):
instances = [objects.Instance(uuid=uuids.instance)]