DaanHoogland commented on code in PR #10892:
URL: https://github.com/apache/cloudstack/pull/10892#discussion_r2206573636
##########
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) {
+ logger.trace("Searching configuration [{}] of account [{}] in its
settings.", key.key(), accountVO);
+ AccountDetailVO accountDetail =
accountDetailsDao.findDetail(accountVO.getAccountId(), key.key());
+ if (accountDetail != null) {
+ boolean result = Boolean.parseBoolean(accountDetail.getValue());
+ logger.trace("Using value [{}] found in account [{}] settings to
configuration [{}].", result, accountVO, key.key());
+ return result;
+ }
+
+ if
(Boolean.parseBoolean(_configDao.getValue("enable.account.settings.for.domain")))
{
+ logger.trace("Searching for configuration [{}] of account [{}] in
its domain [{}] settings.", key.key(), accountVO, accountVO.getDomainId());
+ DomainDetailVO domainDetail =
domainDetailsDao.findDetail(accountVO.getDomainId(), key.key());
+ if (domainDetail != null) {
+ boolean result = Boolean.parseBoolean(domainDetail.getValue());
+ logger.trace("Using value [{}] found in domain [{}] settings
to configuration [{}].", result, accountVO.getDomainId(), key.key());
+ return result;
+ }
+ }
+ boolean result =
Boolean.parseBoolean(getConfigValueOrDefaultValue(key));
+ logger.trace("Using default value [{}] to configuration [{}].",
result, key.key());
+ return result;
+ }
Review Comment:
that is unfortunate, this means usage server will have to keep switching
between the two schemas.
And it triggered another thought of which I’m not sure of the consequences;
the value retrieved is always the latest. Is there any circumstance you’d want
to know the value at another point in time?
--
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
