minor changes

Author: sudo87

engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java

@@ -65,7 +65,7 @@ public interface ConfigurationManager {
             "allow.non.rfc1918.compliant.ips", "Advanced", "false",
             "Allows non-compliant RFC 1918 IPs for Shared, Isolated networks and VPCs", true, null);
 
-    ConfigKey<Float> HostCapacityTypeCpuMemoryWeight = new ConfigKey<Float>(ConfigKey.CATEGORY_ADVANCED, Float.class, "host.capacityType.to.order.clusters.cputomemoryweight",
+    ConfigKey<Float> HostCapacityTypeCpuMemoryWeight = new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, Float.class, "host.capacityType.to.order.clusters.cputomemoryweight",
             "0.5",
             "CPU to Memory weight used for COMBINED capacityTye to order cluster and host",
             true, ConfigKey.Scope.Global);

engine/schema/src/main/java/com/cloud/capacity/dao/CapacityDaoImpl.java

@@ -1073,9 +1073,11 @@ public List<CapacityVO> listHostCapacityByCapacityTypes(Long zoneId, Long cluste
         sb.and("zoneId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
         sb.and("clusterId", sb.entity().getClusterId(), SearchCriteria.Op.EQ);
         sb.and("capacityTypes", sb.entity().getCapacityType(), SearchCriteria.Op.IN);
+        sb.and("capacityState", sb.entity().getCapacityState(), Op.EQ);
         sb.done();
 
         SearchCriteria<CapacityVO> sc = sb.create();
+        sc.setParameters("capacityState", "Enabled");
         if (zoneId != null) {
             sc.setParameters("zoneId", zoneId);
         }
@@ -1091,8 +1093,10 @@ public List<CapacityVO> listPodCapacityByCapacityTypes(Long zoneId, List<Short>
         SearchBuilder<CapacityVO> sb = createSearchBuilder();
         sb.and("zoneId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
         sb.and("capacityTypes", sb.entity().getCapacityType(), SearchCriteria.Op.IN);
+        sb.and("capacityState", sb.entity().getCapacityState(), Op.EQ);
         sb.done();
         SearchCriteria<CapacityVO> sc = sb.create();
+        sc.setParameters("capacityState", "Enabled");
         if (zoneId != null) {
             sc.setParameters("zoneId", zoneId);
         }
@@ -1106,9 +1110,11 @@ public List<CapacityVO> listClusterCapacityByCapacityTypes(Long zoneId, Long pod
         sb.and("zoneId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
         sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ);
         sb.and("capacityTypes", sb.entity().getCapacityType(), SearchCriteria.Op.IN);
+        sb.and("capacityState", sb.entity().getCapacityState(), Op.EQ);
         sb.done();
 
         SearchCriteria<CapacityVO> sc = sb.create();
+        sc.setParameters("capacityState", "Enabled");
         if (zoneId != null) {
             sc.setParameters("zoneId", zoneId);
         }

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

@@ -80,3 +80,9 @@ CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'storage_access_groups', 'var
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.cluster', 'storage_access_groups', 'varchar(255) DEFAULT NULL COMMENT "storage access groups for the hosts in the cluster"');
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host_pod_ref', 'storage_access_groups', 'varchar(255) DEFAULT NULL COMMENT "storage access groups for the hosts in the pod"');
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.data_center', 'storage_access_groups', 'varchar(255) DEFAULT NULL COMMENT "storage access groups for the hosts in the zone"');
+
+-- Update description for configuration: host.capacityType.to.order.clusters
+UPDATE `cloud`.`configuration` SET
+    `description` = 'The host capacity type (CPU, RAM or COMBINED) is used by deployment planner to order clusters during VM resource allocation'
+WHERE `name` = 'host.capacityType.to.order.clusters'
+  AND `description` = 'The host capacity type (CPU or RAM) is used by deployment planner to order clusters during VM resource allocation';

server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java

@@ -299,7 +299,7 @@ protected List<Host> allocateTo(DeploymentPlan plan, ServiceOffering offering, V
             Collections.shuffle(hosts);
         } else if (vmAllocationAlgorithm.equals("userdispersing")) {
             hosts = reorderHostsByNumberOfVms(plan, hosts, account);
-        }else if(vmAllocationAlgorithm.equals("firstfitleastconsumed")){
+        } else if(vmAllocationAlgorithm.equals("firstfitleastconsumed")){
             hosts = reorderHostsByCapacity(plan, hosts);
         }
 

server/src/main/java/com/cloud/deploy/FirstFitPlanner.java

@@ -558,8 +558,8 @@ private Pair<List<Long>, Map<Long, Double>> getOrderedClustersByCapacity(long id
         List<CapacityVO> capacities = capacityDao.listClusterCapacityByCapacityTypes(zoneId, podId, vmId,
                 List.of(Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY));
 
-        Map<Long, Double> podsByCombinedCapacities = getClusterByCombinedCapacities(capacities, cpuToMemoryWeight);
-        return new Pair<>(new ArrayList<>(podsByCombinedCapacities.keySet()), podsByCombinedCapacities);
+        Map<Long, Double> clusterByCombinedCapacities = getClusterByCombinedCapacities(capacities, cpuToMemoryWeight);
+        return new Pair<>(new ArrayList<>(clusterByCombinedCapacities.keySet()), clusterByCombinedCapacities);
     }
 
     private Map<Long, Double> getClusterByCombinedCapacities(List<CapacityVO> capacities, double cpuToMemoryWeight) {