Skip to content

fix: correct VM snapshot usage attribution (two defects) #13924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: correct VM snapshot usage attribution (two defects) #13924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions usage/src/main/java/com/cloud/usage/parser/VMSnapshotUsageParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected boolean parse(AccountVO account, Date startDate, Date endDate) {
long zoneId = usageRec.getZoneId();
Long volId = usageRec.getVolumeId();
long vmId = usageRec.getVmId();
String key = vmId + ":" + volId;
String key = vmId + ":" + volId + ":" + usageRec.getVmSnapshotId();
if (usageRec.getCreated().before(startDate)) {
unprocessedUsage.put(key, usageRec);
continue;
Expand All @@ -85,7 +85,7 @@ protected boolean parse(AccountVO account, Date startDate, Date endDate) {
long duration = (createDate.getTime() - previousCreated.getTime()) + 1;

createUsageRecord(UsageTypes.VM_SNAPSHOT, duration, previousCreated, createDate, account, volId, zoneId, previousEvent.getDiskOfferingId(), vmId,
previousEvent.getSize(), usageRec.getVmSnapshotId());
previousEvent.getSize(), previousEvent.getVmSnapshotId());
previousEvent.setProcessed(new Date());
usageVMSnapshotDao.update(previousEvent);

Expand Down
Loading