From 3e2717424de1d0f90d1477884368c8a45100a92a Mon Sep 17 00:00:00 2001 From: Nicolas Vazquez Date: Thu, 12 Oct 2023 05:49:27 -0300 Subject: [PATCH] Address review comments (#338) This adds the missing commit to the fix #335 from the upstream PR: apache/cloudstack#7977 (cherry picked from commit b5f77f9c3b53af7e8b05730da9807a2c9eb017a5) Signed-off-by: Rohit Yadav --- .../cloud/resourcelimit/ResourceLimitManagerImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index df5d0b19bb9..8cfdb630b17 100644 --- a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -1190,13 +1190,12 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim GlobalLock lock = GlobalLock.getInternLock("ResourceCheckTask"); try { if (lock.lock(30)) { - ManagementServerHostVO msHost = managementServerHostDao.findOneByLongestRuntime(); - if (msHost == null || (msHost.getMsid() != ManagementServerNode.getManagementServerId())) { - s_logger.debug("Skipping the resource counters recalculation task on this management server"); - lock.unlock(); - return; - } try { + ManagementServerHostVO msHost = managementServerHostDao.findOneByLongestRuntime(); + if (msHost == null || (msHost.getMsid() != ManagementServerNode.getManagementServerId())) { + s_logger.trace("Skipping the resource counters recalculation task on this management server"); + return; + } runResourceCheckTaskInternal(); } finally { lock.unlock();