server: Dedicated hosts should be 'Not Suitable' while find host for vm migration

Author: ustcweizhou

plugins/affinity-group-processors/explicit-dedication/src/main/java/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java

@@ -92,6 +92,17 @@ public void process(VirtualMachineProfile vmProfile, DeploymentPlan plan, Exclud
         DataCenter dc = _dcDao.findById(vm.getDataCenterId());
         List<DedicatedResourceVO> resourceList = new ArrayList<DedicatedResourceVO>();
 
+        List<DedicatedResourceVO> dedicatedHosts = _dedicatedDao.listAll();
+        for (DedicatedResourceVO host : dedicatedHosts) {
+            // Hosts dedicated to different domain/account are not suitable for migration
+            if (host.getAccountId() != null && vm.getAccountId() != host.getAccountId()) {
+                avoid.addHost(host.getHostId());
+            }
+            if (host.getDomainId() != null && vm.getDomainId() != host.getDomainId()) {
+                avoid.addHost(host.getHostId());
+            }
+        }
+
         if (vmGroupMappings != null && !vmGroupMappings.isEmpty()) {
 
             for (AffinityGroupVMMapVO vmGroupMapping : vmGroupMappings) {

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -1335,12 +1335,8 @@ public Ternary<Pair<List<? extends Host>, Integer>, List<? extends Host>, Map<Ho
         }
 
         // call affinitygroup chain
-        final long vmGroupCount = _affinityGroupVMMapDao.countAffinityGroupsForVm(vm.getId());
-
-        if (vmGroupCount > 0) {
-            for (final AffinityGroupProcessor processor : _affinityProcessors) {
-                processor.process(vmProfile, plan, excludes);
-            }
+        for (final AffinityGroupProcessor processor : _affinityProcessors) {
+            processor.process(vmProfile, plan, excludes);
         }
 
         for (final HostAllocator allocator : hostAllocators) {