Skip to content

Commit ebb22a4

Browse files
yadvrDaanHoogland
authored andcommitted
server: Calculate fresh capacity per VM (#2663)
This fixes and ensures that every VM has its capacity individually calculated, with the initial override of 1.0f as overcommit ratio. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 5221778 commit ebb22a4

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

server/src/com/cloud/capacity/CapacityManagerImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,9 +596,9 @@ public void updateCapacityForHost(final Host host) {
596596
ClusterDetailsVO clusterDetailRam = _clusterDetailsDao.findDetail(cluster.getId(), "memoryOvercommitRatio");
597597
Float clusterCpuOvercommitRatio = Float.parseFloat(clusterDetailCpu.getValue());
598598
Float clusterRamOvercommitRatio = Float.parseFloat(clusterDetailRam.getValue());
599-
Float cpuOvercommitRatio = 1f;
600-
Float ramOvercommitRatio = 1f;
601599
for (VMInstanceVO vm : vms) {
600+
Float cpuOvercommitRatio = 1.0f;
601+
Float ramOvercommitRatio = 1.0f;
602602
Map<String, String> vmDetails = _userVmDetailsDao.listDetailsKeyPairs(vm.getId());
603603
String vmDetailCpu = vmDetails.get("cpuOvercommitRatio");
604604
String vmDetailRam = vmDetails.get("memoryOvercommitRatio");
@@ -628,6 +628,8 @@ public void updateCapacityForHost(final Host host) {
628628
s_logger.debug("Found " + vmsByLastHostId.size() + " VM, not running on host " + host.getId());
629629
}
630630
for (VMInstanceVO vm : vmsByLastHostId) {
631+
Float cpuOvercommitRatio = 1.0f;
632+
Float ramOvercommitRatio = 1.0f;
631633
long secondsSinceLastUpdate = (DateUtil.currentGMTTime().getTime() - vm.getUpdateTime().getTime()) / 1000;
632634
if (secondsSinceLastUpdate < _vmCapacityReleaseInterval) {
633635
UserVmDetailVO vmDetailCpu = _userVmDetailsDao.findDetail(vm.getId(), "cpuOvercommitRatio");

0 commit comments

Comments
 (0)