Updated Branches: refs/heads/4.1 78186c3b0 -> 14a24d936
Summary: KVM - double migration can fail Detail: Undefine VM after migration. Lingering domain definitions cause migrations back to the original host to fail, since domain already exists. BUG-ID: CLOUDSTACK-2640 Bugfix-for: 4.1.0,4.2.0 Signed-off-by: Marcus Sorensen <mar...@betterservers.com> 1369285950 -0600 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14a24d93 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14a24d93 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14a24d93 Branch: refs/heads/4.1 Commit: 14a24d936acdc927de65b99c861ed2fc7c3d59e2 Parents: 78186c3 Author: Marcus Sorensen <mar...@betterservers.com> Authored: Wed May 22 23:12:30 2013 -0600 Committer: Chip Childers <chip.child...@gmail.com> Committed: Thu May 23 17:36:46 2013 +0100 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14a24d93/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index f71e5f3..526f028 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -2586,6 +2586,9 @@ ServerResource { } finally { try { if (dm != null) { + if (dm.isPersistent() == 1) { + dm.undefine(); + } dm.free(); } if (dconn != null) {
