From 8065aedf68b3e33b0e0ae1b93a97ced950bdeb82 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 5 Apr 2017 17:35:41 +0200 Subject: [PATCH] CE-113 extra trace log of worker VMs --- .../cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 2bf4692e798..bc968def44f 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 @@ -556,12 +556,17 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw // "until we have found out a VMware API that can check if there are pending tasks on the subject VM" // but as we expire jobs and those stale worker VMs stay around untill an MS reboot we opt in to have them removed anyway Long hungWorkerTimeout = 2 * (AsyncJobManagerImpl.JobExpireMinutes.value() + AsyncJobManagerImpl.JobCancelThresholdMinutes.value()) * MILISECONDS_PER_MINUTE; - if(s_vmwareCleanOldWorderVMs.value() && System.currentTimeMillis() - startTick > hungWorkerTimeout) { + Long letsSayNow = System.currentTimeMillis(); + if(s_vmwareCleanOldWorderVMs.value() && letsSayNow - startTick > hungWorkerTimeout) { if(s_logger.isInfoEnabled()) { s_logger.info("Worker VM expired, seconds elapsed: " + (System.currentTimeMillis() - startTick) / 1000); } return true; } + if (s_logger.isTraceEnabled()) { + s_logger.trace("Worker VM with tag '" + workerTag + "' does not need recycling, yet." + + "But in " + (startTick + hungWorkerTimeout - letsSayNow) + " milisecs, though"); + } return false; }