Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/768#discussion_r39474147
--- Diff: usage/src/org/apache/cloudstack/quota/QuotaManagerImpl.java ---
@@ -0,0 +1,397 @@
+//Licensed to the Apache Software Foundation (ASF) under one
+//or more contributor license agreements. See the NOTICE file
+//distributed with this work for additional information
+//regarding copyright ownership. The ASF licenses this file
+//to you under the Apache License, Version 2.0 (the
+//"License"); you may not use this file except in compliance
+//with the License. You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing,
+//software distributed under the License is distributed on an
+//"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//KIND, either express or implied. See the License for the
+//specific language governing permissions and limitations
+//under the License.
+package org.apache.cloudstack.quota;
+
+import com.cloud.usage.UsageVO;
+import com.cloud.usage.dao.UsageDao;
+import com.cloud.user.AccountVO;
+import com.cloud.user.dao.AccountDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.ManagerBase;
+import com.cloud.utils.db.DB;
+import com.cloud.utils.db.TransactionLegacy;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+import org.apache.cloudstack.quota.constant.QuotaTypes;
+import org.apache.cloudstack.quota.dao.QuotaAccountDao;
+import org.apache.cloudstack.quota.dao.QuotaBalanceDao;
+import org.apache.cloudstack.quota.dao.QuotaTariffDao;
+import org.apache.cloudstack.quota.dao.QuotaUsageDao;
+import org.apache.cloudstack.quota.dao.ServiceOfferingDao;
+import org.apache.cloudstack.quota.vo.QuotaAccountVO;
+import org.apache.cloudstack.quota.vo.QuotaBalanceVO;
+import org.apache.cloudstack.quota.vo.QuotaTariffVO;
+import org.apache.cloudstack.quota.vo.QuotaUsageVO;
+import org.apache.cloudstack.quota.vo.ServiceOfferingVO;
+import org.apache.cloudstack.utils.usage.UsageUtils;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+
+@Component
+@Local(value = QuotaManager.class)
+public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
+ private static final Logger s_logger =
Logger.getLogger(QuotaManagerImpl.class.getName());
+
+ @Inject
+ private AccountDao _accountDao;
+ @Inject
+ private QuotaAccountDao _quotaAcc;
+ @Inject
+ private UsageDao _usageDao;
+ @Inject
+ private QuotaTariffDao _quotaTariffDao;
+ @Inject
+ private QuotaUsageDao _quotaUsageDao;
+ @Inject
+ private ServiceOfferingDao _serviceOfferingDao;
+ @Inject
+ private QuotaBalanceDao _quotaBalanceDao;
+ @Inject
+ private ConfigurationDao _configDao;
+
+ private TimeZone _usageTimezone;
+ private int _aggregationDuration = 0;
+
+ final static BigDecimal s_hoursInMonth = new BigDecimal(30 * 24);
+ final static BigDecimal s_minutesInMonth = new BigDecimal(30 * 24 *
60);
+ final static BigDecimal s_gb = new BigDecimal(1024 * 1024 * 1024);
+
+ int _pid = 0;
+
+ public QuotaManagerImpl() {
+ super();
+ }
+
+ private void mergeConfigs(Map<String, String> dbParams, Map<String,
Object> xmlParams) {
+ for (Map.Entry<String, Object> param : xmlParams.entrySet()) {
+ dbParams.put(param.getKey(), (String) param.getValue());
+ }
+ }
+
+ @Override
+ public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
+ super.configure(name, params);
+
+ Map<String, String> configs = _configDao.getConfiguration(params);
+
+ if (params != null) {
+ mergeConfigs(configs, params);
+ }
+
+ String aggregationRange =
configs.get("usage.stats.job.aggregation.range");
+ String timeZoneStr = configs.get("usage.aggregation.timezone");
+
+ if (timeZoneStr == null) {
+ timeZoneStr = "GMT";
+ }
+ _usageTimezone = TimeZone.getTimeZone(timeZoneStr);
+
+ _aggregationDuration = Integer.parseInt(aggregationRange);
+ if (_aggregationDuration < UsageUtils.USAGE_AGGREGATION_RANGE_MIN)
{
+ s_logger.warn("Usage stats job aggregation range is to small,
using the minimum value of " + UsageUtils.USAGE_AGGREGATION_RANGE_MIN);
+ _aggregationDuration = UsageUtils.USAGE_AGGREGATION_RANGE_MIN;
+ }
+ s_logger.info("Usage timezone = " + _usageTimezone + "
AggregationDuration=" + _aggregationDuration);
+
+ return true;
+ }
+
+ @Override
+ public boolean start() {
+ if (s_logger.isInfoEnabled()) {
+ s_logger.info("Starting Quota Manager");
+ }
+ _pid = Integer.parseInt(System.getProperty("pid"));
+ return true;
+ }
+
+ @Override
+ public boolean stop() {
+ if (s_logger.isInfoEnabled()) {
+ s_logger.info("Stopping Quota Manager");
+ }
+ return true;
+ }
+
+ public List<QuotaUsageVO> aggregatePendingQuotaRecordsForAccount(final
AccountVO account, final Pair<List<? extends UsageVO>, Integer> usageRecords) {
+ List<QuotaUsageVO> quotaListForAccount = new ArrayList<>();
+ if (usageRecords == null || usageRecords.first() == null ||
usageRecords.first().isEmpty()) {
+ return quotaListForAccount;
+ }
+ s_logger.info("Getting pending quota records for account=" +
account.getAccountName());
+ for (UsageVO usageRecord: usageRecords.first()) {
+ BigDecimal aggregationRatio = new
BigDecimal(_aggregationDuration).divide(s_minutesInMonth, 8,
RoundingMode.HALF_EVEN);
+ switch (usageRecord.getUsageType()) {
+ case QuotaTypes.RUNNING_VM:
+
quotaListForAccount.addAll(updateQuotaRunningVMUsage(usageRecord,
aggregationRatio));
+ break;
+ case QuotaTypes.ALLOCATED_VM:
+
quotaListForAccount.add(updateQuotaAllocatedVMUsage(usageRecord,
aggregationRatio));
+ break;
+ case QuotaTypes.SNAPSHOT:
+ case QuotaTypes.TEMPLATE:
+ case QuotaTypes.ISO:
+ case QuotaTypes.VOLUME:
+ case QuotaTypes.VM_SNAPSHOT:
+
quotaListForAccount.add(updateQuotaDiskUsage(usageRecord, aggregationRatio,
usageRecord.getUsageType()));
+ break;
+ case QuotaTypes.LOAD_BALANCER_POLICY:
+ case QuotaTypes.PORT_FORWARDING_RULE:
+ case QuotaTypes.IP_ADDRESS:
+ case QuotaTypes.NETWORK_OFFERING:
+ case QuotaTypes.SECURITY_GROUP:
+ case QuotaTypes.VPN_USERS:
+ quotaListForAccount.add(updateQuotaRaw(usageRecord,
aggregationRatio, usageRecord.getUsageType()));
+ break;
+ case QuotaTypes.NETWORK_BYTES_RECEIVED:
+ case QuotaTypes.NETWORK_BYTES_SENT:
+
quotaListForAccount.add(updateQuotaNetwork(usageRecord,
usageRecord.getUsageType()));
+ break;
+ case QuotaTypes.VM_DISK_IO_READ:
+ case QuotaTypes.VM_DISK_IO_WRITE:
+ case QuotaTypes.VM_DISK_BYTES_READ:
+ case QuotaTypes.VM_DISK_BYTES_WRITE:
+ default:
+ break;
+ }
+ }
+ return quotaListForAccount;
+ }
+
+ public void processQuotaBalanceForAccount(final AccountVO account,
final List<QuotaUsageVO> quotaListForAccount) {
+ if (quotaListForAccount == null || quotaListForAccount.size() < 1)
{
+ return;
+ }
+ quotaListForAccount.add(new QuotaUsageVO());
+ Date startDate = quotaListForAccount.get(0).getStartDate();
+ Date endDate = quotaListForAccount.get(0).getEndDate();
+ BigDecimal aggrUsage = new BigDecimal(0);
+ for (QuotaUsageVO entry: quotaListForAccount) {
+ if (startDate.compareTo(entry.getStartDate()) != 0) {
+ QuotaBalanceVO lastRealBalanceEntry =
_quotaBalanceDao.findLastBalanceEntry(account.getAccountId(),
account.getDomainId(), startDate);
+ Date lastBalanceDate = new Date(0);
+ if (lastRealBalanceEntry != null) {
+ lastBalanceDate = lastRealBalanceEntry.getUpdatedOn();
+ aggrUsage =
aggrUsage.add(lastRealBalanceEntry.getCreditBalance());
+ }
+
+ List<QuotaBalanceVO> creditsReceived =
_quotaBalanceDao.findCreditBalance(account.getAccountId(),
account.getDomainId(), lastBalanceDate, endDate);
+ if (creditsReceived != null) {
+ for (QuotaBalanceVO credit : creditsReceived) {
+ aggrUsage =
aggrUsage.add(credit.getCreditBalance());
+ }
+ }
+
+ QuotaBalanceVO newBalance = new
QuotaBalanceVO(account.getAccountId(), account.getDomainId(), aggrUsage,
endDate);
+
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Balance entry=" + aggrUsage + " on
Date=" + endDate);
+ }
+ _quotaBalanceDao.persist(newBalance);
+ aggrUsage = new BigDecimal(0);
+ }
+ startDate = entry.getStartDate();
+ endDate = entry.getEndDate();
+ aggrUsage = aggrUsage.subtract(entry.getQuotaUsed());
+ }
+
+ // update quota_accounts
+ QuotaAccountVO quota_account =
_quotaAcc.findById(account.getAccountId());
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Updating quota account bal=" + aggrUsage + "
date=" + endDate);
+ }
+ if (quota_account == null) {
+ quota_account = new QuotaAccountVO(account.getAccountId());
+ quota_account.setQuotaBalance(aggrUsage);
+ quota_account.setQuotaBalanceDate(endDate);
+ _quotaAcc.persist(quota_account);
+ } else {
+ quota_account.setQuotaBalance(aggrUsage);
+ quota_account.setQuotaBalanceDate(endDate);
+ _quotaAcc.update(account.getAccountId(), quota_account);
+ }
+ }
+
+ @Override
+ public boolean calculateQuotaUsage() {
+ final short opendb =
TransactionLegacy.currentTxn().getDatabaseId();
+ boolean jobResult = false;
+ try (TransactionLegacy txn =
TransactionLegacy.open(TransactionLegacy.USAGE_DB)) {
+ List<AccountVO> accounts = _accountDao.listAll();
+ for (AccountVO account : accounts) {
+ Pair<List<? extends UsageVO>, Integer> usageRecords =
_usageDao.getUsageRecordsPendingQuotaAggregation(account.getAccountId(),
account.getDomainId());
+ List<QuotaUsageVO> quotaListForAccount =
aggregatePendingQuotaRecordsForAccount(account, usageRecords);
+ if (s_logger.isDebugEnabled()) {
+ s_logger.debug("Quota entries size = " +
quotaListForAccount.size() + ", accId" + account.getAccountId() + ", domId" +
account.getDomainId());
+ }
+ processQuotaBalanceForAccount(account,
quotaListForAccount);
+ }
+ jobResult = true;
+ } catch (Exception e) {
+ s_logger.error("Quota Manager error", e);
+ } finally {
+ TransactionLegacy.open(opendb).close();
+ }
+ return jobResult;
+ }
+
+ @DB
+ public QuotaUsageVO updateQuotaDiskUsage(UsageVO usageRecord, final
BigDecimal aggregationRatio, final int quotaType) {
+ QuotaUsageVO quota_usage = null;
+ QuotaTariffVO tariff =
_quotaTariffDao.findTariffPlanByUsageType(quotaType, usageRecord.getEndDate());
+ if (tariff != null && !tariff.getCurrencyValue().equals(0)) {
+ BigDecimal quotaUsgage;
+ BigDecimal onehourcostpergb;
+ BigDecimal noofgbinuse;
+ onehourcostpergb =
tariff.getCurrencyValue().multiply(aggregationRatio);
+ noofgbinuse = new
BigDecimal(usageRecord.getSize()).divide(s_gb, 8, RoundingMode.HALF_EVEN);
+ quotaUsgage = new
BigDecimal(usageRecord.getRawUsage()).multiply(onehourcostpergb).multiply(noofgbinuse);
+ quota_usage = new QuotaUsageVO(usageRecord.getId(),
usageRecord.getZoneId(), usageRecord.getAccountId(), usageRecord.getDomainId(),
usageRecord.getUsageType(), quotaUsgage,
+ usageRecord.getStartDate(), usageRecord.getEndDate());
+ _quotaUsageDao.persist(quota_usage);
+ }
+ usageRecord.setQuotaCalculated(1);
+ _usageDao.persist(usageRecord);
+ return quota_usage;
+ }
+
+ @DB
+ public List<QuotaUsageVO> updateQuotaRunningVMUsage(UsageVO
usageRecord, final BigDecimal aggregationRatio) {
+ List<QuotaUsageVO> quotalist = new ArrayList<QuotaUsageVO>();
+ QuotaUsageVO quota_usage;
+ BigDecimal cpuquotausgage, speedquotausage, memoryquotausage,
vmusage;
+ BigDecimal onehourcostpercpu, onehourcostper100mhz,
onehourcostper1mb, onehourcostforvmusage;
+ BigDecimal rawusage;
+ // get service offering details
+ ServiceOfferingVO serviceoffering =
_serviceOfferingDao.findServiceOffering(usageRecord.getVmInstanceId(),
usageRecord.getOfferingId());
+ rawusage = new BigDecimal(usageRecord.getRawUsage());
+
+ QuotaTariffVO tariff =
_quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.CPU_NUMBER,
usageRecord.getEndDate());
+ if (tariff != null && !tariff.getCurrencyValue().equals(0)) {
+ BigDecimal cpu = new BigDecimal(serviceoffering.getCpu());
+ onehourcostpercpu =
tariff.getCurrencyValue().multiply(aggregationRatio);
+ cpuquotausgage =
rawusage.multiply(onehourcostpercpu).multiply(cpu);
+ quota_usage = new QuotaUsageVO(usageRecord.getId(),
usageRecord.getZoneId(), usageRecord.getAccountId(), usageRecord.getDomainId(),
QuotaTypes.CPU_NUMBER, cpuquotausgage,
+ usageRecord.getStartDate(), usageRecord.getEndDate());
+ _quotaUsageDao.persist(quota_usage);
+ quotalist.add(quota_usage);
+ }
+ tariff =
_quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.CPU_CLOCK_RATE,
usageRecord.getEndDate());
+ if (tariff != null && !tariff.getCurrencyValue().equals(0)) {
+ BigDecimal speed = new BigDecimal(serviceoffering.getSpeed() /
100.00);
+ onehourcostper100mhz =
tariff.getCurrencyValue().multiply(aggregationRatio);
+ speedquotausage =
rawusage.multiply(onehourcostper100mhz).multiply(speed);
+ quota_usage = new QuotaUsageVO(usageRecord.getId(),
usageRecord.getZoneId(), usageRecord.getAccountId(), usageRecord.getDomainId(),
QuotaTypes.CPU_CLOCK_RATE, speedquotausage,
+ usageRecord.getStartDate(), usageRecord.getEndDate());
+ _quotaUsageDao.persist(quota_usage);
+ quotalist.add(quota_usage);
+ }
+ tariff =
_quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.MEMORY,
usageRecord.getEndDate());
+ if (tariff != null && !tariff.getCurrencyValue().equals(0)) {
+ BigDecimal memory = new
BigDecimal(serviceoffering.getRamSize());
+ onehourcostper1mb =
tariff.getCurrencyValue().multiply(aggregationRatio);
+ memoryquotausage =
rawusage.multiply(onehourcostper1mb).multiply(memory);
+ quota_usage = new QuotaUsageVO(usageRecord.getId(),
usageRecord.getZoneId(), usageRecord.getAccountId(), usageRecord.getDomainId(),
QuotaTypes.MEMORY, memoryquotausage,
+ usageRecord.getStartDate(), usageRecord.getEndDate());
+ _quotaUsageDao.persist(quota_usage);
+ quotalist.add(quota_usage);
+ }
+ tariff =
_quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.RUNNING_VM,
usageRecord.getEndDate());
+ if (tariff != null && !tariff.getCurrencyValue().equals(0)) {
+ onehourcostforvmusage =
tariff.getCurrencyValue().multiply(aggregationRatio);
+ vmusage = rawusage.multiply(onehourcostforvmusage);
+ quota_usage = new QuotaUsageVO(usageRecord.getId(),
usageRecord.getZoneId(), usageRecord.getAccountId(), usageRecord.getDomainId(),
QuotaTypes.RUNNING_VM, vmusage,
+ usageRecord.getStartDate(), usageRecord.getEndDate());
+ _quotaUsageDao.persist(quota_usage);
+ quotalist.add(quota_usage);
+ }
+
+ usageRecord.setQuotaCalculated(1);
+ _usageDao.persist(usageRecord);
+ return quotalist;
+ }
+
+ @DB
+ public QuotaUsageVO updateQuotaAllocatedVMUsage(UsageVO usageRecord,
final BigDecimal aggregationRatio) {
+ QuotaUsageVO quota_usage = null;
+ QuotaTariffVO tariff =
_quotaTariffDao.findTariffPlanByUsageType(QuotaTypes.ALLOCATED_VM,
usageRecord.getEndDate());
+ if (tariff != null && !tariff.getCurrencyValue().equals(0)) {
--- End diff --
What if the tariff amount is negative?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
