From d083df504d213456eb5d1895866ef06bcc621ba5 Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Fri, 22 Sep 2023 08:58:45 -0600 Subject: [PATCH] LibvirtServerDiscoverer should only process added KVM hosts (#324) Don't use LibvirtServerDiscoverer's processHostAdded() in CustomServerDiscoverer (cherry picked from commit ba0dfea6fd469063d6a154d2056f250feed84f10) Signed-off-by: Rohit Yadav --- .../cloud/hypervisor/discoverer/CustomServerDiscoverer.java | 5 +++++ .../hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/hypervisor/discoverer/CustomServerDiscoverer.java b/server/src/main/java/com/cloud/hypervisor/discoverer/CustomServerDiscoverer.java index 534947f092e..e5ef78305ea 100644 --- a/server/src/main/java/com/cloud/hypervisor/discoverer/CustomServerDiscoverer.java +++ b/server/src/main/java/com/cloud/hypervisor/discoverer/CustomServerDiscoverer.java @@ -29,4 +29,9 @@ public class CustomServerDiscoverer extends LibvirtServerDiscoverer { protected String getPatchPath() { return "scripts/vm/hypervisor/kvm/"; } + + @Override + public void processHostAdded(long hostId) { + // Not using super class implementation here. + } } diff --git a/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java index 440961dd7b0..e9f0d5f58e4 100644 --- a/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java +++ b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java @@ -110,7 +110,7 @@ public abstract class LibvirtServerDiscoverer extends DiscovererBase implements @Override public void processHostAdded(long hostId) { HostVO host = hostDao.findById(hostId); - if (host != null) { + if (host != null && getHypervisorType().equals(host.getHypervisorType())) { directDownloadManager.syncCertificatesToHost(hostId, host.getDataCenterId()); } }