fix conflicts

Author: RodrigoDLopez

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -2317,18 +2317,24 @@ private void orchestrateStorageMigration(final String vmUuid, final Map<Long, Lo
         }
     }
 
-    private Answer[] attemptHypervisorMigration(VMInstanceVO vm, Map<Volume, StoragePool> volumeToPool, Long hostId) {
-        if (hostId == null) {
-            return null;
-        }
+    private Answer[] attemptHypervisorMigration(StoragePool destPool, VMInstanceVO vm) {
         final HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType());
         // OfflineVmwareMigration: in case of vmware call vcenter to do it for us.
         // OfflineVmwareMigration: should we check the proximity of source and destination
         // OfflineVmwareMigration: if we are in the same cluster/datacentre/pool or whatever?
         // OfflineVmwareMigration: we are checking on success to optionally delete an old vm if we are not
         List<Command> commandsToSend = hvGuru.finalizeMigrate(vm, volumeToPool);
 
-        if (CollectionUtils.isNotEmpty(commandsToSend)) {
+        Long hostId = vm.getHostId();
+        // OfflineVmwareMigration: probably this is null when vm is stopped
+        if(hostId == null) {
+            hostId = vm.getLastHostId();
+            if (s_logger.isDebugEnabled()) {
+                s_logger.debug(String.format("host id is null, using last host id %d", hostId) );
+            }
+        }
+
+        if(CollectionUtils.isNotEmpty(commandsToSend)) {
             Commands commandsContainer = new Commands(Command.OnError.Stop);
             commandsContainer.addCommands(commandsToSend);
             try {
@@ -2342,7 +2348,7 @@ private Answer[] attemptHypervisorMigration(VMInstanceVO vm, Map<Volume, Storage
         return null;
     }
 
-    private void afterHypervisorMigrationCleanup(VMInstanceVO vm, Map<Volume, StoragePool> volumeToPool, Long sourceClusterId, Answer[] hypervisorMigrationResults) throws InsufficientCapacityException {
+    private void afterHypervisorMigrationCleanup(StoragePool destPool, VMInstanceVO vm, Answer[] hypervisorMigrationResults) throws InsufficientCapacityException {
         boolean isDebugEnabled = s_logger.isDebugEnabled();
         if(isDebugEnabled) {
             String msg = String.format("Cleaning up after hypervisor pool migration volumes for VM %s(%s)", vm.getInstanceName(), vm.getUuid());
@@ -2367,8 +2373,8 @@ private void afterHypervisorMigrationCleanup(VMInstanceVO vm, Map<Volume, Storag
             vm.setLastHostId(null);
             vm.setPodIdToDeployIn(rootVolumePool.getPodId());
             // OfflineVmwareMigration: a consecutive migration will fail probably (no host not pod)
-        }// else keep last host set for this vm
-        markVolumesInPool(vm, hypervisorMigrationResults);
+        } // else keep last host set for this vm
+        markVolumesInPool(vm, destPool, hypervisorMigrationResults);
         // OfflineVmwareMigration: deal with answers, if (hypervisorMigrationResults.length > 0)
         // OfflineVmwareMigration: iterate over the volumes for data updates
     }
@@ -2415,21 +2421,17 @@ private void markVolumesInPool(VMInstanceVO vm, Answer[] hypervisorMigrationResu
 
     private void migrateThroughHypervisorOrStorage(VMInstanceVO vm, Map<Volume, StoragePool> volumeToPool) throws StorageUnavailableException, InsufficientCapacityException {
         final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
-        Pair<Long, Long> vmClusterAndHost = findClusterAndHostIdForVm(vm);
-        final Long sourceClusterId = vmClusterAndHost.first();
-        final Long sourceHostId = vmClusterAndHost.second();
-        Answer[] hypervisorMigrationResults = attemptHypervisorMigration(vm, volumeToPool, sourceHostId);
-        boolean migrationResult = false;
+        Answer[] hypervisorMigrationResults = attemptHypervisorMigration(destPool, vm);
         if (hypervisorMigrationResults == null) {
             // OfflineVmwareMigration: if the HypervisorGuru can't do it, let the volume manager take care of it.
-            migrationResult = volumeMgr.storageMigration(profile, volumeToPool);
+            boolean migrationResult = volumeMgr.storageMigration(profile, destPool);
             if (migrationResult) {
-                postStorageMigrationCleanup(vm, volumeToPool, _hostDao.findById(sourceHostId), sourceClusterId);
+                afterStorageMigrationCleanup(destPool, vm);
             } else {
                 s_logger.debug("Storage migration failed");
             }
         } else {
-            afterHypervisorMigrationCleanup(vm, volumeToPool, sourceClusterId, hypervisorMigrationResults);
+            afterHypervisorMigrationCleanup(destPool, vm, hypervisorMigrationResults);
         }
     }
 
@@ -2521,6 +2523,9 @@ private void postStorageMigrationCleanup(VMInstanceVO vm, Map<Volume, StoragePoo
         }
         setDestinationPoolAndReallocateNetwork(rootVolumePool, vm);
 
+    private void afterStorageMigrationCleanup(StoragePool destPool, VMInstanceVO vm) throws InsufficientCapacityException {
+        setDestinationPoolAndReallocateNetwork(destPool, vm);
+
         //when start the vm next time, don;'t look at last_host_id, only choose the host based on volume/storage pool
         vm.setLastHostId(null);
         if (rootVolumePool != null) {
@@ -2530,7 +2535,7 @@ private void postStorageMigrationCleanup(VMInstanceVO vm, Map<Volume, StoragePoo
         // If VM was cold migrated between clusters belonging to two different VMware DCs,
         // unregister the VM from the source host and cleanup the associated VM files.
         if (vm.getHypervisorType().equals(HypervisorType.VMware)) {
-            afterStorageMigrationVmwareVMCleanup(rootVolumePool, vm, srcHost, srcClusterId);
+            afterStorageMigrationVmwareVMCleanup(destPool, vm);
         }
     }
 
@@ -2548,15 +2553,12 @@ private void setDestinationPoolAndReallocateNetwork(StoragePool destPool, VMInst
         }
     }
 
-    private void afterStorageMigrationVmwareVMCleanup(StoragePool destPool, VMInstanceVO vm, HostVO srcHost, Long srcClusterId) {
+    private void afterStorageMigrationVmwareVMCleanup(StoragePool destPool, VMInstanceVO vm) {
         // OfflineVmwareMigration: this should only happen on storage migration, else the guru would already have issued the command
-        final Long destClusterId = destPool.getClusterId();
-        if (srcClusterId != null && destClusterId != null && ! srcClusterId.equals(destClusterId) && srcHost != null) {
-            final String srcDcName = _clusterDetailsDao.getVmwareDcName(srcClusterId);
-            final String destDcName = _clusterDetailsDao.getVmwareDcName(destClusterId);
-            if (srcDcName != null && destDcName != null && !srcDcName.equals(destDcName)) {
-                removeStaleVmFromSource(vm, srcHost);
-            }
+        Long destClusterId = destPool.getClusterId();
+        if (destClusterId == null ) {
+            s_logger.debug(String.format("No Cluster destination ID was found when doing cleanup after Vmware"));
+            return;
         }
         Long srcHostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId();
         if (srcHostId == null) {