Repository: cloudstack Updated Branches: refs/heads/4.4 9c572eeae -> b6d14d77b
CLOUDSTACK-6452: Failed to Live Migrate VM across clusters with Xenserver 6.2.5. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b6d14d77 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6d14d77 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6d14d77 Branch: refs/heads/4.4 Commit: b6d14d77bdc61e387d047c09ccbb2eb67cf8b5a0 Parents: 9c572ee Author: Sanjay Tripathi <sanjay.tripa...@citrix.com> Authored: Fri Apr 25 16:36:40 2014 +0530 Committer: Daan Hoogland <d...@onecht.net> Committed: Sat Apr 26 13:43:31 2014 +0200 ---------------------------------------------------------------------- .../xen/resource/XenServer610Resource.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6d14d77/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java index 3be8c3b..0c3e1e9 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java @@ -60,6 +60,7 @@ import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.api.to.VolumeTO; import com.cloud.network.Networks.TrafficType; import com.cloud.resource.ServerResource; +import com.cloud.storage.Volume; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.VirtualMachine.State; @@ -110,13 +111,15 @@ public class XenServer610Resource extends XenServer602Resource { } for (DiskTO volumeTo : volumes) { - VolumeObjectTO vol = (VolumeObjectTO)volumeTo.getData(); - Long deviceId = volumeTo.getDiskSeq(); - VDI vdi = deviceIdToVdiMap.get(deviceId.toString()); - VolumeObjectTO newVol = new VolumeObjectTO(); - newVol.setPath(vdi.getUuid(connection)); - newVol.setId(vol.getId()); - volumeToList.add(newVol); + if (volumeTo.getType() != Volume.Type.ISO) { + VolumeObjectTO vol = (VolumeObjectTO)volumeTo.getData(); + Long deviceId = volumeTo.getDiskSeq(); + VDI vdi = deviceIdToVdiMap.get(deviceId.toString()); + VolumeObjectTO newVol = new VolumeObjectTO(); + newVol.setPath(vdi.getUuid(connection)); + newVol.setId(vol.getId()); + volumeToList.add(newVol); + } } } catch (Exception e) { s_logger.error("Unable to get the updated VDI paths of the migrated vm " + e.toString(), e);
