julien-vaz commented on code in PR #10892:
URL: https://github.com/apache/cloudstack/pull/10892#discussion_r2127084568


##########
framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaManagerImpl.java:
##########
@@ -340,12 +349,41 @@ protected List<QuotaUsageVO> 
createQuotaUsagesAccordingToQuotaTariffs(AccountVO
     }
 
     protected boolean shouldCalculateUsageRecord(AccountVO accountVO, UsageVO 
usageRecord) {
-        if 
(Boolean.FALSE.equals(QuotaConfig.QuotaAccountEnabled.valueIn(accountVO.getAccountId())))
 {
+        boolean calculateUsageRecord = findConfigurationValue(accountVO, 
QuotaConfig.QuotaAccountEnabled);
+        if (!calculateUsageRecord && usageRecord != null) {
             logger.debug("Considering usage record [{}] as calculated and 
skipping it because account [{}] has the quota plugin disabled.",
                     usageRecord.toString(usageAggregationTimeZone), 
accountVO.reflectionToString());
             return false;
         }
-        return true;
+        return calculateUsageRecord;
+    }
+
+    @Override
+    public boolean findConfigurationValue(AccountVO accountVO, 
ConfigKey<Boolean> key) {
+        boolean result = 
Boolean.parseBoolean(getConfigValueOrDefaultValue(key));

Review Comment:
   That makes sense. Done



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

Reply via email to