From 43a545a8bd8f763eba7741a240c29da447aef61e Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Mon, 25 Oct 2010 03:11:00 -0700
Subject: more bugfixes, flag for local volumes

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

(limited to 'nova/compute')

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 3b3208fea..116bf11cc 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -113,7 +113,7 @@ class ComputeManager(manager.Manager):
         instance_ref = self.db.instance_get(context, instance_id)
         volumes = instance_ref.get('volumes', []) or []
         for volume in volumes:
-            self.detach_volume(instance_id, volume['id'])
+            self.detach_volume(context, instance_id, volume['id'])
         if instance_ref['state'] == power_state.SHUTOFF:
             self.db.instance_destroy(context, instance_id)
             raise exception.Error('trying to destroy already destroyed'
@@ -176,6 +176,8 @@ class ComputeManager(manager.Manager):
                                     instance_id,
                                     mountpoint)
         except Exception:
+            logging.debug("instance %s: attach failed to %s, removing export",
+                          instance_id, mountpoint)
             yield self.volume_manager.remove_compute_volume(context,
                                                             volume_id)
             raise
-- 
cgit