From fa9eeb65533d897f6e81067986dc614582fb310a Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Fri, 6 May 2011 07:19:57 -0700
Subject: grabbed from dist-sched branch

---
 nova/compute/manager.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'nova/compute')

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 1ff78007b..473f93170 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1082,6 +1082,13 @@ class ComputeManager(manager.SchedulerDependentManager):
                         unicode(ex))
             error_list.append(ex)
 
+        try:
+            self._report_driver_status()
+        except Exception as ex:
+            LOG.warning(_("Error during report_driver_status(): %s"),
+                        unicode(ex))
+            error_list.append(ex)
+
         try:
             self._poll_instance_states(context)
         except Exception as ex:
@@ -1091,6 +1098,16 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         return error_list
 
+    def _report_driver_status(self):
+        curr_time = time.time()
+        if curr_time - self._last_host_check > FLAGS.host_state_interval:
+            self._last_host_check = curr_time
+            LOG.info(_("Updating host status"))
+            # This will grab info about the host and queue it
+            # to be sent to the Schedulers.
+            self.update_service_capabilities(
+                self.driver.get_host_stats(refresh=True))
+
     def _poll_instance_states(self, context):
         vm_instances = self.driver.list_instances_detail()
         vm_instances = dict((vm.name, vm) for vm in vm_instances)
-- 
cgit 


From d087e1d0f0e235de01a8f140815fbe905008cb36 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Mon, 9 May 2011 09:08:56 -0700
Subject: capabilities flattened and tests fixed

---
 nova/compute/manager.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nova/compute')

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 97c1bbded..abf1a478b 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -130,6 +130,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self.network_manager = utils.import_object(FLAGS.network_manager)
         self.volume_manager = utils.import_object(FLAGS.volume_manager)
         self.network_api = network.API()
+        self._last_host_check = 0
         super(ComputeManager, self).__init__(service_name="compute",
                                              *args, **kwargs)
 
-- 
cgit