Merge lp:~justin-fathomdb/nova/merge-duplicate-periodic-task into lp:~hudson-openstack/nova/trunk

[justinsb]

Merged the two periodic_tasks functions, that snuck in due to parallel merges in compute.manager

[Thierry Carrez (ttx)]

Created corresponding bug and linked it.

[Jay Pipes (jaypipes)]

lgtm.

review: Approve

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

=== modified file 'nova/compute/manager.py'
--- nova/compute/manager.py	2011-03-24 19:04:24 +0000
+++ nova/compute/manager.py	2011-03-28 07:29:30 +0000
@@ -141,12 +141,6 @@
         """
         self.driver.init_host(host=self.host)
 
-    def periodic_tasks(self, context=None):
-        """Tasks to be run at a periodic interval."""
-        super(ComputeManager, self).periodic_tasks(context)
-        if FLAGS.rescue_timeout > 0:
-            self.driver.poll_rescued_instances(FLAGS.rescue_timeout)
-
     def _update_state(self, context, instance_id):
         """Update the state of an instance from the driver info."""
         # FIXME(ja): include other fields from state?
@@ -1033,11 +1027,20 @@
             error_list = []
 
         try:
+            if FLAGS.rescue_timeout > 0:
+                self.driver.poll_rescued_instances(FLAGS.rescue_timeout)
+        except Exception as ex:
+            LOG.warning(_("Error during poll_rescued_instances: %s"),
+                        unicode(ex))
+            error_list.append(ex)
+
+        try:
             self._poll_instance_states(context)
         except Exception as ex:
             LOG.warning(_("Error during instance poll: %s"),
                         unicode(ex))
             error_list.append(ex)
+
         return error_list
 
     def _poll_instance_states(self, context):

=== modified file 'nova/virt/driver.py'
--- nova/virt/driver.py	2011-03-24 15:40:14 +0000
+++ nova/virt/driver.py	2011-03-28 07:29:30 +0000
@@ -232,3 +232,7 @@
     def inject_network_info(self, instance):
         """inject network info for specified instance"""
         raise NotImplementedError()
+
+    def poll_rescued_instances(self, timeout):
+        """Poll for rescued instances"""
+        raise NotImplementedError()