diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-01 07:12:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-01 07:12:36 +0000 |
| commit | 51b827861551215660f6c28a3601f0fcc2735366 (patch) | |
| tree | 5fbe1c8724fde84a7299fb95ef35df430c598c06 | |
| parent | ddc146842ddc64f698ba44c158f87e66868f9dde (diff) | |
| parent | 3d260fc94201078f27d892049b2f8e9269e837f8 (diff) | |
| download | nova-51b827861551215660f6c28a3601f0fcc2735366.tar.gz nova-51b827861551215660f6c28a3601f0fcc2735366.tar.xz nova-51b827861551215660f6c28a3601f0fcc2735366.zip | |
Merge "Fix for failure of periodic instance cleanup"
| -rwxr-xr-x | nova/compute/manager.py | 7 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 82a71e448..dbef94596 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -412,7 +412,8 @@ class ComputeManager(manager.SchedulerDependentManager): 'trying to set it to ERROR'), instance_uuid=instance_uuid) - def _get_instances_on_driver(self, context, filters=None): + def _get_instances_on_driver(self, context, filters=None, + columns_to_join=None): """Return a list of instance records for the instances found on the hypervisor which satisfy the specified filters. If filters=None return a list of instance records for all the instances found on the @@ -424,7 +425,7 @@ class ComputeManager(manager.SchedulerDependentManager): driver_uuids = self.driver.list_instance_uuids() filters['uuid'] = driver_uuids local_instances = self.conductor_api.instance_get_all_by_filters( - context, filters, columns_to_join=[]) + context, filters, columns_to_join=columns_to_join) return local_instances except NotImplementedError: pass @@ -433,7 +434,7 @@ class ComputeManager(manager.SchedulerDependentManager): # to brute force. driver_instances = self.driver.list_instances() instances = self.conductor_api.instance_get_all_by_filters( - context, filters, columns_to_join=[]) + context, filters, columns_to_join=columns_to_join) name_map = dict((instance['name'], instance) for instance in instances) local_instances = [] for driver_instance in driver_instances: diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 4fbf805f1..2ac8b22b8 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -5221,7 +5221,8 @@ class ComputeTestCase(BaseTestCase): self.mox.ReplayAll() - result = self.compute._get_instances_on_driver(fake_context) + result = self.compute._get_instances_on_driver(fake_context, + columns_to_join=[]) self.assertEqual(driver_instances, result) def test_get_instances_on_driver_fallback(self): @@ -5252,7 +5253,7 @@ class ComputeTestCase(BaseTestCase): [inst['name'] for inst in driver_instances]) self.compute.conductor_api.instance_get_all_by_filters( fake_context, filters, - columns_to_join=[]).AndReturn(all_instances) + columns_to_join=None).AndReturn(all_instances) self.mox.ReplayAll() |