You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/04/25 13:04:14 UTC
git commit: updated refs/heads/4.4-forward to 0f755ee
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 380998aa4 -> 0f755ee4f
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/0f755ee4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0f755ee4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0f755ee4
Branch: refs/heads/4.4-forward
Commit: 0f755ee4fcb0c2108e87eccea640f50748071050
Parents: 380998a
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Fri Apr 25 16:36:40 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Fri Apr 25 16:38:03 2014 +0530
----------------------------------------------------------------------
.../xen/resource/XenServer610Resource.java | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f755ee4/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);