Volume migration fix wrt #22 (#27)

* fix worker vm

Signed-off-by: Abhishek Kumar <[email protected]>

* fix

Signed-off-by: Abhishek Kumar <[email protected]>

* remove unwanted logs

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java

@@ -3826,7 +3826,6 @@ protected Answer execute(MigrateVmToPoolCommand cmd) {
 
     private Answer migrateAndAnswer(VirtualMachineMO vmMo, String poolUuid, VmwareHypervisorHost hyperHost, Command cmd) throws Exception {
         String hostNameInTargetCluster = null;
-        VmwareHypervisorHost hostInTargetCluster = null;
         List<Pair<VolumeTO, StorageFilerTO>> volToFiler = new ArrayList<>();
         if (cmd instanceof MigrateVmToPoolCommand) {
             MigrateVmToPoolCommand mcmd = (MigrateVmToPoolCommand)cmd;
@@ -3835,13 +3834,7 @@ private Answer migrateAndAnswer(VirtualMachineMO vmMo, String poolUuid, VmwareHy
         } else if (cmd instanceof MigrateVolumeCommand) {
             hostNameInTargetCluster = ((MigrateVolumeCommand)cmd).getHostGuidInTargetCluster();
         }
-        if (StringUtils.isNotBlank(hostNameInTargetCluster)) {
-            String hostInTargetClusterMorInfo = hostNameInTargetCluster.split("@")[0];
-            ManagedObjectReference morHostInTargetCluster = new ManagedObjectReference();
-            morHostInTargetCluster.setType(hostInTargetClusterMorInfo.split(":")[0]);
-            morHostInTargetCluster.setValue(hostInTargetClusterMorInfo.split(":")[1]);
-            hostInTargetCluster = new HostMO(getServiceContext(), morHostInTargetCluster);
-        }
+        VmwareHypervisorHost hostInTargetCluster = VmwareHelper.getHostMOFromHostName(getServiceContext(), hostNameInTargetCluster);
         try {
             // OfflineVmwareMigration: getVolumesFromCommand(cmd);
             Map<Integer, Long> volumeDeviceKey = new HashMap<>();
@@ -4020,19 +4013,11 @@ private Answer migrateVolume(MigrateVolumeCommand cmd) {
 
             ManagedObjectReference morSourceDs = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, cmd.getSourcePool().getUuid());
             DatastoreMO sourceDsMo = new DatastoreMO(hyperHost.getContext(), morSourceDs);
-            DatacenterMO dcMo = new DatacenterMO(hyperHost.getContext(), hyperHost.getHyperHostDatacenter());
             String targetDsName = cmd.getTargetPool().getUuid();
-            String hostNameInTargetCluster = cmd.getHostGuidInTargetCluster();
-            VmwareHypervisorHost hostInTargetCluster = null;
-            if (StringUtils.isNotBlank(hostNameInTargetCluster)) {
-                String hostInTargetClusterMorInfo = hostNameInTargetCluster.split("@")[0];
-                ManagedObjectReference morHostInTargetCluster = new ManagedObjectReference();
-                morHostInTargetCluster.setType(hostInTargetClusterMorInfo.split(":")[0]);
-                morHostInTargetCluster.setValue(hostInTargetClusterMorInfo.split(":")[1]);
-                hostInTargetCluster = new HostMO(getServiceContext(), morHostInTargetCluster);
-            }
+            VmwareHypervisorHost hostInTargetCluster = VmwareHelper.getHostMOFromHostName(getServiceContext(),
+                    cmd.getHostGuidInTargetCluster());
             VmwareHypervisorHost dsHost = hostInTargetCluster == null ? hyperHost : hostInTargetCluster;
-            ManagedObjectReference morTargetDS = getTargetDatastoreMOReference(targetDsName, hyperHost);
+            ManagedObjectReference morTargetDS = getTargetDatastoreMOReference(targetDsName, dsHost);
             if(morTargetDS == null) {
                 String msg = "Unable to find the target datastore: " + targetDsName + " on host: " + dsHost.getHyperHostName();
                 s_logger.error(msg);
@@ -6291,30 +6276,23 @@ private List<VolumeObjectTO> relocateVirtualMachine(final VmwareHypervisorHost h
         VmwareHypervisorHost targetHyperHost = hostInTargetCluster;
         VirtualMachineMO vmMo = null;
         ManagedObjectReference morSourceHostDc = null;
-        ManagedObjectReference morTargetHostDc = null;
-        ManagedObjectReference morTargetHost = new ManagedObjectReference();
         VirtualMachineRelocateSpec relocateSpec = new VirtualMachineRelocateSpec();
         List<VirtualMachineRelocateSpecDiskLocator> diskLocators = new ArrayList<VirtualMachineRelocateSpecDiskLocator>();
         Set<String> mountedDatastoresAtSource = new HashSet<String>();
         List<VolumeObjectTO> volumeToList =  new ArrayList<>();
         Map<Long, Integer> volumeDeviceKey = new HashMap<Long, Integer>();
-        if (StringUtils.isNotBlank(targetHost)) {
-            String targetHostMorInfo = targetHost.split("@")[0];
-            morTargetHost.setType(targetHostMorInfo.split(":")[0]);
-            morTargetHost.setValue(targetHostMorInfo.split(":")[1]);
-        }
 
         try {
             if (sourceHyperHost == null) {
                 sourceHyperHost = getHyperHost(getServiceContext());
             }
             if (targetHyperHost == null && StringUtils.isNotBlank(targetHost)) {
-                targetHyperHost = new HostMO(getServiceContext(), morTargetHost);
+                targetHyperHost = VmwareHelper.getHostMOFromHostName(getServiceContext(), targetHost);
             }
             morSourceHostDc = sourceHyperHost.getHyperHostDatacenter();
             DatacenterMO dcMo = new DatacenterMO(sourceHyperHost.getContext(), morSourceHostDc);
             if (targetHyperHost != null) {
-                morTargetHostDc = targetHyperHost.getHyperHostDatacenter();
+                ManagedObjectReference morTargetHostDc = targetHyperHost.getHyperHostDatacenter();
                 if (!morSourceHostDc.getValue().equalsIgnoreCase(morTargetHostDc.getValue())) {
                     String msg = "VM " + vmName + " cannot be migrated between different datacenter";
                     throw new CloudRuntimeException(msg);
@@ -6405,12 +6383,12 @@ private List<VolumeObjectTO> relocateVirtualMachine(final VmwareHypervisorHost h
             }
 
             // Specific section for MigrateVmWithStorageCommand
-            if (vmTo != null) {
+            if (vmTo != null && targetHyperHost != null) {
                 // Prepare network at target before migration
                 NicTO[] nics = vmTo.getNics();
                 for (NicTO nic : nics) {
                     // prepare network on the host
-                    prepareNetworkFromNicInfo(new HostMO(getServiceContext(), morTargetHost), nic, false, vmTo.getType());
+                    prepareNetworkFromNicInfo((HostMO)targetHyperHost, nic, false, vmTo.getType());
                 }
                 // Ensure secondary storage mounted on target host
                 VmwareManager mgr = targetHyperHost.getContext().getStockObject(VmwareManager.CONTEXT_STOCK_NAME);

plugins/hypervisors/vmware/src/org/apache/cloudstack/storage/motion/VmwareStorageMotionStrategy.java

@@ -190,22 +190,23 @@ public void copyAsync(DataObject srcData, DataObject destData, Host destHost, As
         ScopeType targetScopeType = destData.getDataStore().getScope().getScopeType();
         Long hostId = null;
         String hostGuidInTargetCluster = null;
-        // Find Volume source cluster and select any Vmware hypervisor host to attach worker VM
-        if (ScopeType.CLUSTER.equals(sourceScopeType) && ScopeType.CLUSTER.equals(targetScopeType) && !sourcePool.getClusterId().equals(targetPool.getClusterId())) {
-            // Without host vMotion might fail between non-shared storages with error similar to,
-            // https://kb.vmware.com/s/article/1003795
-            List<HostVO> hosts = hostDao.findHypervisorHostInCluster(targetPool.getClusterId());
-            if (CollectionUtils.isNotEmpty(hosts)) {
-                hostGuidInTargetCluster = hosts.get(0).getGuid();
-            }
-            if (hostGuidInTargetCluster == null) {
-                throw new CloudRuntimeException("Offline Migration failed, unable to find suitable target host for worker VM placement while migrating between storage pools of different cluster without shared storages");
-            }
-        } else if (ScopeType.CLUSTER.equals(sourceScopeType)) {
+        if (ScopeType.CLUSTER.equals(sourceScopeType)) {
+            // Find Volume source cluster and select any Vmware hypervisor host to attach worker VM
             hostId = findSuitableHostIdForWorkerVmPlacement(sourcePool.getClusterId());
             if (hostId == null) {
                 throw new CloudRuntimeException("Offline Migration failed, unable to find suitable host for worker VM placement in the cluster of storage pool: " + sourcePool.getName());
             }
+            if (ScopeType.CLUSTER.equals(targetScopeType) && !sourcePool.getClusterId().equals(targetPool.getClusterId())) {
+                // Without host vMotion might fail between non-shared storages with error similar to,
+                // https://kb.vmware.com/s/article/1003795
+                List<HostVO> hosts = hostDao.findHypervisorHostInCluster(targetPool.getClusterId());
+                if (CollectionUtils.isNotEmpty(hosts)) {
+                    hostGuidInTargetCluster = hosts.get(0).getGuid();
+                }
+                if (hostGuidInTargetCluster == null) {
+                    throw new CloudRuntimeException("Offline Migration failed, unable to find suitable target host for worker VM placement while migrating between storage pools of different cluster without shared storages");
+                }
+            }
         } else if (ScopeType.CLUSTER.equals(targetScopeType)) {
             hostId = findSuitableHostIdForWorkerVmPlacement(targetPool.getClusterId());
             if (hostId == null) {

vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java

@@ -773,4 +773,18 @@ public static boolean isControllerOsRecommended(String dataDiskController) {
         return DiskControllerType.getType(dataDiskController) == DiskControllerType.osdefault;
     }
 
+    public static HostMO getHostMOFromHostName(final VmwareContext context, final String hostName) {
+        HostMO host = null;
+        if (com.cloud.utils.StringUtils.isNotBlank(hostName) && hostName.contains("@")) {
+            String hostMorInfo = hostName.split("@")[0];
+            if (hostMorInfo.contains(":")) {
+                ManagedObjectReference morHost = new ManagedObjectReference();
+                morHost.setType(hostMorInfo.split(":")[0]);
+                morHost.setValue(hostMorInfo.split(":")[1]);
+                host = new HostMO(context, morHost);
+            }
+        }
+        return host;
+    }
+
 }