(cloudstack) branch main updated: CapacityManagementImpl.updateCapacityForHost(..) use VM update time in capacity calculation. (#9662)

[joao]

This is an automated email from the ASF dual-hosted git repository.

joao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 68f459b334c CapacityManagementImpl.updateCapacityForHost(..) use VM 
update time in capacity calculation. (#9662)
68f459b334c is described below

commit 68f459b334cccf9dae3228acc4144d236e761785
Author: mprokopchuk <mprokopc...@gmail.com>
AuthorDate: Wed Sep 11 05:45:50 2024 -0700

    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.
---
 server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java 
b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
index 64af417cc08..421c980b209 100644
--- a/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java
@@ -22,6 +22,7 @@ import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
@@ -709,7 +710,8 @@ public class CapacityManagerImpl extends ManagerBase 
implements CapacityManager,
         for (VMInstanceVO vm : vmsByLastHostId) {
             Float cpuOvercommitRatio = 1.0f;
             Float ramOvercommitRatio = 1.0f;
-            long secondsSinceLastUpdate = (DateUtil.currentGMTTime().getTime() 
- vm.getUpdateTime().getTime()) / 1000;
+            long lastModificationTime = 
Optional.ofNullable(vm.getUpdateTime()).orElse(vm.getCreated()).getTime();
+            long secondsSinceLastUpdate = (DateUtil.currentGMTTime().getTime() 
- lastModificationTime) / 1000;
             if (secondsSinceLastUpdate < _vmCapacityReleaseInterval) {
                 UserVmDetailVO vmDetailCpu = 
_userVmDetailsDao.findDetail(vm.getId(), 
VmDetailConstants.CPU_OVER_COMMIT_RATIO);
                 UserVmDetailVO vmDetailRam = 
_userVmDetailsDao.findDetail(vm.getId(), 
VmDetailConstants.MEMORY_OVER_COMMIT_RATIO);