[cloudstack] branch main updated: [Usage] Fix wrong usage_type (#7229)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new ad64ee3090b [Usage] Fix wrong usage_type (#7229)
ad64ee3090b is described below

commit ad64ee3090b3c14d7a7017bfe31ba9c90f17f48b
Author: SadiJr <sadijaci...@gmail.com>
AuthorDate: Fri Mar 3 09:10:38 2023 -0300

    [Usage] Fix wrong usage_type (#7229)
---
 .../src/main/resources/META-INF/db/schema-41720to41800.sql       | 9 +++++++++
 .../src/main/java/com/cloud/usage/parser/VmDiskUsageParser.java  | 2 +-
 2 files changed, 10 insertions(+), 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 6ce1afd5502..b8eee33cad7 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
@@ -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';
\ 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 d3c8394dbbb..228feeba08d 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 class VmDiskUsageParser {
                     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);