Removal of instance_set_state from driver code, it shouldnt be there, but instead should be in the compute manager.

3 files changed, 16 insertions, 29 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 94d4f1991..db1d6950e 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -240,21 +240,16 @@ class ComputeManager(manager.SchedulerDependentManager):
                                                        instance_id)
 
         # TODO(vish) check to make sure the availability zone matches
-        self.db.instance_set_state(context,
-                                   instance_id,
-                                   power_state.NOSTATE,
-                                   'spawning')
+        self._update_state(context, instance_id, power_state.BUILDING)
 
         try:
             self.driver.spawn(instance_ref)
             self._update_launched_at(context, instance_id)
-        except Exception:  # pylint: disable=W0702
+        except Exception as ex:  # pylint: disable=W0702
+            LOG.debug(ex)
             LOG.exception(_("Instance '%s' failed to spawn. Is virtualization"
                             " enabled in the BIOS?"), instance_id,
                                                      context=context)
-            self.db.instance_set_state(context,
-                                       instance_id,
-                                       power_state.SHUTDOWN)
 
         self._update_state(context, instance_id)
 
@@ -1133,9 +1128,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             if vm_state != db_state:
                 LOG.info(_("DB/VM state mismatch. Changing state from "
                            "'%(db_state)s' to '%(vm_state)s'") % locals())
-                self.db.instance_set_state(context,
-                                           db_instance['id'],
-                                           vm_state)
+                self._update_state(context, db_instance['id'], vm_state)
 
             if vm_state == power_state.SHUTOFF:
                 # TODO(soren): This is what the compute manager does when you
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index f998a592b..bc9a031f9 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -597,8 +597,8 @@ class LibvirtConnection(driver.ComputeDriver):
             try:
                 state = self.get_info(name)['state']
             except (exception.NotFound, libvirt.libvirtError) as ex:
-                msg = _("Error while waiting for VM to run: %s") % ex
-                LOG.debug(msg)
+                msg = _("Error while waiting for VM '%(_id)s' to run: %(ex)s")
+                LOG.debug(msg % locals())
                 timer.stop()
 
             if state == power_state.RUNNING:
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index c96c35a6e..fb3ca5306 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -206,33 +206,27 @@ class VMOps(object):
         # NOTE(armando): Do we really need to do this in virt?
         # NOTE(tr3buchet): not sure but wherever we do it, we need to call
         #                  reset_network afterwards
-        timer = utils.LoopingCall(f=None)
 
         def _wait_for_boot():
             try:
                 state = self.get_info(instance_name)['state']
-                db.instance_set_state(context.get_admin_context(),
-                                      instance['id'], state)
-                if state == power_state.RUNNING:
-                    LOG.debug(_('Instance %s: booted'), instance_name)
-                    timer.stop()
-                    _inject_files()
-                    return True
-            except Exception, exc:
-                LOG.warn(exc)
-                LOG.exception(_('instance %s: failed to boot'),
-                              instance_name)
-                db.instance_set_state(context.get_admin_context(),
-                                      instance['id'],
-                                      power_state.SHUTDOWN)
+            except self.XenAPI.Failure as ex:
+                msg = _("Error while waiting for VM '%(instance_name)s' "
+                        "to boot: %(ex)s") % locals()
+                LOG.debug(msg)
                 timer.stop()
                 return False
 
-        timer.f = _wait_for_boot
+            if state == power_state.RUNNING:
+                LOG.debug(_('VM %s is now running.') % name)
+                timer.stop()
+                _inject_files()
+                return True
 
         # call to reset network to configure network from xenstore
         self.reset_network(instance, vm_ref)
 
+        timer = utils.LoopingCall(f=_wait_for_boot)
         return timer.start(interval=0.5, now=True)
 
     def _get_vm_opaque_ref(self, instance_or_vm):