#4378: look for host in same cluster in vm migration

Author: ustcweizhou

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -5632,12 +5632,14 @@ public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) thr
 
         DeployDestination dest = null;
         if (destinationHost == null) {
-            vm.setLastHostId(null); // Do not check last host
             final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
             final Host host = _hostDao.findById(srcHostId);
-            final DataCenterDeployment plan = new DataCenterDeployment(host.getDataCenterId(), null, null, null, null, null);
+            final DataCenterDeployment plan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), null, null, null);
             ExcludeList excludes = new ExcludeList();
             excludes.addHost(srcHostId);
+            if (vm.getLastHostId() != null && vm.getLastHostId() != srcHostId) {
+                excludes.addHost(vm.getLastHostId());
+            }
             try {
                 dest = _planningMgr.planDeployment(profile, plan, excludes, null);
             } catch (final AffinityConflictException e2) {
@@ -5652,7 +5654,7 @@ public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) thr
 
         // If no suitable destination found then throw exception
         if (dest == null) {
-            throw new RuntimeException("Unable to find suitable destination to migrate VM " + vm.getInstanceName());
+            throw new CloudRuntimeException("Unable to find suitable destination to migrate VM " + vm.getInstanceName());
         }
 
         UserVmVO uservm = _vmDao.findById(vmId);
@@ -7296,4 +7298,4 @@ private void checkUnmanagingVMVolumes(UserVmVO vm, List<VolumeVO> volumes) {
             }
         }
     }
-}
+}