Merge "Add instance_fault_create() to conductor"

2 files changed, 10 insertions, 8 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 9bdab7a25..b52e85440 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -227,7 +227,8 @@ def wrap_instance_fault(function):
 
             with excutils.save_and_reraise_exception():
                 compute_utils.add_instance_fault_from_exc(context,
-                        kwargs['instance'], e, sys.exc_info())
+                        self.conductor_api, kwargs['instance'],
+                        e, sys.exc_info())
 
     return decorated_function
 
@@ -730,8 +731,8 @@ class ComputeManager(manager.SchedulerDependentManager):
         instance_uuid = instance['uuid']
         rescheduled = False
 
-        compute_utils.add_instance_fault_from_exc(context, instance,
-                exc_info[1], exc_info=exc_info)
+        compute_utils.add_instance_fault_from_exc(context, self.conductor_api,
+                instance, exc_info[1], exc_info=exc_info)
 
         try:
             self._deallocate_network(context, instance)
@@ -1463,7 +1464,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             LOG.error(_('Cannot reboot instance: %(exc)s'), locals(),
                       context=context, instance=instance)
             compute_utils.add_instance_fault_from_exc(context,
-                    instance, exc, sys.exc_info())
+                    self.conductor_api, instance, exc, sys.exc_info())
             # Fall through and reset task_state to None
 
         current_power_state = self._get_power_state(context, instance)
@@ -1993,8 +1994,8 @@ class ComputeManager(manager.SchedulerDependentManager):
         rescheduled = False
         instance_uuid = instance['uuid']
 
-        compute_utils.add_instance_fault_from_exc(context, instance,
-                exc_info[0], exc_info=exc_info)
+        compute_utils.add_instance_fault_from_exc(context, self.conductor_api,
+                instance, exc_info[0], exc_info=exc_info)
 
         try:
             scheduler_method = self.scheduler_rpcapi.prep_resize
diff --git a/nova/compute/utils.py b/nova/compute/utils.py
index 1874e886f..daf80874c 100644
--- a/nova/compute/utils.py
+++ b/nova/compute/utils.py
@@ -37,7 +37,8 @@ CONF.import_opt('host', 'nova.netconf')
 LOG = log.getLogger(__name__)
 
 
-def add_instance_fault_from_exc(context, instance, fault, exc_info=None):
+def add_instance_fault_from_exc(context, conductor,
+                                instance, fault, exc_info=None):
     """Adds the specified fault to the database."""
 
     code = 500
@@ -61,7 +62,7 @@ def add_instance_fault_from_exc(context, instance, fault, exc_info=None):
         'details': unicode(details),
         'host': CONF.host
     }
-    db.instance_fault_create(context, values)
+    conductor.instance_fault_create(context, values)
 
 
 def get_device_name_for_instance(context, instance, bdms, device):