Skip to content

Commit 68f459b

Browse files
authored
CapacityManagementImpl.updateCapacityForHost(..) use VM update time in capacity calculation. (#9662)
VM update time is nullable in DB and can cause NullPointerException if record in vm_instance has defined last_host_id and undefined update_time.
1 parent 15e25bc commit 68f459b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.HashMap;
2323
import java.util.List;
2424
import java.util.Map;
25+
import java.util.Optional;
2526

2627
import javax.inject.Inject;
2728
import javax.naming.ConfigurationException;
@@ -709,7 +710,8 @@ public void updateCapacityForHost(final Host host, final Map<Long, ServiceOfferi
709710
for (VMInstanceVO vm : vmsByLastHostId) {
710711
Float cpuOvercommitRatio = 1.0f;
711712
Float ramOvercommitRatio = 1.0f;
712-
long secondsSinceLastUpdate = (DateUtil.currentGMTTime().getTime() - vm.getUpdateTime().getTime()) / 1000;
713+
long lastModificationTime = Optional.ofNullable(vm.getUpdateTime()).orElse(vm.getCreated()).getTime();
714+
long secondsSinceLastUpdate = (DateUtil.currentGMTTime().getTime() - lastModificationTime) / 1000;
713715
if (secondsSinceLastUpdate < _vmCapacityReleaseInterval) {
714716
UserVmDetailVO vmDetailCpu = _userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.CPU_OVER_COMMIT_RATIO);
715717
UserVmDetailVO vmDetailRam = _userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);

0 commit comments

Comments
 (0)