From 90c6eede941e29cb6741087bf243a3ca8d18597f Mon Sep 17 00:00:00 2001 From: mprokopchuk Date: Mon, 9 Sep 2024 19:40:06 -0700 Subject: [PATCH] CapacityManagementImpl.updateCapacityForHost(..) use VM update time in capacity calculation. 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. --- .../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 64af417cc08b..421c980b2096 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.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 void updateCapacityForHost(final Host host, final Map