From d182eacf8622d3ef462b6ef56fb95b78028877b6 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 6 Dec 2022 10:05:49 +0100 Subject: [PATCH] host affinity: fix vm cannot be started if a vm is stopped in the affinity group (#6936) --- .../org/apache/cloudstack/affinity/HostAffinityProcessor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/affinity-group-processors/host-affinity/src/main/java/org/apache/cloudstack/affinity/HostAffinityProcessor.java b/plugins/affinity-group-processors/host-affinity/src/main/java/org/apache/cloudstack/affinity/HostAffinityProcessor.java index 055a6442e1a..0e7c536b0f9 100644 --- a/plugins/affinity-group-processors/host-affinity/src/main/java/org/apache/cloudstack/affinity/HostAffinityProcessor.java +++ b/plugins/affinity-group-processors/host-affinity/src/main/java/org/apache/cloudstack/affinity/HostAffinityProcessor.java @@ -81,7 +81,9 @@ public class HostAffinityProcessor extends AffinityProcessorBase implements Affi Set hostIds = new HashSet<>(); for (Long groupVMId : vmIds) { VMInstanceVO groupVM = _vmInstanceDao.findById(groupVMId); - hostIds.add(groupVM.getHostId()); + if (groupVM != null && groupVM.getHostId() != null) { + hostIds.add(groupVM.getHostId()); + } } return hostIds; }