From ca722c099fe28e9c399f491d459fd85a2d3902a4 Mon Sep 17 00:00:00 2001 From: SadiJr Date: Tue, 14 Feb 2023 17:26:06 -0300 Subject: [PATCH 1/2] Use rigth usage_type --- .../main/resources/META-INF/db/schema-41720to41800.sql | 10 +++++++++- .../java/com/cloud/usage/parser/VmDiskUsageParser.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql b/engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql index a558d943146d..ec3f043ed2c0 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql @@ -1569,4 +1569,12 @@ CREATE VIEW `cloud`.`user_view` AS left join `cloud`.`async_job` ON async_job.instance_id = user.id and async_job.instance_type = 'User' - and async_job.job_status = 0; \ No newline at end of file + and async_job.job_status = 0; + +-- Change usage of VM_DISK_IO_WRITE to use right usage_type +UPDATE + `cloud_usage`.`cloud_usage` +SET + usage_type = 22 +WHERE + usage_display like '% io write'; \ No newline at end of file diff --git a/usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java b/usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java index d3c8394dbbbd..228feeba08de 100644 --- a/usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java +++ b/usage/src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java @@ -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); From 5d6130a597bdd8afe40652e3182dd45c0072b3c0 Mon Sep 17 00:00:00 2001 From: SadiJr Date: Tue, 21 Feb 2023 09:58:47 -0300 Subject: [PATCH 2/2] Address weizhouapache review --- .../src/main/resources/META-INF/db/schema-41720to41800.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql b/engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql index ec3f043ed2c0..750cbd56b994 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql @@ -1577,4 +1577,4 @@ UPDATE SET usage_type = 22 WHERE - usage_display like '% io write'; \ No newline at end of file + usage_type = 24 AND usage_display like '% io write'; \ No newline at end of file