cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject git commit: updated refs/heads/master to 362f875
Date Tue, 08 Jul 2014 21:47:43 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master cc8fc746d -> 362f875a3


Detach disks before cleaning up of VMware worker VM.


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

Branch: refs/heads/master
Commit: 362f875a3fa814f17a01368ce0c9b76a23d56218
Parents: cc8fc74
Author: Kelven Yang <kelveny@gmail.com>
Authored: Tue Jul 8 14:44:16 2014 -0700
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Tue Jul 8 14:47:22 2014 -0700

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/362f875a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 08d69e0..15eeb13 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3982,6 +3982,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource,
Vmwa
                                     s_logger.info("Recycle pending worker VM: " + vmMo.getName());
 
                                     vmMo.powerOff();
+                                    vmMo.detachAllDisks();
                                     vmMo.destroy();
                                 }
                             }


Mime
View raw message