apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

usage: fix backup usage (#5259)

Browse Source 
when creating usage record for backup usages in a period, we need to check if vm offering is changed. if vm offering is changed, create a new cloud usage record, otherwise update existing usage record.

This PR fixes #4982
This commit is contained in:
Wei Zhou 2021-09-03 09:59:56 +02:00 committed by GitHub
parent a5e7e08a6b
commit 7a7e449af6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
usage/src/main/java/com/cloud/usage/parser/BackupUsageParser.java
View File

@ -17,15 +17,13 @@
package com.cloud.usage.parser; package com.cloud.usage.parser;
import java.text.DecimalFormat;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.inject.Inject; import javax.inject.Inject;
import org.apache.cloudstack.backup.Backup;
import org.apache.cloudstack.usage.UsageTypes; import org.apache.cloudstack.usage.UsageTypes;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -68,65 +66,33 @@ public class BackupUsageParser {
return true; return true;
} }
final Map<Long, BackupInfo> vmUsageMap = new HashMap<>();
for (final UsageBackupVO usageBackup : usageBackups) { for (final UsageBackupVO usageBackup : usageBackups) {
final Long vmId = usageBackup.getVmId(); final Long vmId = usageBackup.getVmId();
final Long zoneId = usageBackup.getZoneId(); final Long zoneId = usageBackup.getZoneId();
final Long offeringId = usageBackup.getBackupOfferingId(); final Long offeringId = usageBackup.getBackupOfferingId();
if (vmUsageMap.get(vmId) == null) { Date createdDate = usageBackup.getCreated();
vmUsageMap.put(vmId, new BackupUsageParser.BackupInfo(new Backup.Metric(0L, 0L), zoneId, vmId, offeringId)); Date removedDate = usageBackup.getRemoved();
if (createdDate.before(startDate)) {
createdDate = startDate;
} }
final Backup.Metric metric = vmUsageMap.get(vmId).getMetric(); if (removedDate == null || removedDate.after(endDate)) {
metric.setBackupSize(metric.getBackupSize() + usageBackup.getSize()); removedDate = endDate;
metric.setDataSize(metric.getDataSize() + usageBackup.getProtectedSize()); }
} final long duration = (removedDate.getTime() - createdDate.getTime()) + 1;
final float usage = duration / 1000f / 60f / 60f;
DecimalFormat dFormat = new DecimalFormat("#.######");
String usageDisplay = dFormat.format(usage);
for (final BackupInfo backupInfo : vmUsageMap.values()) { final Double rawUsage = (double) usageBackup.getSize();
final Long vmId = backupInfo.getVmId(); final String description = String.format("Backup usage VM ID: %d, backup offering: %d", vmId, offeringId);
final Long zoneId = backupInfo.getZoneId();
final Long offeringId = backupInfo.getOfferingId();
final Double rawUsage = (double) backupInfo.getMetric().getBackupSize();
final Double sizeGib = rawUsage / (1024.0 * 1024.0 * 1024.0);
final String description = String.format("Backup usage VM ID: %d", vmId);
final String usageDisplay = String.format("%.4f GiB", sizeGib);
final UsageVO usageRecord = final UsageVO usageRecord =
new UsageVO(zoneId, account.getAccountId(), account.getDomainId(), description, usageDisplay, new UsageVO(zoneId, account.getAccountId(), account.getDomainId(), description, usageDisplay + " Hrs",
UsageTypes.BACKUP, rawUsage, vmId, null, offeringId, null, vmId, UsageTypes.BACKUP, new Double(usage), vmId, null, offeringId, null, vmId,
backupInfo.getMetric().getBackupSize(), backupInfo.getMetric().getDataSize(), startDate, endDate); usageBackup.getSize(), usageBackup.getProtectedSize(), startDate, endDate);
s_usageDao.persist(usageRecord); s_usageDao.persist(usageRecord);
} }
return true; return true;
} }
static class BackupInfo {
Backup.Metric metric;
Long zoneId;
Long vmId;
Long offeringId;
public BackupInfo(Backup.Metric metric, Long zoneId, Long vmId, Long offeringId) {
this.metric = metric;
this.zoneId = zoneId;
this.vmId = vmId;
this.offeringId = offeringId;
}
public Backup.Metric getMetric() {
return metric;
}
public Long getZoneId() {
return zoneId;
}
public Long getVmId() {
return vmId;
}
public Long getOfferingId() {
return offeringId;
}
}
} }