add log indicating chosen capacityType for ordering

Author: sudo87

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

@@ -410,6 +410,7 @@ private Pair<List<Long>, Map<Long, Double>> getOrderedHostsByCapacity(Long zoneI
         // Get capacity by which we should reorder
         short capacityType = FirstFitPlanner.getHostCapacityTypeToOrderCluster(
                 _configDao.getValue(Config.HostCapacityTypeToOrderClusters.key()), cpuToMemoryWeight);
+        logger.debug("CapacityType: {} is used for Host ordering", FirstFitPlanner.getCapacityTypeName(capacityType));
         if (capacityType >= 0) { // for CPU or RAM
             return _capacityDao.orderHostsByFreeCapacity(zoneId, clusterId, capacityType);
         }

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

@@ -518,6 +518,8 @@ private Pair<List<Long>, Map<Long, Double>> getOrderedPodsByCapacity(long zoneId
         double cpuToMemoryWeight = ConfigurationManager.HostCapacityTypeCpuMemoryWeight.value();
         short capacityType = getHostCapacityTypeToOrderCluster(
                 configDao.getValue(Config.HostCapacityTypeToOrderClusters.key()), cpuToMemoryWeight);
+
+        logger.debug("CapacityType: {} is used for Pod ordering", getCapacityTypeName(capacityType));
         if (capacityType >= 0) { // for capacityType other than COMBINED
             return capacityDao.orderPodsByAggregateCapacity(zoneId, capacityType);
         }
@@ -551,6 +553,8 @@ private Pair<List<Long>, Map<Long, Double>> getOrderedClustersByCapacity(long id
         double cpuToMemoryWeight = ConfigurationManager.HostCapacityTypeCpuMemoryWeight.value();
         short capacityType = getHostCapacityTypeToOrderCluster(
                 configDao.getValue(Config.HostCapacityTypeToOrderClusters.key()), cpuToMemoryWeight);
+
+        logger.debug("CapacityType: {} is used for Cluster ordering", getCapacityTypeName(capacityType));
         if (capacityType >= 0) { // for capacityType other than COMBINED
             return capacityDao.orderClustersByAggregateCapacity(id, vmId, capacityType, isZone);
         }
@@ -564,6 +568,15 @@ private Pair<List<Long>, Map<Long, Double>> getOrderedClustersByCapacity(long id
         return new Pair<>(new ArrayList<>(clusterByCombinedCapacities.keySet()), clusterByCombinedCapacities);
     }
 
+    public static String getCapacityTypeName(short capacityType) {
+        switch (capacityType) {
+            case 0: return ApiConstants.RAM;
+            case 1: return ApiConstants.CPU;
+            case -1: return ApiConstants.COMBINED_CAPACITY_ORDERING;
+            default: return "UNKNOWN";
+        }
+    }
+
     public Map<Long, Double> getClusterByCombinedCapacities(List<CapacityVO> capacities, double cpuToMemoryWeight) {
         Map<Long, Double> clusterByCombinedCapacity = new HashMap<>();
         for (CapacityVO capacityVO : capacities) {