cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: updated refs/heads/master to 7bf37c1
Date Thu, 01 Aug 2013 22:38:50 GMT
Updated Branches:
  refs/heads/master 5ed3749cd -> 7bf37c120


CLOUDSTACK-4017:
 try to remove VDI host lock before start the VM which is using this VDI


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7bf37c12
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7bf37c12
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7bf37c12

Branch: refs/heads/master
Commit: 7bf37c1202ec3b2eee877c08469811d81f626a8e
Parents: 5ed3749
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Thu Aug 1 15:31:26 2013 -0700
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Thu Aug 1 15:33:42 2013 -0700

----------------------------------------------------------------------
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bf37c12/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index efc80e9..3186d3a 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -1199,7 +1199,15 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
         Volume.Type type = volume.getType();
 
         VDI vdi = mount(conn, vmName, volume);
-
+        if ( vdi != null ) {
+            Map<String, String> smConfig = vdi.getSmConfig(conn);
+            for (String key : smConfig.keySet()) {
+                if (key.startsWith("host_")) {
+                    vdi.removeFromSmConfig(conn, key);
+                    break;
+                }
+            }
+        }
         VBD.Record vbdr = new VBD.Record();
         vbdr.VM = vm;
         if (vdi != null) {


Mime
View raw message