From e7d72fe622338594f6ccfe7e08e924e4ac99189b Mon Sep 17 00:00:00 2001 From: vishesh92 Date: Mon, 12 Jan 2026 13:13:42 +0530 Subject: [PATCH] Fix host metrics on overprovisioning change --- .../cloud/capacity/CapacityManagerImpl.java | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java index 8eebc04ee683..406fc91f9262 100644 --- a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java +++ b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java @@ -704,22 +704,16 @@ public void updateCapacityForHost(final Host host) { so = _offeringsDao.findByIdIncludingRemoved(vm.getServiceOfferingId()); } if (so.isDynamic()) { - usedMemory += - ((Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.memory.name())) * 1024L * 1024L) / ramOvercommitRatio) * - clusterRamOvercommitRatio; + usedMemory += Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.memory.name())) * 1024L * 1024L; if(vmDetails.containsKey(UsageEventVO.DynamicParameters.cpuSpeed.name())) { - usedCpu += - ((Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name())) * Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuSpeed.name()))) / cpuOvercommitRatio) * - clusterCpuOvercommitRatio; + usedCpu += Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name())) * Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuSpeed.name())); } else { - usedCpu += - ((Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name())) * so.getSpeed()) / cpuOvercommitRatio) * - clusterCpuOvercommitRatio; + usedCpu += Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name())) * so.getSpeed(); } usedCpuCore += Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name())); } else { - usedMemory += ((so.getRamSize() * 1024L * 1024L) / ramOvercommitRatio) * clusterRamOvercommitRatio; - usedCpu += ((so.getCpu() * so.getSpeed()) / cpuOvercommitRatio) * clusterCpuOvercommitRatio; + usedMemory += so.getRamSize() * 1024L * 1024L; + usedCpu += so.getCpu() * so.getSpeed(); usedCpuCore += so.getCpu(); } } @@ -748,22 +742,16 @@ public void updateCapacityForHost(final Host host) { so = _offeringsDao.findByIdIncludingRemoved(vm.getServiceOfferingId()); } if (so.isDynamic()) { - reservedMemory += - ((Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.memory.name())) * 1024L * 1024L) / ramOvercommitRatio) * - clusterRamOvercommitRatio; + reservedMemory += Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.memory.name())) * 1024L * 1024L; if(vmDetails.containsKey(UsageEventVO.DynamicParameters.cpuSpeed.name())) { - reservedCpu += - ((Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name())) * Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuSpeed.name()))) / cpuOvercommitRatio) * - clusterCpuOvercommitRatio; + reservedCpu += Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name())) * Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuSpeed.name())); } else { - reservedCpu += - ((Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name())) * so.getSpeed()) / cpuOvercommitRatio) * - clusterCpuOvercommitRatio; + reservedCpu += Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name())) * so.getSpeed(); } reservedCpuCore += Integer.parseInt(vmDetails.get(UsageEventVO.DynamicParameters.cpuNumber.name())); } else { - reservedMemory += ((so.getRamSize() * 1024L * 1024L) / ramOvercommitRatio) * clusterRamOvercommitRatio; - reservedCpu += (so.getCpu() * so.getSpeed() / cpuOvercommitRatio) * clusterCpuOvercommitRatio; + reservedMemory += so.getRamSize() * 1024L * 1024L; + reservedCpu += so.getCpu() * so.getSpeed(); reservedCpuCore += so.getCpu(); } } else {