From 16b34c9a118fc9e62a8185bfdef3ddec82818389 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 18 Apr 2017 16:04:00 +0200 Subject: [PATCH] CE-110 default interval of 0 minutes means do not mark for cleaning --- .../com/cloud/hypervisor/vmware/manager/VmwareManager.java | 2 +- .../cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java index e5c30da80ed..65963eb25bd 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java @@ -33,7 +33,7 @@ public interface VmwareManager { public static final ConfigKey s_vmwareNicHotplugWaitTimeout = new ConfigKey("Advanced", Long.class, "vmware.nic.hotplug.wait.timeout", "15000", "Wait timeout (milli seconds) for hot plugged NIC of VM to be detected by guest OS.", false, ConfigKey.Scope.Global); - public static final ConfigKey templateCleanupInterval = new ConfigKey("Advanced", Long.class, "vmware.full.clone.template.cleanup.period", "1440", + public static final ConfigKey templateCleanupInterval = new ConfigKey("Advanced", Long.class, "vmware.full.clone.template.cleanup.period", "0", "period (in minutes) between the start of template cleanup jobs for vmware full cloned templates.", false, ConfigKey.Scope.Global); public static final ConfigKey s_vmwareCleanOldWorderVMs = new ConfigKey("Advanced", Boolean.class, "vmware.clean.old.worker.vms", "false", diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index ff85dfe4a7e..ce01dde8f14 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -1284,7 +1284,9 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw if(s_logger.isDebugEnabled()) { s_logger.debug("checking to see if we should schedule a job to search for fully cloned templates to clean-up"); } - if(StorageManager.StorageCleanupEnabled.value() && StorageManager.TemplateCleanupEnabled.value()) { + if(StorageManager.StorageCleanupEnabled.value() && + StorageManager.TemplateCleanupEnabled.value() && + templateCleanupInterval.value() > 0) { try { if (s_logger.isInfoEnabled()) { s_logger.info("scheduling job to search for fully cloned templates to clean-up once per " + templateCleanupInterval.value() + " minutes.");