You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2015/03/12 08:22:57 UTC
[1/3] git commit: updated refs/heads/master to d30d564
Repository: cloudstack
Updated Branches:
refs/heads/master c27c69438 -> d30d5644b
CLOUDSTACK-8318. Storage vMotion support for VMFS.
MigrateVMWithVolumes-
1. If ESXi host version is below 5.1, ensure destination datastore(s) is mounted on the source host, then migrate the storage and then finally migrate the VM.
If destination storage(s) is not mounted on the source host,
- In case of NFS storage mount the storage(s).
- In case of VMFS storage fail the request for migration.
2. If EXi host version is 5.1 or above, simultaneously migrate the VM and its storage to the destination host and storage(s) respectively for both NFS and VMFS storage.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/adc836cc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/adc836cc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/adc836cc
Branch: refs/heads/master
Commit: adc836cc5eadb0b05aefa6fcdcf8c03841282609
Parents: c27c694
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Feb 26 15:42:40 2015 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Mar 12 11:57:01 2015 +0530
----------------------------------------------------------------------
.../vmware/resource/VmwareResource.java | 117 ++++++++++++-------
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 20 ++++
2 files changed, 94 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adc836cc/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 7bf779c..0d37f51 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3018,15 +3018,16 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
ManagedObjectReference morDc = null;
ManagedObjectReference morDcOfTargetHost = null;
ManagedObjectReference morTgtHost = new ManagedObjectReference();
+ ManagedObjectReference morTgtDatastore = new ManagedObjectReference();
VirtualMachineRelocateSpec relocateSpec = new VirtualMachineRelocateSpec();
List<VirtualMachineRelocateSpecDiskLocator> diskLocators = new ArrayList<VirtualMachineRelocateSpecDiskLocator>();
VirtualMachineRelocateSpecDiskLocator diskLocator = null;
boolean isFirstDs = true;
String tgtDsName = "";
- String tgtDsNfsHost;
- String tgtDsNfsPath;
- int tgtDsNfsPort;
+ String tgtDsHost;
+ String tgtDsPath;
+ int tgtDsPort;
VolumeTO volume;
StorageFilerTO filerTo;
Set<String> mountedDatastoresAtSource = new HashSet<String>();
@@ -3049,6 +3050,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
throw new CloudRuntimeException(msg);
}
VmwareManager mgr = tgtHyperHost.getContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
+ String srcHostApiVersion = ((HostMO)srcHyperHost).getHostAboutInfo().getApiVersion();
// find VM through datacenter (VM is not at the target host yet)
vmMo = srcHyperHost.findVmOnPeerHyperHost(vmName);
@@ -3059,47 +3061,68 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
}
vmName = vmMo.getName();
- // Get details of each target datastore & attach to source host.
+ // Specify destination datastore location for each volume
for (Entry<VolumeTO, StorageFilerTO> entry : volToFiler.entrySet()) {
volume = entry.getKey();
filerTo = entry.getValue();
- tgtDsName = filerTo.getUuid().replace("-", "");
- tgtDsNfsHost = filerTo.getHost();
- tgtDsNfsPath = filerTo.getPath();
- tgtDsNfsPort = filerTo.getPort();
-
s_logger.debug("Preparing spec for volume : " + volume.getName());
morDsAtTarget = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(tgtHyperHost, filerTo.getUuid());
+ morDsAtSource = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(srcHyperHost, filerTo.getUuid());
if (morDsAtTarget == null) {
String msg = "Unable to find the mounted datastore with uuid " + morDsAtTarget + " to execute MigrateWithStorageCommand";
s_logger.error(msg);
throw new Exception(msg);
}
- morDsAtSource = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(srcHyperHost, filerTo.getUuid());
- if (morDsAtSource == null) {
- morDsAtSource = srcHyperHost.mountDatastore(false, tgtDsNfsHost, tgtDsNfsPort, tgtDsNfsPath, tgtDsName);
- if (morDsAtSource == null) {
- throw new Exception("Unable to mount datastore " + tgtDsNfsHost + ":/" + tgtDsNfsPath + " on " + _hostName);
+ morTgtDatastore = morDsAtTarget;
+
+ // If host version is below 5.1 then simultaneous change of VM's datastore and host is not supported.
+ // So since only the datastore will be changed first, ensure the target datastore is mounted on source host.
+ if (srcHostApiVersion.compareTo("5.1") < 0) {
+ tgtDsName = filerTo.getUuid().replace("-", "");
+ tgtDsHost = filerTo.getHost();
+ tgtDsPath = filerTo.getPath();
+ tgtDsPort = filerTo.getPort();
+
+ // If datastore is NFS and target datastore is not already mounted on source host then mount the datastore.
+ if (filerTo.getType().equals(StoragePoolType.NetworkFilesystem)) {
+ if (morDsAtSource == null) {
+ morDsAtSource = srcHyperHost.mountDatastore(false, tgtDsHost, tgtDsPort, tgtDsPath, tgtDsName);
+ if (morDsAtSource == null) {
+ throw new Exception("Unable to mount NFS datastore " + tgtDsHost + ":/" + tgtDsPath + " on " + _hostName);
+ }
+ mountedDatastoresAtSource.add(tgtDsName);
+ s_logger.debug("Mounted datastore " + tgtDsHost + ":/" + tgtDsPath + " on " + _hostName);
+ }
}
- mountedDatastoresAtSource.add(tgtDsName);
- s_logger.debug("Mounted datastore " + tgtDsNfsHost + ":/" + tgtDsNfsPath + " on " + _hostName);
+
+ // If datastore is VMFS and target datastore is not mounted or accessible to source host then fail migration.
+ if (filerTo.getType().equals(StoragePoolType.VMFS)) {
+ if (morDsAtSource == null) {
+ s_logger.warn("If host version is below 5.1, then target VMFS datastore(s) need to manually mounted on source host for a successful live storage migration.");
+ throw new Exception("Target VMFS datastore: " + tgtDsPath + " is not mounted on source host: " + _hostName);
+ }
+ DatastoreMO dsAtSourceMo = new DatastoreMO(getServiceContext(), morDsAtSource);
+ String srcHostValue = srcHyperHost.getMor().getValue();
+ if(!dsAtSourceMo.isAccessibleToHost(srcHostValue)) {
+ s_logger.warn("If host version is below 5.1, then target VMFS datastore(s) need to accessible to source host for a successful live storage migration.");
+ throw new Exception("Target VMFS datastore: " + tgtDsPath + " is not accessible on source host: " + _hostName);
+ }
+ }
+ morTgtDatastore = morDsAtSource;
}
if (isFirstDs) {
- relocateSpec.setDatastore(morDsAtSource);
+ relocateSpec.setDatastore(morTgtDatastore);
isFirstDs = false;
}
- VmwareStorageLayoutHelper.getVmwareDatastorePathFromVmdkFileName(new DatastoreMO(srcHyperHost.getContext(), morDsAtSource), vmName, volume.getPath() +
- ".vmdk");
diskLocator = new VirtualMachineRelocateSpecDiskLocator();
- diskLocator.setDatastore(morDsAtSource);
+ diskLocator.setDatastore(morTgtDatastore);
int diskId = getVirtualDiskInfo(vmMo, volume.getPath() + ".vmdk");
diskLocator.setDiskId(diskId);
diskLocators.add(diskLocator);
volumeDeviceKey.put(volume.getId(), diskId);
-
}
relocateSpec.getDisk().addAll(diskLocators);
@@ -3123,23 +3146,39 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
throw new Exception(msg);
}
- // Change datastore
- if (!vmMo.changeDatastore(relocateSpec)) {
- throw new Exception("Change datastore operation failed during storage migration");
+ if (srcHostApiVersion.compareTo("5.1") < 0) {
+ // Migrate VM's volumes to target datastore(s).
+ if (!vmMo.changeDatastore(relocateSpec)) {
+ throw new Exception("Change datastore operation failed during storage migration");
+ } else {
+ s_logger.debug("Successfully migrated storage of VM " + vmName + " to target datastore(s)");
+ }
+
+ // Migrate VM to target host.
+ ManagedObjectReference morPool = tgtHyperHost.getHyperHostOwnerResourcePool();
+ if (!vmMo.migrate(morPool, tgtHyperHost.getMor())) {
+ throw new Exception("VM migration to target host failed during storage migration");
+ } else {
+ s_logger.debug("Successfully migrated VM " + vmName + " from " + _hostName + " to " + tgtHyperHost.getHyperHostName());
+ }
} else {
- s_logger.debug("Successfully migrated storage of VM " + vmName + " to target datastore(s)");
+ // Simultaneously migrate VM's volumes to target datastore and VM to target host.
+ relocateSpec.setHost(tgtHyperHost.getMor());
+ relocateSpec.setPool(tgtHyperHost.getHyperHostOwnerResourcePool());
+ if (!vmMo.changeDatastore(relocateSpec)) {
+ throw new Exception("Change datastore operation failed during storage migration");
+ } else {
+ s_logger.debug("Successfully migrated VM " + vmName + " from " + _hostName + " to " + tgtHyperHost.getHyperHostName() +
+ " and its storage to target datastore(s)");
+ }
}
// Consolidate VM disks.
- // In case of a linked clone VM, if VM's disks are not consolidated,
- // further VM operations such as volume snapshot, VM snapshot etc. will result in DB inconsistencies.
- String apiVersion = HypervisorHostHelper.getVcenterApiVersion(vmMo.getContext());
- if (apiVersion.compareTo("5.0") >= 0) {
- if (!vmMo.consolidateVmDisks()) {
- s_logger.warn("VM disk consolidation failed after storage migration. Yet proceeding with VM migration.");
- } else {
- s_logger.debug("Successfully consolidated disks of VM " + vmName + ".");
- }
+ // In case of a linked clone VM, if VM's disks are not consolidated, further VM operations such as volume snapshot, VM snapshot etc. will result in DB inconsistencies.
+ if (!vmMo.consolidateVmDisks()) {
+ s_logger.warn("VM disk consolidation failed after storage migration. Yet proceeding with VM migration.");
+ } else {
+ s_logger.debug("Successfully consolidated disks of VM " + vmName + ".");
}
// Update and return volume path for every disk because that could have changed after migration
@@ -3158,14 +3197,6 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
}
}
- // Change host
- ManagedObjectReference morPool = tgtHyperHost.getHyperHostOwnerResourcePool();
- if (!vmMo.migrate(morPool, tgtHyperHost.getMor())) {
- throw new Exception("Change datastore operation failed during storage migration");
- } else {
- s_logger.debug("Successfully relocated VM " + vmName + " from " + _hostName + " to " + tgtHyperHost.getHyperHostName());
- }
-
return new MigrateWithStorageAnswer(cmd, volumeToList);
} catch (Throwable e) {
if (e instanceof RemoteException) {
@@ -3215,7 +3246,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
try {
srcHyperHost = getHyperHost(getServiceContext());
morDc = srcHyperHost.getHyperHostDatacenter();
- tgtDsName = poolTo.getUuid().replace("-", "");
+ tgtDsName = poolTo.getUuid();
// find VM in this datacenter not just in this cluster.
DatacenterMO dcMo = new DatacenterMO(getServiceContext(), morDc);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adc836cc/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
index 7a1c28a..fbba33e 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/DatastoreMO.java
@@ -21,9 +21,11 @@ import java.util.List;
import org.apache.log4j.Logger;
+import com.vmware.vim25.DatastoreHostMount;
import com.vmware.vim25.DatastoreSummary;
import com.vmware.vim25.FileInfo;
import com.vmware.vim25.HostDatastoreBrowserSearchResults;
+import com.vmware.vim25.HostMountInfo;
import com.vmware.vim25.ManagedObjectReference;
import com.vmware.vim25.ObjectContent;
import com.vmware.vim25.ObjectSpec;
@@ -66,6 +68,10 @@ public class DatastoreMO extends BaseMO {
return new HostDatastoreBrowserMO(_context, (ManagedObjectReference)_context.getVimClient().getDynamicProperty(_mor, "browser"));
}
+ public List<DatastoreHostMount> getHostMounts() throws Exception {
+ return _context.getVimClient().getDynamicProperty(_mor, "host");
+ }
+
public String getInventoryPath() throws Exception {
Pair<DatacenterMO, String> dcInfo = getOwnerDatacenter();
return dcInfo.second() + "/" + getName();
@@ -380,4 +386,18 @@ public class DatastoreMO extends BaseMO {
}
return absoluteFileName;
}
+
+ public boolean isAccessibleToHost(String hostValue) throws Exception {
+ boolean isAccessible = true;
+ List<DatastoreHostMount> hostMounts = getHostMounts();
+ for (DatastoreHostMount hostMount : hostMounts) {
+ String hostMountValue = hostMount.getKey().getValue();
+ if (hostMountValue.equalsIgnoreCase(hostValue)) {
+ HostMountInfo mountInfo = hostMount.getMountInfo();
+ isAccessible = mountInfo.isAccessible();
+ break;
+ }
+ }
+ return isAccessible;
+ }
}
[3/3] git commit: updated refs/heads/master to d30d564
Posted by li...@apache.org.
CLOUDSTACK-8320. Upon a failed migration, a dummy volume is created which remains in 'Expunging' state.
Set destination volume path as NULL while duplicating volume during migration.
If migration fails, destination volume will be marked as removed. And if migration succeeds, volume path will be rightly updated.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d30d5644
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d30d5644
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d30d5644
Branch: refs/heads/master
Commit: d30d5644bb59898ac60884280bd0767bf429ede8
Parents: bdd28a4
Author: Likitha Shetty <li...@citrix.com>
Authored: Wed Feb 11 16:10:50 2015 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Mar 12 11:57:02 2015 +0530
----------------------------------------------------------------------
.../src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d30d5644/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 4ff28d7..325c269 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -833,6 +833,7 @@ public class VolumeServiceImpl implements VolumeService {
VolumeVO newVol = new VolumeVO(volume);
newVol.setInstanceId(null);
newVol.setChainInfo(null);
+ newVol.setPath(null);
newVol.setFolder(folder);
newVol.setPodId(pool.getPodId());
newVol.setPoolId(pool.getId());
[2/3] git commit: updated refs/heads/master to d30d564
Posted by li...@apache.org.
CLOUDSTACK-8319. For both 'MigrateVolume' and 'MigrateVMWithVolumes, ensure VM's vconfiguration files are migrated along with VM's root volume.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bdd28a45
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bdd28a45
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bdd28a45
Branch: refs/heads/master
Commit: bdd28a45ed1cc8046c63d0e840e54975e5b74ab5
Parents: adc836c
Author: Likitha Shetty <li...@citrix.com>
Authored: Thu Mar 5 14:24:46 2015 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Thu Mar 12 11:57:02 2015 +0530
----------------------------------------------------------------------
.../agent/api/storage/MigrateVolumeCommand.java | 9 +++-
.../motion/AncientDataMotionStrategy.java | 2 +-
.../vmware/resource/VmwareResource.java | 45 +++++++++++++++-----
.../hypervisor/vmware/mo/VirtualMachineMO.java | 20 +++++++++
4 files changed, 63 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdd28a45/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java b/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java
index e5ba211..b409944 100644
--- a/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java
+++ b/core/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java
@@ -22,6 +22,7 @@ package com.cloud.agent.api.storage;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.storage.StoragePool;
+import com.cloud.storage.Volume;
public class MigrateVolumeCommand extends Command {
@@ -29,6 +30,7 @@ public class MigrateVolumeCommand extends Command {
String volumePath;
StorageFilerTO pool;
String attachedVmName;
+ Volume.Type volumeType;
public MigrateVolumeCommand(long volumeId, String volumePath, StoragePool pool, int timeout) {
this.volumeId = volumeId;
@@ -37,11 +39,12 @@ public class MigrateVolumeCommand extends Command {
this.setWait(timeout);
}
- public MigrateVolumeCommand(long volumeId, String volumePath, StoragePool pool, String attachedVmName, int timeout) {
+ public MigrateVolumeCommand(long volumeId, String volumePath, StoragePool pool, String attachedVmName, Volume.Type volumeType, int timeout) {
this.volumeId = volumeId;
this.volumePath = volumePath;
this.pool = new StorageFilerTO(pool);
this.attachedVmName = attachedVmName;
+ this.volumeType = volumeType;
this.setWait(timeout);
}
@@ -65,4 +68,8 @@ public class MigrateVolumeCommand extends Command {
public String getAttachedVmName() {
return attachedVmName;
}
+
+ public Volume.Type getVolumeType() {
+ return volumeType;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdd28a45/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index 17ab00e..84df7ff 100644
--- a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -389,7 +389,7 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
VolumeInfo volume = (VolumeInfo)srcData;
StoragePool destPool = (StoragePool)dataStoreMgr.getDataStore(destData.getDataStore().getId(), DataStoreRole.Primary);
- MigrateVolumeCommand command = new MigrateVolumeCommand(volume.getId(), volume.getPath(), destPool, volume.getAttachedVmName(), waitInterval);
+ MigrateVolumeCommand command = new MigrateVolumeCommand(volume.getId(), volume.getPath(), destPool, volume.getAttachedVmName(), volume.getVolumeType(), waitInterval);
EndPoint ep = selector.select(srcData, StorageAction.MIGRATEVOLUME);
Answer answer = null;
if (ep == null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdd28a45/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 0d37f51..f90a666 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3023,7 +3023,6 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
List<VirtualMachineRelocateSpecDiskLocator> diskLocators = new ArrayList<VirtualMachineRelocateSpecDiskLocator>();
VirtualMachineRelocateSpecDiskLocator diskLocator = null;
- boolean isFirstDs = true;
String tgtDsName = "";
String tgtDsHost;
String tgtDsPath;
@@ -3112,9 +3111,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
morTgtDatastore = morDsAtSource;
}
- if (isFirstDs) {
+ if (volume.getType() == Volume.Type.ROOT) {
relocateSpec.setDatastore(morTgtDatastore);
- isFirstDs = false;
}
diskLocator = new VirtualMachineRelocateSpecDiskLocator();
diskLocator.setDatastore(morTgtDatastore);
@@ -3124,6 +3122,18 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
diskLocators.add(diskLocator);
volumeDeviceKey.put(volume.getId(), diskId);
}
+ // If a target datastore is provided for the VM, then by default all volumes associated with the VM will be migrated to that target datastore.
+ // Hence set the existing datastore as target datastore for volumes that are not to be migrated.
+ List<Pair<Integer, ManagedObjectReference>> diskDatastores = vmMo.getAllDiskDatastores();
+ for (Pair<Integer, ManagedObjectReference> diskDatastore : diskDatastores) {
+ if (!volumeDeviceKey.containsValue(diskDatastore.first().intValue())) {
+ diskLocator = new VirtualMachineRelocateSpecDiskLocator();
+ diskLocator.setDiskId(diskDatastore.first().intValue());
+ diskLocator.setDatastore(diskDatastore.second());
+ diskLocators.add(diskLocator);
+ }
+ }
+
relocateSpec.getDisk().addAll(diskLocators);
// Prepare network at target before migration
@@ -3225,6 +3235,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
private Answer execute(MigrateVolumeCommand cmd) {
String volumePath = cmd.getVolumePath();
StorageFilerTO poolTo = cmd.getPool();
+ Volume.Type volumeType = cmd.getVolumeType();
if (s_logger.isInfoEnabled()) {
s_logger.info("Executing resource MigrateVolumeCommand: " + _gson.toJson(cmd));
@@ -3271,9 +3282,23 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
diskLocator = new VirtualMachineRelocateSpecDiskLocator();
diskLocator.setDatastore(morDs);
diskLocator.setDiskId(diskId);
-
diskLocators.add(diskLocator);
- relocateSpec.getDisk().add(diskLocator);
+ if (cmd.getVolumeType() == Volume.Type.ROOT) {
+ relocateSpec.setDatastore(morDs);
+ // If a target datastore is provided for the VM, then by default all volumes associated with the VM will be migrated to that target datastore.
+ // Hence set the existing datastore as target datastore for volumes that are not to be migrated.
+ List<Pair<Integer, ManagedObjectReference>> diskDatastores = vmMo.getAllDiskDatastores();
+ for (Pair<Integer, ManagedObjectReference> diskDatastore : diskDatastores) {
+ if (diskDatastore.first().intValue() != diskId) {
+ diskLocator = new VirtualMachineRelocateSpecDiskLocator();
+ diskLocator.setDiskId(diskDatastore.first().intValue());
+ diskLocator.setDatastore(diskDatastore.second());
+ diskLocators.add(diskLocator);
+ }
+ }
+ }
+
+ relocateSpec.getDisk().addAll(diskLocators);
// Change datastore
if (!vmMo.changeDatastore(relocateSpec)) {
@@ -3286,12 +3311,10 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
// In case of a linked clone VM, if VM's disks are not consolidated,
// further volume operations on the ROOT volume such as volume snapshot etc. will result in DB inconsistencies.
String apiVersion = HypervisorHostHelper.getVcenterApiVersion(vmMo.getContext());
- if (apiVersion.compareTo("5.0") >= 0) {
- if (!vmMo.consolidateVmDisks()) {
- s_logger.warn("VM disk consolidation failed after storage migration.");
- } else {
- s_logger.debug("Successfully consolidated disks of VM " + vmName + ".");
- }
+ if (!vmMo.consolidateVmDisks()) {
+ s_logger.warn("VM disk consolidation failed after storage migration.");
+ } else {
+ s_logger.debug("Successfully consolidated disks of VM " + vmName + ".");
}
// Update and return volume path because that could have changed after migration
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdd28a45/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index 5f180e1..2798d54 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -2069,6 +2069,26 @@ public class VirtualMachineMO extends BaseMO {
return builder;
}
+ public List<Pair<Integer, ManagedObjectReference>> getAllDiskDatastores() throws Exception {
+ List<Pair<Integer, ManagedObjectReference>> disks = new ArrayList<Pair<Integer, ManagedObjectReference>>();
+
+ List<VirtualDevice> devices = _context.getVimClient().getDynamicProperty(_mor, "config.hardware.device");
+ if (devices != null && devices.size() > 0) {
+ for (VirtualDevice device : devices) {
+ if (device instanceof VirtualDisk) {
+ VirtualDeviceBackingInfo backingInfo = ((VirtualDisk)device).getBacking();
+ if (backingInfo instanceof VirtualDiskFlatVer2BackingInfo) {
+ VirtualDiskFlatVer2BackingInfo diskBackingInfo = (VirtualDiskFlatVer2BackingInfo)backingInfo;
+ disks.add(new Pair<Integer, ManagedObjectReference>(new Integer(device.getKey()), diskBackingInfo.getDatastore()));
+ }
+ }
+ }
+ }
+
+ return disks;
+ }
+
+
@Deprecated
public List<Pair<String, ManagedObjectReference>> getDiskDatastorePathChain(VirtualDisk disk, boolean followChain) throws Exception {
VirtualDeviceBackingInfo backingInfo = disk.getBacking();