From 2a48d71909bc22ed06bdcd66e8444781f8990121 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 3 May 2024 15:14:44 +0530 Subject: [PATCH] server: don't go into O(n^2) loop for non-XenServer hosts Introduced in https://github.com/apache/cloudstack/pull/1403 this gates the logic only to XenServer where this would at all run. The specific code is only applicable for XenServer and SolidFire (https://youtu.be/YQ3pBeL-WaA?si=ed_gT_A8lZYJiEh. Signed-off-by: Rohit Yadav --- .../src/main/java/com/cloud/resource/ResourceManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java index 69b80d10c01..8a93ec8fe44 100755 --- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java @@ -2390,9 +2390,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, _hostDao.update(host.getId(), host); } - if (startup instanceof StartupRoutingCommand) { + if (host != null && host.getHypervisorType().equals(HypervisorType.XenServer) && + startup instanceof StartupRoutingCommand) { final StartupRoutingCommand ssCmd = (StartupRoutingCommand)startup; - updateSupportsClonedVolumes(host, ssCmd.getSupportsClonedVolumes()); }