cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanjaytripa...@apache.org
Subject git commit: updated refs/heads/master to cf4db84
Date Fri, 25 Apr 2014 11:05:42 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 42b5e1858 -> cf4db845f


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/cf4db845
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cf4db845
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cf4db845

Branch: refs/heads/master
Commit: cf4db845ff7b46c7004f22e7d7d7d2f636935428
Parents: 42b5e18
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Fri Apr 25 16:36:40 2014 +0530
Committer: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Committed: Fri Apr 25 16:39:40 2014 +0530

----------------------------------------------------------------------
 .../xen/resource/XenServer610Resource.java         | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf4db845/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);


Mime
View raw message