diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-23 00:21:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-23 00:21:57 +0000 |
| commit | 6166b73a50270c617d1dc7e36cfe095d0eeeef3f (patch) | |
| tree | 7a01e335d9ba3a890c90bb0493898171cfb111c4 /nova/compute | |
| parent | 08fa534a0d28fa1be48aef927584161becb936c7 (diff) | |
| parent | 112dd3c1b824097acf5f89cd3afa8785623e4f9e (diff) | |
Merge "Move get_info to taking an instance."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 77452ee94..3066cb3a6 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -258,7 +258,7 @@ class ComputeManager(manager.SchedulerDependentManager): """Retrieve the power state for the given instance.""" LOG.debug(_('Checking state'), instance=instance) try: - return self.driver.get_info(instance['name'])["state"] + return self.driver.get_info(instance)["state"] except exception.NotFound: return power_state.FAILED @@ -2229,16 +2229,14 @@ class ComputeManager(manager.SchedulerDependentManager): for db_instance in db_instances: # Allow other periodic tasks to do some work... greenthread.sleep(0) - name = db_instance["name"] db_power_state = db_instance['power_state'] try: - vm_instance = self.driver.get_info(name) + vm_instance = self.driver.get_info(db_instance) vm_power_state = vm_instance.state except exception.InstanceNotFound: - msg = _("Instance %(name)s found in database but " - "not known by hypervisor. Setting power " - "state to NOSTATE") % locals() - LOG.warn(msg) + LOG.warn(_("Instance found in database but not known by " + "hypervisor. Setting power state to NOSTATE"), + locals(), instance=db_instance) vm_power_state = power_state.NOSTATE if vm_power_state == db_power_state: |