You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/07/14 15:37:24 UTC

[20/44] git commit: updated refs/heads/vpc-toolkit-hugo to 1ad1883

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/vpc-toolkit-hugo
Commit: 362f875a3fa814f17a01368ce0c9b76a23d56218
Parents: cc8fc74
Author: Kelven Yang <ke...@gmail.com>
Authored: Tue Jul 8 14:44:16 2014 -0700
Committer: Kelven Yang <ke...@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();
                                 }
                             }