Skip to content

[Usage] Fix wrong usage_type #7229

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

Merged
DaanHoogland merged 3 commits into from
Mar 3, 2023
Merged

[Usage] Fix wrong usage_type #7229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca722c0
Use rigth usage_type
Feb 14, 2023
5d6130a
Address weizhouapache review
Feb 21, 2023
42e8800
Merge branch 'main' into fix-wrong-usage-type-in-io-write
Feb 21, 2023
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
9 changes: 9 additions & 0 deletions engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,3 +1574,12 @@ CREATE VIEW `cloud`.`user_view` AS
-- Remove snapshot references if primary storage pool has been removed, see github issue #7093
DELETE FROM `cloud`.`snapshot_store_ref`
WHERE store_role = "Primary" AND store_id IN (SELECT id FROM storage_pool WHERE removed IS NOT NULL);


-- Change usage of VM_DISK_IO_WRITE to use right usage_type
UPDATE
`cloud_usage`.`cloud_usage`
SET
usage_type = 22
WHERE
usage_type = 24 AND usage_display like '% io write';
Comment on lines +1577 to +1585
Copy link
Copy Markdown
Contributor

@BryanMLima BryanMLima Mar 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the milestone changed to version 4.18.1.0 this needs to be changed to the correct schema file.

Copy link
Copy Markdown
Member

@weizhouapache weizhouapache Mar 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BryanMLima
I think this can be merged into 4.18.0.0

2 changes: 1 addition & 1 deletion usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public static boolean parse(AccountVO account, Date startDate, Date endDate) {
usageDesc += " for Vm: " + vmId + " and Volume: " + volumeId;
}
usageRecord =
new UsageVO(vmDiskInfo.getZoneId(), account.getId(), account.getDomainId(), usageDesc, ioWrite + " io write", UsageTypes.VM_DISK_BYTES_WRITE,
new UsageVO(vmDiskInfo.getZoneId(), account.getId(), account.getDomainId(), usageDesc, ioWrite + " io write", UsageTypes.VM_DISK_IO_WRITE,
new Double(ioWrite), vmId, null, null, null, vmDiskInfo.getVolumeId(), startDate, endDate, "VirtualMachine");
usageRecords.add(usageRecord);

Expand Down