diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-12 05:27:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-12 05:27:07 +0000 |
| commit | 6e98044a7a44710bb92fc8fbed162b8b0f33727f (patch) | |
| tree | 74b5a8bb5d09dd9d2952f8ca0fca358d0b17460f | |
| parent | d7f898eab900de8f804285333e6fb921294520fc (diff) | |
| parent | 28b2deac2f9d835cc24d8b5c015762a9780df99b (diff) | |
| download | nova-6e98044a7a44710bb92fc8fbed162b8b0f33727f.tar.gz nova-6e98044a7a44710bb92fc8fbed162b8b0f33727f.tar.xz nova-6e98044a7a44710bb92fc8fbed162b8b0f33727f.zip | |
Merge "Removing misleading error message"
| -rwxr-xr-x | nova/compute/manager.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 5c697993b..8364722e4 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -394,8 +394,10 @@ class ComputeManager(manager.SchedulerDependentManager): instance_uuid=instance_uuid) def _get_instances_on_driver(self, context, filters=None): - """Return a list of instance records that match the instances found - on the hypervisor. + """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 + hypervisor. """ if not filters: filters = {} @@ -404,10 +406,6 @@ class ComputeManager(manager.SchedulerDependentManager): filters['uuid'] = driver_uuids local_instances = self.conductor_api.instance_get_all_by_filters( context, filters, columns_to_join=[]) - local_instance_uuids = [inst['uuid'] for inst in local_instances] - for uuid in set(driver_uuids) - set(local_instance_uuids): - LOG.error(_('Instance %(uuid)s found in the hypervisor, but ' - 'not in the database'), locals()) return local_instances except NotImplementedError: pass @@ -422,9 +420,6 @@ class ComputeManager(manager.SchedulerDependentManager): for driver_instance in driver_instances: instance = name_map.get(driver_instance) if not instance: - LOG.error(_('Instance %(driver_instance)s found in the ' - 'hypervisor, but not in the database'), - locals()) continue local_instances.append(instance) return local_instances |