CLOUDSTACK-8597. Failed to migrate volume from zone-wide to cluster-wide storage. While live migrating a volume, CS chooses the endpoint to perform the migration by selecting any host that has the storage containing the volume mounted on it. Instead, if the volume is attached to a running VM, the endpoint chosen by CS should be the host that contains the VM.

Likitha Shetty · wilderrodrigues · commit 299c07c3e1bc · 2015-07-01T12:33:26.000+02:00
Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com> This closes apache#541
diff --git a/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -332,7 +332,7 @@ public EndPoint select(DataObject object, StorageAction action) {
             }
         } else if (action == StorageAction.MIGRATEVOLUME) {
             VolumeInfo volume = (VolumeInfo)object;
-            if (volume.getHypervisorType() == Hypervisor.HypervisorType.Hyperv) {
+            if (volume.getHypervisorType() == Hypervisor.HypervisorType.Hyperv || volume.getHypervisorType() == Hypervisor.HypervisorType.VMware) {
                 VirtualMachine vm = volume.getAttachedVM();
                 if ((vm != null) && (vm.getState() == VirtualMachine.State.Running)) {
                     Long hostId = vm.getHostId();
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
@@ -3081,7 +3081,7 @@ protected Answer execute(MigrateWithStorageCommand cmd) {
                 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";
+                    String msg = "Unable to find the target datastore: " + filerTo.getUuid() + " on target host: " + tgtHyperHost.getHyperHostName() + " to execute MigrateWithStorageCommand";
                     s_logger.error(msg);
                     throw new Exception(msg);
                 }
@@ -3283,7 +3283,7 @@ private Answer execute(MigrateVolumeCommand cmd) {
             vmName = vmMo.getName();
             morDs = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(srcHyperHost, tgtDsName);
             if (morDs == null) {
-                String msg = "Unable to find the mounted datastore with name " + tgtDsName + " to execute MigrateVolumeCommand";
+                String msg = "Unable to find the mounted datastore with name: " + tgtDsName + " on source host: " + srcHyperHost.getHyperHostName() +" to execute MigrateVolumeCommand";
                 s_logger.error(msg);
                 throw new Exception(msg);
             }

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public EndPoint select(DataObject object, StorageAction action) {`
`332`	`332`	`}`
`333`	`333`	`} else if (action == StorageAction.MIGRATEVOLUME) {`
`334`	`334`	`VolumeInfo volume = (VolumeInfo)object;`
`335`		`- if (volume.getHypervisorType() == Hypervisor.HypervisorType.Hyperv) {`
	`335`	`+ if (volume.getHypervisorType() == Hypervisor.HypervisorType.Hyperv \|\| volume.getHypervisorType() == Hypervisor.HypervisorType.VMware) {`
`336`	`336`	`VirtualMachine vm = volume.getAttachedVM();`
`337`	`337`	`if ((vm != null) && (vm.getState() == VirtualMachine.State.Running)) {`
`338`	`338`	`Long hostId = vm.getHostId();`