[cloudstack] branch main updated: If ResourceCountCheckTask throws an exception the scheduled task is not going to run again until the management servers are restarted. (#7670)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 70d5470f488 If ResourceCountCheckTask throws an exception the 
scheduled task is not going to run again until the management servers are 
restarted. (#7670)
70d5470f488 is described below

commit 70d5470f48879ac2c97aba3c08a7610938bd0972
Author: mprokopchuk <mprokopc...@gmail.com>
AuthorDate: Mon Jul 3 23:45:15 2023 -0700

    If ResourceCountCheckTask throws an exception the scheduled task is not 
going to run again until the management servers are restarted. (#7670)
    
    Co-authored-by: Maxim Prokopchuk <mprokopc...@apple.com>
---
 .../resourcelimit/ResourceLimitManagerImpl.java    | 39 +++++++++++++++++++---
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git 
a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java 
b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
index 9efeed39ac0..16090ebcf52 100644
--- a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
+++ b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
@@ -1156,12 +1156,28 @@ public class ResourceLimitManagerImpl extends 
ManagerBase implements ResourceLim
         @Override
         protected void runInContext() {
             s_logger.info("Started resource counters recalculation periodic 
task.");
-            List<DomainVO> domains = 
_domainDao.findImmediateChildrenForParent(Domain.ROOT_DOMAIN);
-            List<AccountVO> accounts = 
_accountDao.findActiveAccountsForDomain(Domain.ROOT_DOMAIN);
+            List<DomainVO> domains;
+            List<AccountVO> accounts;
+            // try/catch task, otherwise it won't be rescheduled in case of 
exception
+            try {
+                domains = 
_domainDao.findImmediateChildrenForParent(Domain.ROOT_DOMAIN);
+            } catch (Exception e) {
+                s_logger.warn("Resource counters recalculation periodic task 
failed, unable to fetch immediate children for the domain " + 
Domain.ROOT_DOMAIN, e);
+                // initialize domains as empty list to do best effort 
recalculation
+                domains = new ArrayList<>();
+            }
+            // try/catch task, otherwise it won't be rescheduled in case of 
exception
+            try {
+                accounts = 
_accountDao.findActiveAccountsForDomain(Domain.ROOT_DOMAIN);
+            } catch (Exception e) {
+                s_logger.warn("Resource counters recalculation periodic task 
failed, unable to fetch active accounts for domain " + Domain.ROOT_DOMAIN, e);
+                // initialize accounts as empty list to do best effort 
recalculation
+                accounts = new ArrayList<>();
+            }
 
             for (ResourceType type : ResourceType.values()) {
                 if (type.supportsOwner(ResourceOwnerType.Domain)) {
-                    recalculateDomainResourceCount(Domain.ROOT_DOMAIN, type);
+                    
recalculateDomainResourceCountInContext(Domain.ROOT_DOMAIN, type);
                     for (Domain domain : domains) {
                         recalculateDomainResourceCount(domain.getId(), type);
                     }
@@ -1170,10 +1186,25 @@ public class ResourceLimitManagerImpl extends 
ManagerBase implements ResourceLim
                 if (type.supportsOwner(ResourceOwnerType.Account)) {
                     // run through the accounts in the root domain
                     for (AccountVO account : accounts) {
-                        recalculateAccountResourceCount(account.getId(), type);
+                        
recalculateAccountResourceCountInContext(account.getId(), type);
                     }
                 }
             }
         }
+
+        private void recalculateDomainResourceCountInContext(long domainId, 
ResourceType type) {
+            try {
+                recalculateDomainResourceCount(domainId, type);
+            } catch (Exception e) {
+                s_logger.warn("Resource counters recalculation periodic task 
failed for the domain " + domainId + " and the resource type " + type + " .", 
e);
+            }
+        }
+        private void recalculateAccountResourceCountInContext(long accountId, 
ResourceType type) {
+            try {
+                recalculateAccountResourceCount(accountId, type);
+            } catch (Exception e) {
+                s_logger.warn("Resource counters recalculation periodic task 
failed for the account " + accountId + " and the resource type " + type + " .", 
e);
+            }
+        }
     }
 }